Rename to simd_masked_load

Author: farnoy

compiler/rustc_codegen_llvm/src/intrinsic.rs

@@ -1492,8 +1492,8 @@ fn generic_simd_intrinsic<'ll, 'tcx>(
         return Ok(v);
     }
 
-    if name == sym::simd_load {
-        // simd_load(values: <N x T>, pointer: *_ T, mask: <N x i{M}>) -> <N x T>
+    if name == sym::simd_masked_load {
+        // simd_masked_load(values: <N x T>, pointer: *_ T, mask: <N x i{M}>) -> <N x T>
         // * N: number of elements in the input vectors
         // * T: type of the element to load
         // * M: any integer width is supported, will be truncated to i1

compiler/rustc_hir_analysis/src/check/intrinsic.rs

@@ -540,7 +540,7 @@ pub fn check_platform_intrinsic_type(tcx: TyCtxt<'_>, it: &hir::ForeignItem<'_>)
         sym::simd_fpowi => (1, 0, vec![param(0), tcx.types.i32], param(0)),
         sym::simd_fma => (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)),
-        sym::simd_load => (3, 0, vec![param(0), param(1), param(2)], param(0)),
+        sym::simd_masked_load => (3, 0, vec![param(0), param(1), param(2)], param(0)),
         sym::simd_scatter => (3, 0, vec![param(0), param(1), param(2)], Ty::new_unit(tcx)),
         sym::simd_insert => (2, 0, vec![param(0), tcx.types.u32, param(1)], param(0)),
         sym::simd_extract => (2, 0, vec![param(0), tcx.types.u32], param(1)),

compiler/rustc_span/src/symbol.rs

@@ -1531,8 +1531,8 @@ symbols! {
         simd_gt,
         simd_insert,
         simd_le,
-        simd_load,
         simd_lt,
+        simd_masked_load,
         simd_mul,
         simd_ne,
         simd_neg,

tests/codegen/simd-intrinsic/simd-intrinsic-generic-load.rs renamed to tests/codegen/simd-intrinsic/simd-intrinsic-generic-masked-load.rs

@@ -16,21 +16,21 @@ pub struct Vec2<T>(pub T, pub T);
 pub struct Vec4<T>(pub T, pub T, pub T, pub T);
 
 extern "platform-intrinsic" {
-    fn simd_load<T, P, M>(values: T, pointer: P, mask: M) -> T;
+    fn simd_masked_load<T, P, M>(values: T, pointer: P, mask: M) -> T;
 }
 
 // CHECK-LABEL: @load_f32x2
 #[no_mangle]
 pub unsafe fn load_f32x2(pointer: *const f32, mask: Vec2<i32>,
                          values: Vec2<f32>) -> Vec2<f32> {
     // CHECK: call <2 x float> @llvm.masked.load.v2f32.p0(ptr {{.*}}, i32 {{.*}}, <2 x i1> {{.*}}, <2 x float> {{.*}})
-    simd_load(values, pointer, mask)
+    simd_masked_load(values, pointer, mask)
 }
 
 // CHECK-LABEL: @load_pf32x2
 #[no_mangle]
 pub unsafe fn load_pf32x2(pointer: *const *const f32, mask: Vec2<i32>,
                           values: Vec2<*const f32>) -> Vec2<*const f32> {
     // CHECK: call <2 x ptr> @llvm.masked.load.v2p0.p0({{.*}}, i32 {{.*}}, <2 x i1> {{.*}}, <2 x ptr> {{.*}})
-    simd_load(values, pointer, mask)
+    simd_masked_load(values, pointer, mask)
 }