New upstream version 1.54.0+dfsg1

[rustc.git] / library / stdarch / crates / core_arch / src / x86_64 / sse41.rs

diff --git a/library/stdarch/crates/core_arch/src/x86_64/sse41.rs b/library/stdarch/crates/core_arch/src/x86_64/sse41.rs
index 1b37967325f5cdc0afb609977bd100ce4ff9e0a6..3d1ea0cf65dac9a1252b9e24afe0037aaafda068 100644 (file)
--- a/library/stdarch/crates/core_arch/src/x86_64/sse41.rs
+++ b/library/stdarch/crates/core_arch/src/x86_64/sse41.rs
@@ -8,37 +8,31 @@ use crate::{
 #[cfg(test)]
 use stdarch_test::assert_instr;
 
-/// Extracts an 64-bit integer from `a` selected with `imm8`
+/// Extracts an 64-bit integer from `a` selected with `IMM1`
 ///
 /// [Intel's documentation](https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_extract_epi64)
 #[inline]
 #[target_feature(enable = "sse4.1")]
-#[cfg_attr(all(test, not(target_os = "windows")), assert_instr(pextrq, imm8 = 1))]
-#[rustc_args_required_const(1)]
+#[cfg_attr(all(test, not(target_os = "windows")), assert_instr(pextrq, IMM1 = 1))]
+#[rustc_legacy_const_generics(1)]
 #[stable(feature = "simd_x86", since = "1.27.0")]
-pub unsafe fn _mm_extract_epi64(a: __m128i, imm8: i32) -> i64 {
-    let a = a.as_i64x2();
-    match imm8 & 1 {
-        0 => simd_extract(a, 0),
-        _ => simd_extract(a, 1),
-    }
+pub unsafe fn _mm_extract_epi64<const IMM1: i32>(a: __m128i) -> i64 {
+    static_assert_imm1!(IMM1);
+    simd_extract(a.as_i64x2(), IMM1 as u32)
 }
 
 /// Returns a copy of `a` with the 64-bit integer from `i` inserted at a
-/// location specified by `imm8`.
+/// location specified by `IMM1`.
 ///
 /// [Intel's documentation](https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm_insert_epi64)
 #[inline]
 #[target_feature(enable = "sse4.1")]
-#[cfg_attr(test, assert_instr(pinsrq, imm8 = 0))]
-#[rustc_args_required_const(2)]
+#[cfg_attr(test, assert_instr(pinsrq, IMM1 = 0))]
+#[rustc_legacy_const_generics(2)]
 #[stable(feature = "simd_x86", since = "1.27.0")]
-pub unsafe fn _mm_insert_epi64(a: __m128i, i: i64, imm8: i32) -> __m128i {
-    let a = a.as_i64x2();
-    match imm8 & 1 {
-        0 => transmute(simd_insert(a, 0, i)),
-        _ => transmute(simd_insert(a, 1, i)),
-    }
+pub unsafe fn _mm_insert_epi64<const IMM1: i32>(a: __m128i, i: i64) -> __m128i {
+    static_assert_imm1!(IMM1);
+    transmute(simd_insert(a.as_i64x2(), IMM1 as u32, i))
 }
 
 #[cfg(test)]
@@ -49,19 +43,20 @@ mod tests {
     #[simd_test(enable = "sse4.1")]
     unsafe fn test_mm_extract_epi64() {
         let a = _mm_setr_epi64x(0, 1);
-        let r = _mm_extract_epi64(a, 1);
-        assert_eq!(r, 1);
-        let r = _mm_extract_epi64(a, 3);
+        let r = _mm_extract_epi64::<1>(a);
         assert_eq!(r, 1);
+        let r = _mm_extract_epi64::<0>(a);
+        assert_eq!(r, 0);
     }
 
     #[simd_test(enable = "sse4.1")]
     unsafe fn test_mm_insert_epi64() {
         let a = _mm_set1_epi64x(0);
         let e = _mm_setr_epi64x(0, 32);
-        let r = _mm_insert_epi64(a, 32, 1);
+        let r = _mm_insert_epi64::<1>(a, 32);
         assert_eq_m128i(r, e);
-        let r = _mm_insert_epi64(a, 32, 3);
+        let e = _mm_setr_epi64x(32, 0);
+        let r = _mm_insert_epi64::<0>(a, 32);
         assert_eq_m128i(r, e);
     }
 }