Fix std_example on x86

Author: bjorn3

example/std_example.rs

@@ -230,51 +230,53 @@ unsafe fn test_crc32() {
 #[cfg(target_arch = "x86_64")]
 #[target_feature(enable = "sse2")]
 unsafe fn test_simd() {
-    assert!(is_x86_feature_detected!("sse2"));
-
-    let x = _mm_setzero_si128();
-    let y = _mm_set1_epi16(7);
-    let or = _mm_or_si128(x, y);
-    let cmp_eq = _mm_cmpeq_epi8(y, y);
-    let cmp_lt = _mm_cmplt_epi8(y, y);
-
-    let (zero0, zero1) = std::mem::transmute::<_, (u64, u64)>(x);
-    assert_eq!((zero0, zero1), (0, 0));
-    assert_eq!(std::mem::transmute::<_, [u16; 8]>(or), [7, 7, 7, 7, 7, 7, 7, 7]);
-    assert_eq!(
-        std::mem::transmute::<_, [u16; 8]>(cmp_eq),
-        [0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff]
-    );
-    assert_eq!(std::mem::transmute::<_, [u16; 8]>(cmp_lt), [0, 0, 0, 0, 0, 0, 0, 0]);
-
-    test_mm_slli_si128();
-    test_mm_movemask_epi8();
-    test_mm256_movemask_epi8();
-    test_mm_add_epi8();
-    test_mm_add_pd();
-    test_mm_cvtepi8_epi16();
-    #[cfg(not(jit))]
-    test_mm_cvtps_epi32();
-    test_mm_cvttps_epi32();
-    test_mm_cvtsi128_si64();
-
-    test_mm_extract_epi8();
-    test_mm_insert_epi16();
-    test_mm_shuffle_epi8();
-
-    #[cfg(not(jit))]
-    test_mm_cmpestri();
-
-    test_mm256_shuffle_epi8();
-    test_mm256_permute2x128_si256();
-    test_mm256_permutevar8x32_epi32();
-
-    #[rustfmt::skip]
+    unsafe {
+        assert!(is_x86_feature_detected!("sse2"));
+
+        let x = _mm_setzero_si128();
+        let y = _mm_set1_epi16(7);
+        let or = _mm_or_si128(x, y);
+        let cmp_eq = _mm_cmpeq_epi8(y, y);
+        let cmp_lt = _mm_cmplt_epi8(y, y);
+
+        let (zero0, zero1) = std::mem::transmute::<_, (u64, u64)>(x);
+        assert_eq!((zero0, zero1), (0, 0));
+        assert_eq!(std::mem::transmute::<_, [u16; 8]>(or), [7, 7, 7, 7, 7, 7, 7, 7]);
+        assert_eq!(
+            std::mem::transmute::<_, [u16; 8]>(cmp_eq),
+            [0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff]
+        );
+        assert_eq!(std::mem::transmute::<_, [u16; 8]>(cmp_lt), [0, 0, 0, 0, 0, 0, 0, 0]);
+
+        test_mm_slli_si128();
+        test_mm_movemask_epi8();
+        test_mm256_movemask_epi8();
+        test_mm_add_epi8();
+        test_mm_add_pd();
+        test_mm_cvtepi8_epi16();
+        #[cfg(not(jit))]
+        test_mm_cvtps_epi32();
+        test_mm_cvttps_epi32();
+        test_mm_cvtsi128_si64();
+
+        test_mm_extract_epi8();
+        test_mm_insert_epi16();
+        test_mm_shuffle_epi8();
+
+        #[cfg(not(jit))]
+        test_mm_cmpestri();
+
+        test_mm256_shuffle_epi8();
+        test_mm256_permute2x128_si256();
+        test_mm256_permutevar8x32_epi32();
+
+        #[rustfmt::skip]
     let mask1 = _mm_movemask_epi8(dbg!(_mm_setr_epi8(255u8 as i8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)));
-    assert_eq!(mask1, 1);
+        assert_eq!(mask1, 1);
 
-    #[cfg(not(jit))]
-    test_crc32();
+        #[cfg(not(jit))]
+        test_crc32();
+    }
 }
 
 #[cfg(target_arch = "x86_64")]
@@ -361,23 +363,27 @@ fn assert_eq_m128i(x: std::arch::x86_64::__m128i, y: std::arch::x86_64::__m128i)
 
 #[cfg(target_arch = "x86_64")]
 #[target_feature(enable = "sse2")]
-pub unsafe fn assert_eq_m128d(a: __m128d, b: __m128d) {
+pub fn assert_eq_m128d(a: __m128d, b: __m128d) {
     if _mm_movemask_pd(_mm_cmpeq_pd(a, b)) != 0b11 {
         panic!("{:?} != {:?}", a, b);
     }
 }
 
 #[cfg(target_arch = "x86_64")]
 #[target_feature(enable = "avx")]
-pub unsafe fn assert_eq_m256i(a: __m256i, b: __m256i) {
-    assert_eq!(std::mem::transmute::<_, [u64; 4]>(a), std::mem::transmute::<_, [u64; 4]>(b))
+pub fn assert_eq_m256i(a: __m256i, b: __m256i) {
+    unsafe {
+        assert_eq!(std::mem::transmute::<_, [u64; 4]>(a), std::mem::transmute::<_, [u64; 4]>(b))
+    }
 }
 
 #[cfg(target_arch = "x86_64")]
 #[target_feature(enable = "sse2")]
 unsafe fn test_mm_cvtsi128_si64() {
-    let r = _mm_cvtsi128_si64(std::mem::transmute::<[i64; 2], _>([5, 0]));
-    assert_eq!(r, 5);
+    unsafe {
+        let r = _mm_cvtsi128_si64(std::mem::transmute::<[i64; 2], _>([5, 0]));
+        assert_eq!(r, 5);
+    }
 }
 
 #[cfg(target_arch = "x86_64")]
@@ -445,20 +451,24 @@ unsafe fn test_mm_shuffle_epi8() {
 #[cfg(target_arch = "x86_64")]
 #[target_feature(enable = "sse4.2")]
 unsafe fn str_to_m128i(s: &[u8]) -> __m128i {
-    assert!(s.len() <= 16);
-    let slice = &mut [0u8; 16];
-    std::ptr::copy_nonoverlapping(s.as_ptr(), slice.as_mut_ptr(), s.len());
-    _mm_loadu_si128(slice.as_ptr() as *const _)
+    unsafe {
+        assert!(s.len() <= 16);
+        let slice = &mut [0u8; 16];
+        std::ptr::copy_nonoverlapping(s.as_ptr(), slice.as_mut_ptr(), s.len());
+        _mm_loadu_si128(slice.as_ptr() as *const _)
+    }
 }
 
 #[cfg(not(jit))]
 #[cfg(target_arch = "x86_64")]
 #[target_feature(enable = "sse4.2")]
 unsafe fn test_mm_cmpestri() {
-    let a = str_to_m128i(b"bar - garbage");
-    let b = str_to_m128i(b"foobar");
-    let i = _mm_cmpestri::<_SIDD_CMP_EQUAL_ORDERED>(a, 3, b, 6);
-    assert_eq!(3, i);
+    unsafe {
+        let a = str_to_m128i(b"bar - garbage");
+        let b = str_to_m128i(b"foobar");
+        let i = _mm_cmpestri::<_SIDD_CMP_EQUAL_ORDERED>(a, 3, b, 6);
+        assert_eq!(3, i);
+    }
 }
 
 #[cfg(target_arch = "x86_64")]
@@ -513,35 +523,39 @@ unsafe fn test_mm256_permutevar8x32_epi32() {
 #[target_feature(enable = "avx2")]
 #[cfg(not(jit))]
 unsafe fn test_mm_cvtps_epi32() {
-    let floats: [f32; 4] = [1.5, -2.5, i32::MAX as f32 + 1.0, f32::NAN];
+    unsafe {
+        let floats: [f32; 4] = [1.5, -2.5, i32::MAX as f32 + 1.0, f32::NAN];
 
-    let float_vec = _mm_loadu_ps(floats.as_ptr());
-    let int_vec = _mm_cvtps_epi32(float_vec);
+        let float_vec = _mm_loadu_ps(floats.as_ptr());
+        let int_vec = _mm_cvtps_epi32(float_vec);
 
-    let mut ints: [i32; 4] = [0; 4];
-    _mm_storeu_si128(ints.as_mut_ptr() as *mut __m128i, int_vec);
+        let mut ints: [i32; 4] = [0; 4];
+        _mm_storeu_si128(ints.as_mut_ptr() as *mut __m128i, int_vec);
 
-    // this is very different from `floats.map(|f| f as i32)`!
-    let expected_ints: [i32; 4] = [2, -2, i32::MIN, i32::MIN];
+        // this is very different from `floats.map(|f| f as i32)`!
+        let expected_ints: [i32; 4] = [2, -2, i32::MIN, i32::MIN];
 
-    assert_eq!(ints, expected_ints);
+        assert_eq!(ints, expected_ints);
+    }
 }
 
 #[cfg(target_arch = "x86_64")]
 #[target_feature(enable = "avx2")]
 unsafe fn test_mm_cvttps_epi32() {
-    let floats: [f32; 4] = [1.5, -2.5, i32::MAX as f32 + 1.0, f32::NAN];
+    unsafe {
+        let floats: [f32; 4] = [1.5, -2.5, i32::MAX as f32 + 1.0, f32::NAN];
 
-    let float_vec = _mm_loadu_ps(floats.as_ptr());
-    let int_vec = _mm_cvttps_epi32(float_vec);
+        let float_vec = _mm_loadu_ps(floats.as_ptr());
+        let int_vec = _mm_cvttps_epi32(float_vec);
 
-    let mut ints: [i32; 4] = [0; 4];
-    _mm_storeu_si128(ints.as_mut_ptr() as *mut __m128i, int_vec);
+        let mut ints: [i32; 4] = [0; 4];
+        _mm_storeu_si128(ints.as_mut_ptr() as *mut __m128i, int_vec);
 
-    // this is very different from `floats.map(|f| f as i32)`!
-    let expected_ints: [i32; 4] = [1, -2, i32::MIN, i32::MIN];
+        // this is very different from `floats.map(|f| f as i32)`!
+        let expected_ints: [i32; 4] = [1, -2, i32::MIN, i32::MIN];
 
-    assert_eq!(ints, expected_ints);
+        assert_eq!(ints, expected_ints);
+    }
 }
 
 fn test_checked_mul() {