update test

Author: folkertdev

src/shims/x86/avx512.rs

@@ -51,12 +51,12 @@ pub(super) trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 // Compute one lane with ternary table.
                 let tern = |xa: u32, xb: u32, xc: u32, imm: u32| -> u32 {
                     let mut out = 0u32;
-                    // For each bit position, select bit from imm8 at index = a | (b<<1) | (c<<2)
+                    // At each bit position, select bit from imm8 at index = (a << 2) | (b << 1) | c
                     for bit in 0..32 {
                         let ia = (xa >> bit) & 1;
                         let ib = (xb >> bit) & 1;
                         let ic = (xc >> bit) & 1;
-                        let idx = ia | (ib << 1) | (ic << 2);
+                        let idx = (ia << 2) | (ib << 1) | ic;
                         let v = (imm >> idx) & 1;
                         out |= v << bit;
                     }

tests/pass/shims/x86/intrinsics-x86-avx512.rs

@@ -197,21 +197,21 @@ unsafe fn test_avx512ternarylogic() {
     #[target_feature(enable = "avx512f")]
     unsafe fn test_mm512_ternarylogic_epi32() {
         let a = _mm512_set4_epi32(0b100, 0b110, 0b001, 0b101);
-        let b = _mm512_set4_epi32(0b010, 0b011, 0b001, 0b101);
-        let c = _mm512_set4_epi32(0b001, 0b000, 0b001, 0b101);
+        let b = _mm512_set4_epi32(0b010, 0b011, 0b001, 0b110);
+        let c = _mm512_set4_epi32(0b001, 0b000, 0b001, 0b111);
 
         // Identity of A.
-        let r = _mm512_ternarylogic_epi32::<0b1010_1010>(a, b, c);
+        let r = _mm512_ternarylogic_epi32::<0b1111_0000>(a, b, c);
         assert_eq_m512i(r, a);
 
-        // Bitwise or.
-        let r = _mm512_ternarylogic_epi32::<0b1111_1110>(a, b, c);
-        let e = _mm512_set4_epi32(0b111, 0b111, 0b001, 0b101);
+        // Bitwise xor.
+        let r = _mm512_ternarylogic_epi32::<0b10010110>(a, b, c);
+        let e = _mm512_set4_epi32(0b111, 0b101, 0b001, 0b100);
         assert_eq_m512i(r, e);
 
-        // Majority.
+        // Majority (2 or more bits set).
         let r = _mm512_ternarylogic_epi32::<0b1110_1000>(a, b, c);
-        let e = _mm512_set4_epi32(0b000, 0b010, 0b001, 0b101);
+        let e = _mm512_set4_epi32(0b000, 0b010, 0b001, 0b111);
         assert_eq_m512i(r, e);
     }
     test_mm512_ternarylogic_epi32();
@@ -221,43 +221,43 @@ unsafe fn test_avx512ternarylogic() {
         let _mm256_set4_epi32 = |a, b, c, d| _mm256_setr_epi32(a, b, c, d, a, b, c, d);
 
         let a = _mm256_set4_epi32(0b100, 0b110, 0b001, 0b101);
-        let b = _mm256_set4_epi32(0b010, 0b011, 0b001, 0b101);
-        let c = _mm256_set4_epi32(0b001, 0b000, 0b001, 0b101);
+        let b = _mm256_set4_epi32(0b010, 0b011, 0b001, 0b110);
+        let c = _mm256_set4_epi32(0b001, 0b000, 0b001, 0b111);
 
         // Identity of A.
-        let r = _mm256_ternarylogic_epi32::<0b1010_1010>(a, b, c);
+        let r = _mm256_ternarylogic_epi32::<0b1111_0000>(a, b, c);
         assert_eq_m256i(r, a);
 
-        // Bitwise or.
-        let r = _mm256_ternarylogic_epi32::<0b1111_1110>(a, b, c);
-        let e = _mm256_set4_epi32(0b111, 0b111, 0b001, 0b101);
+        // Bitwise xor.
+        let r = _mm256_ternarylogic_epi32::<0b10010110>(a, b, c);
+        let e = _mm256_set4_epi32(0b111, 0b101, 0b001, 0b100);
         assert_eq_m256i(r, e);
 
-        // Majority.
+        // Majority (2 or more bits set).
         let r = _mm256_ternarylogic_epi32::<0b1110_1000>(a, b, c);
-        let e = _mm256_set4_epi32(0b000, 0b010, 0b001, 0b101);
+        let e = _mm256_set4_epi32(0b000, 0b010, 0b001, 0b111);
         assert_eq_m256i(r, e);
     }
     test_mm256_ternarylogic_epi32();
 
     #[target_feature(enable = "avx512f,avx512vl")]
     unsafe fn test_mm_ternarylogic_epi32() {
         let a = _mm_setr_epi32(0b100, 0b110, 0b001, 0b101);
-        let b = _mm_setr_epi32(0b010, 0b011, 0b001, 0b101);
-        let c = _mm_setr_epi32(0b001, 0b000, 0b001, 0b101);
+        let b = _mm_setr_epi32(0b010, 0b011, 0b001, 0b110);
+        let c = _mm_setr_epi32(0b001, 0b000, 0b001, 0b111);
 
         // Identity of A.
-        let r = _mm_ternarylogic_epi32::<0b1010_1010>(a, b, c);
+        let r = _mm_ternarylogic_epi32::<0b1111_0000>(a, b, c);
         assert_eq_m128i(r, a);
 
-        // Bitwise or.
-        let r = _mm_ternarylogic_epi32::<0b1111_1110>(a, b, c);
-        let e = _mm_setr_epi32(0b111, 0b111, 0b001, 0b101);
+        // Bitwise xor.
+        let r = _mm_ternarylogic_epi32::<0b10010110>(a, b, c);
+        let e = _mm_setr_epi32(0b111, 0b101, 0b001, 0b100);
         assert_eq_m128i(r, e);
 
-        // Majority.
+        // Majority (2 or more bits set).
         let r = _mm_ternarylogic_epi32::<0b1110_1000>(a, b, c);
-        let e = _mm_setr_epi32(0b000, 0b010, 0b001, 0b101);
+        let e = _mm_setr_epi32(0b000, 0b010, 0b001, 0b111);
         assert_eq_m128i(r, e);
     }
     test_mm_ternarylogic_epi32();