Change name to simd_funnel_sh{l,r} (TODO squash later)

Author: sayantn

compiler/rustc_codegen_llvm/src/intrinsic.rs

@@ -2525,11 +2525,11 @@ fn generic_simd_intrinsic<'ll, 'tcx>(
         return Ok(v);
     }
 
-    if name == sym::simd_fshr || name == sym::simd_fshl {
+    if name == sym::simd_funnel_shr || name == sym::simd_funnel_shl {
         let a = args[0].immediate();
         let b = args[1].immediate();
         let shift = args[2].immediate();
-        let is_left = name == sym::simd_fshl;
+        let is_left = name == sym::simd_funnel_shl;
         let ptr_bits = bx.tcx().data_layout.pointer_size.bits();
 
         let elem_width = match *in_elem.kind() {

compiler/rustc_hir_analysis/src/check/intrinsic.rs

@@ -598,7 +598,7 @@ pub(crate) fn check_intrinsic_type(
         | sym::simd_round
         | sym::simd_round_ties_even
         | sym::simd_trunc => (1, 0, vec![param(0)], param(0)),
-        sym::simd_fma | sym::simd_relaxed_fma | sym::simd_fshl | sym::simd_fshr => {
+        sym::simd_fma | sym::simd_relaxed_fma | sym::simd_funnel_shl | sym::simd_funnel_shr => {
             (1, 0, vec![param(0), param(0), param(0)], param(0))
         }
         sym::simd_gather => (3, 0, vec![param(0), param(1), param(2)], param(0)),

compiler/rustc_span/src/symbol.rs

@@ -1963,10 +1963,10 @@ symbols! {
         simd_fma,
         simd_fmax,
         simd_fmin,
-        simd_fshl,
-        simd_fshr,
         simd_fsin,
         simd_fsqrt,
+        simd_funnel_shl,
+        simd_funnel_shr,
         simd_gather,
         simd_ge,
         simd_gt,

library/core/src/intrinsics/simd.rs

@@ -141,7 +141,7 @@ pub unsafe fn simd_shr<T>(lhs: T, rhs: T) -> T;
 /// Each element of `shift` must be less than `<int>::BITS`.
 #[rustc_intrinsic]
 #[rustc_nounwind]
-pub unsafe fn simd_fshl<T>(a: T, b: T, shift: T) -> T;
+pub unsafe fn simd_funnel_shl<T>(a: T, b: T, shift: T) -> T;
 
 /// Funnel Shifts vector right elementwise, with UB on overflow.
 ///
@@ -158,7 +158,7 @@ pub unsafe fn simd_fshl<T>(a: T, b: T, shift: T) -> T;
 /// Each element of `shift` must be less than `<int>::BITS`.
 #[rustc_intrinsic]
 #[rustc_nounwind]
-pub unsafe fn simd_fshr<T>(a: T, b: T, shift: T) -> T;
+pub unsafe fn simd_funnel_shr<T>(a: T, b: T, shift: T) -> T;
 
 /// "Ands" vectors elementwise.
 ///

tests/ui/simd/intrinsic/generic-arithmetic-2.rs

@@ -43,10 +43,10 @@ fn main() {
         simd_shl(y, y);
         simd_shr(x, x);
         simd_shr(y, y);
-        simd_fshl(x, x, x);
-        simd_fshl(y, y, y);
-        simd_fshr(x, x, x);
-        simd_fshr(y, y, y);
+        simd_funnel_shl(x, x, x);
+        simd_funnel_shl(y, y, y);
+        simd_funnel_shr(x, x, x);
+        simd_funnel_shr(y, y, y);
         simd_and(x, x);
         simd_and(y, y);
         simd_or(x, x);
@@ -77,9 +77,9 @@ fn main() {
         //~^ ERROR expected SIMD input type, found non-SIMD `i32`
         simd_shr(0, 0);
         //~^ ERROR expected SIMD input type, found non-SIMD `i32`
-        simd_fshl(0, 0, 0);
+        simd_funnel_shl(0, 0, 0);
         //~^ ERROR expected SIMD input type, found non-SIMD `i32`
-        simd_fshr(0, 0, 0);
+        simd_funnel_shr(0, 0, 0);
         //~^ ERROR expected SIMD input type, found non-SIMD `i32`
         simd_and(0, 0);
         //~^ ERROR expected SIMD input type, found non-SIMD `i32`
@@ -103,9 +103,9 @@ fn main() {
         //~^ ERROR unsupported operation on `f32x4` with element `f32`
         simd_shr(z, z);
         //~^ ERROR unsupported operation on `f32x4` with element `f32`
-        simd_fshl(z, z, z);
+        simd_funnel_shl(z, z, z);
         //~^ ERROR unsupported operation on `f32x4` with element `f32`
-        simd_fshr(z, z, z);
+        simd_funnel_shr(z, z, z);
         //~^ ERROR unsupported operation on `f32x4` with element `f32`
         simd_and(z, z);
         //~^ ERROR unsupported operation on `f32x4` with element `f32`

tests/ui/simd/intrinsic/generic-arithmetic-2.stderr

@@ -34,17 +34,17 @@ error[E0511]: invalid monomorphization of `simd_shr` intrinsic: expected SIMD in
 LL |         simd_shr(0, 0);
    |         ^^^^^^^^^^^^^^
 
-error[E0511]: invalid monomorphization of `simd_fshl` intrinsic: expected SIMD input type, found non-SIMD `i32`
+error[E0511]: invalid monomorphization of `simd_funnel_shl` intrinsic: expected SIMD input type, found non-SIMD `i32`
   --> $DIR/generic-arithmetic-2.rs:80:9
    |
-LL |         simd_fshl(0, 0, 0);
-   |         ^^^^^^^^^^^^^^^^^^
+LL |         simd_funnel_shl(0, 0, 0);
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0511]: invalid monomorphization of `simd_fshr` intrinsic: expected SIMD input type, found non-SIMD `i32`
+error[E0511]: invalid monomorphization of `simd_funnel_shr` intrinsic: expected SIMD input type, found non-SIMD `i32`
   --> $DIR/generic-arithmetic-2.rs:82:9
    |
-LL |         simd_fshr(0, 0, 0);
-   |         ^^^^^^^^^^^^^^^^^^
+LL |         simd_funnel_shr(0, 0, 0);
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0511]: invalid monomorphization of `simd_and` intrinsic: expected SIMD input type, found non-SIMD `i32`
   --> $DIR/generic-arithmetic-2.rs:84:9
@@ -106,17 +106,17 @@ error[E0511]: invalid monomorphization of `simd_shr` intrinsic: unsupported oper
 LL |         simd_shr(z, z);
    |         ^^^^^^^^^^^^^^
 
-error[E0511]: invalid monomorphization of `simd_fshl` intrinsic: unsupported operation on `f32x4` with element `f32`
+error[E0511]: invalid monomorphization of `simd_funnel_shl` intrinsic: unsupported operation on `f32x4` with element `f32`
   --> $DIR/generic-arithmetic-2.rs:106:9
    |
-LL |         simd_fshl(z, z, z);
-   |         ^^^^^^^^^^^^^^^^^^
+LL |         simd_funnel_shl(z, z, z);
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0511]: invalid monomorphization of `simd_fshr` intrinsic: unsupported operation on `f32x4` with element `f32`
+error[E0511]: invalid monomorphization of `simd_funnel_shr` intrinsic: unsupported operation on `f32x4` with element `f32`
   --> $DIR/generic-arithmetic-2.rs:108:9
    |
-LL |         simd_fshr(z, z, z);
-   |         ^^^^^^^^^^^^^^^^^^
+LL |         simd_funnel_shr(z, z, z);
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0511]: invalid monomorphization of `simd_and` intrinsic: unsupported operation on `f32x4` with element `f32`
   --> $DIR/generic-arithmetic-2.rs:110:9

tests/ui/simd/intrinsic/generic-arithmetic-pass.rs

@@ -84,7 +84,7 @@ fn main() {
         all_eq!(simd_shr(simd_shl(y2, y1), y1), y2);
 
         all_eq!(
-            simd_fshl(x1, x2, x1),
+            simd_funnel_shl(x1, x2, x1),
             i32x4([
                 (1 << 1) | (2 >> 31),
                 (2 << 2) | (3 >> 30),
@@ -93,7 +93,7 @@ fn main() {
             ])
         );
         all_eq!(
-            simd_fshl(x2, x1, x1),
+            simd_funnel_shl(x2, x1, x1),
             i32x4([
                 (2 << 1) | (1 >> 31),
                 (3 << 2) | (2 >> 30),
@@ -102,7 +102,7 @@ fn main() {
             ])
         );
         all_eq!(
-            simd_fshl(y1, y2, y1),
+            simd_funnel_shl(y1, y2, y1),
             U32::<4>([
                 (1 << 1) | (2 >> 31),
                 (2 << 2) | (3 >> 30),
@@ -111,7 +111,7 @@ fn main() {
             ])
         );
         all_eq!(
-            simd_fshl(y2, y1, y1),
+            simd_funnel_shl(y2, y1, y1),
             U32::<4>([
                 (2 << 1) | (1 >> 31),
                 (3 << 2) | (2 >> 30),
@@ -121,7 +121,7 @@ fn main() {
         );
 
         all_eq!(
-            simd_fshr(x1, x2, x1),
+            simd_funnel_shr(x1, x2, x1),
             i32x4([
                 (1 << 31) | (2 >> 1),
                 (2 << 30) | (3 >> 2),
@@ -130,7 +130,7 @@ fn main() {
             ])
         );
         all_eq!(
-            simd_fshr(x2, x1, x1),
+            simd_funnel_shr(x2, x1, x1),
             i32x4([
                 (2 << 31) | (1 >> 1),
                 (3 << 30) | (2 >> 2),
@@ -139,7 +139,7 @@ fn main() {
             ])
         );
         all_eq!(
-            simd_fshr(y1, y2, y1),
+            simd_funnel_shr(y1, y2, y1),
             U32::<4>([
                 (1 << 31) | (2 >> 1),
                 (2 << 30) | (3 >> 2),
@@ -148,7 +148,7 @@ fn main() {
             ])
         );
         all_eq!(
-            simd_fshr(y2, y1, y1),
+            simd_funnel_shr(y2, y1, y1),
             U32::<4>([
                 (2 << 31) | (1 >> 1),
                 (3 << 30) | (2 >> 2),