From 98682b6dd28a32ccfb3ad0beb693f02b82841dfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Rakic?= <remy.rakic+github@gmail.com>
Date: Sat, 6 Mar 2021 01:33:49 +0100
Subject: [PATCH] convert `_mm256_mask_i64gather_epi32` to const generics

---
 .../stdarch/crates/core_arch/src/x86/avx2.rs   | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/library/stdarch/crates/core_arch/src/x86/avx2.rs b/library/stdarch/crates/core_arch/src/x86/avx2.rs
index 639f1b9f8228..01388afb6952 100644
--- a/library/stdarch/crates/core_arch/src/x86/avx2.rs
+++ b/library/stdarch/crates/core_arch/src/x86/avx2.rs
@@ -1525,26 +1525,21 @@ pub unsafe fn _mm256_i64gather_epi32<const SCALE: i32>(
 /// [Intel's documentation](https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm256_mask_i64gather_epi32)
 #[inline]
 #[target_feature(enable = "avx2")]
-#[cfg_attr(test, assert_instr(vpgatherqd, scale = 1))]
-#[rustc_args_required_const(4)]
+#[cfg_attr(test, assert_instr(vpgatherqd, SCALE = 1))]
+#[rustc_legacy_const_generics(4)]
 #[stable(feature = "simd_x86", since = "1.27.0")]
-pub unsafe fn _mm256_mask_i64gather_epi32(
+pub unsafe fn _mm256_mask_i64gather_epi32<const SCALE: i32>(
     src: __m128i,
     slice: *const i32,
     offsets: __m256i,
     mask: __m128i,
-    scale: i32,
 ) -> __m128i {
+    static_assert_imm8_scale!(SCALE);
     let src = src.as_i32x4();
     let mask = mask.as_i32x4();
     let offsets = offsets.as_i64x4();
     let slice = slice as *const i8;
-    macro_rules! call {
-        ($imm8:expr) => {
-            vpgatherqd(src, slice, offsets, mask, $imm8)
-        };
-    }
-    let r = constify_imm8_gather!(scale, call);
+    let r = vpgatherqd(src, slice, offsets, mask, SCALE as i8);
     transmute(r)
 }
 
@@ -5784,12 +5779,11 @@ mod tests {
             arr[i as usize] = i;
         }
         // A multiplier of 4 is word-addressing
-        let r = _mm256_mask_i64gather_epi32(
+        let r = _mm256_mask_i64gather_epi32::<4>(
             _mm_set1_epi32(256),
             arr.as_ptr(),
             _mm256_setr_epi64x(0, 16, 64, 96),
             _mm_setr_epi32(-1, -1, -1, 0),
-            4,
         );
         assert_eq_m128i(r, _mm_setr_epi32(0, 16, 64, 256));
     }