use inline const for last simd_shuffle argument

Author: RalfJung

crates/core_arch/src/aarch64/neon/generated.rs

@@ -737,7 +737,7 @@ pub unsafe fn vld1_dup_f64(ptr: *const f64) -> float64x1_t {
 #[stable(feature = "neon_intrinsics", since = "1.59.0")]
 pub unsafe fn vld1q_dup_f64(ptr: *const f64) -> float64x2_t {
     let x = vld1q_lane_f64::<0>(ptr, transmute(f64x2::splat(0.)));
-    simd_shuffle2!(x, x, [0, 0])
+    simd_shuffle!(x, x, [0, 0])
 }
 
 /// Load one single-element structure to one lane of one register.
@@ -2101,7 +2101,7 @@ pub unsafe fn vgetq_lane_f64<const IMM5: i32>(v: float64x2_t) -> f64 {
 #[cfg_attr(test, assert_instr(mov))]
 #[stable(feature = "neon_intrinsics", since = "1.59.0")]
 pub unsafe fn vcombine_f64(low: float64x1_t, high: float64x1_t) -> float64x2_t {
-    simd_shuffle2!(low, high, [0, 1])
+    simd_shuffle!(low, high, [0, 1])
 }
 
 /// Table look-up

crates/core_arch/src/aarch64/neon/mod.rs

@@ -32,7 +32,9 @@
     allow_internal_unstable,
     decl_macro,
     asm_const,
-    target_feature_11
+    target_feature_11,
+    inline_const,
+    generic_arg_infer
 )]
 #![cfg_attr(test, feature(test, abi_vectorcall))]
 #![deny(clippy::missing_inline_in_public_items)]

crates/core_arch/src/arm_shared/neon/generated.rs

@@ -94,97 +94,15 @@ macro_rules! types {
 }
 
 #[allow(unused)]
-macro_rules! simd_shuffle2 {
-    ($x:expr, $y:expr, <$(const $imm:ident : $ty:ty),+ $(,)?> $idx:expr $(,)?) => {{
-        struct ConstParam<$(const $imm: $ty),+>;
-        impl<$(const $imm: $ty),+> ConstParam<$($imm),+> {
-            const IDX: [u32; 2] = $idx;
-        }
-
-        simd_shuffle($x, $y, ConstParam::<$($imm),+>::IDX)
-    }};
-    ($x:expr, $y:expr, $idx:expr $(,)?) => {{
-        const IDX: [u32; 2] = $idx;
-        simd_shuffle($x, $y, IDX)
-    }};
-}
-
-#[allow(unused_macros)]
-macro_rules! simd_shuffle4 {
-    ($x:expr, $y:expr, <$(const $imm:ident : $ty:ty),+ $(,)?> $idx:expr $(,)?) => {{
-        struct ConstParam<$(const $imm: $ty),+>;
-        impl<$(const $imm: $ty),+> ConstParam<$($imm),+> {
-            const IDX: [u32; 4] = $idx;
-        }
-
-        simd_shuffle($x, $y, ConstParam::<$($imm),+>::IDX)
-    }};
-    ($x:expr, $y:expr, $idx:expr $(,)?) => {{
-        const IDX: [u32; 4] = $idx;
-        simd_shuffle($x, $y, IDX)
-    }};
-}
-
-#[allow(unused_macros)]
-macro_rules! simd_shuffle8 {
-    ($x:expr, $y:expr, <$(const $imm:ident : $ty:ty),+ $(,)?> $idx:expr $(,)?) => {{
-        struct ConstParam<$(const $imm: $ty),+>;
-        impl<$(const $imm: $ty),+> ConstParam<$($imm),+> {
-            const IDX: [u32; 8] = $idx;
-        }
-
-        simd_shuffle($x, $y, ConstParam::<$($imm),+>::IDX)
-    }};
-    ($x:expr, $y:expr, $idx:expr $(,)?) => {{
-        const IDX: [u32; 8] = $idx;
-        simd_shuffle($x, $y, IDX)
-    }};
-}
-
-#[allow(unused)]
-macro_rules! simd_shuffle16 {
-    ($x:expr, $y:expr, <$(const $imm:ident : $ty:ty),+ $(,)?> $idx:expr $(,)?) => {{
-        struct ConstParam<$(const $imm: $ty),+>;
-        impl<$(const $imm: $ty),+> ConstParam<$($imm),+> {
-            const IDX: [u32; 16] = $idx;
-        }
-
-        simd_shuffle($x, $y, ConstParam::<$($imm),+>::IDX)
-    }};
-    ($x:expr, $y:expr, $idx:expr $(,)?) => {{
-        const IDX: [u32; 16] = $idx;
-        simd_shuffle($x, $y, IDX)
-    }};
-}
-
-#[allow(unused_macros)]
-macro_rules! simd_shuffle32 {
-    ($x:expr, $y:expr, <$(const $imm:ident : $ty:ty),+> $(,)? $idx:expr $(,)?) => {{
-        struct ConstParam<$(const $imm: $ty),+>;
-        impl<$(const $imm: $ty),+> ConstParam<$($imm),+> {
-            const IDX: [u32; 32] = $idx;
-        }
-
-        simd_shuffle($x, $y, ConstParam::<$($imm),+>::IDX)
-    }};
-    ($x:expr, $y:expr, $idx:expr $(,)?) => {{
-        const IDX: [u32; 32] = $idx;
-        simd_shuffle($x, $y, IDX)
-    }};
-}
-
-#[allow(unused_macros)]
-macro_rules! simd_shuffle64 {
-    ($x:expr, $y:expr, <$(const $imm:ident : $ty:ty),+ $(,)?> $idx:expr $(,)?) => {{
-        struct ConstParam<$(const $imm: $ty),+>;
-        impl<$(const $imm: $ty),+> ConstParam<$($imm),+> {
-            const IDX: [u32; 64] = $idx;
-        }
-
-        simd_shuffle($x, $y, ConstParam::<$($imm),+>::IDX)
-    }};
+macro_rules! simd_shuffle {
     ($x:expr, $y:expr, $idx:expr $(,)?) => {{
-        const IDX: [u32; 64] = $idx;
-        simd_shuffle($x, $y, IDX)
+        simd_shuffle(
+            $x,
+            $y,
+            const {
+                let v: [u32; _] = $idx;
+                v
+            },
+        )
     }};
 }

crates/core_arch/src/arm_shared/neon/mod.rs

@@ -47,10 +47,10 @@ mod sealed {
     #[cfg_attr(all(test, target_endian = "big"), assert_instr(xxspltd, dm = 0x0))]
     unsafe fn xxpermdi(a: i64x2, b: i64x2, dm: u8) -> i64x2 {
         match dm & 0b11 {
-            0 => simd_shuffle2!(a, b, [0b00, 0b10]),
-            1 => simd_shuffle2!(a, b, [0b01, 0b10]),
-            2 => simd_shuffle2!(a, b, [0b00, 0b11]),
-            _ => simd_shuffle2!(a, b, [0b01, 0b11]),
+            0 => simd_shuffle!(a, b, [0b00, 0b10]),
+            1 => simd_shuffle!(a, b, [0b01, 0b10]),
+            2 => simd_shuffle!(a, b, [0b00, 0b11]),
+            _ => simd_shuffle!(a, b, [0b01, 0b11]),
         }
     }