Merge pull request #25243 from seiko2plus/issue_25231

BUG: Fix non-contiguous 32-bit memory load when ARM/Neon is enabled
numpy · Dec 1, 2023 · f209869 · f209869
2 parents eba61c7 + eaeb6f7
commit f209869
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/numpy/_core/src/common/simd/neon/memory.h b/numpy/_core/src/common/simd/neon/memory.h
@@ -52,21 +52,12 @@ NPYV_IMPL_NEON_MEM(f64, double)
  ***************************/
 NPY_FINLINE npyv_s32 npyv_loadn_s32(const npy_int32 *ptr, npy_intp stride)
 {
-    switch (stride) {
-    case 2:
-        return vld2q_s32((const int32_t*)ptr).val[0];
-    case 3:
-        return vld3q_s32((const int32_t*)ptr).val[0];
-    case 4:
-        return vld4q_s32((const int32_t*)ptr).val[0];
-    default:;
-        int32x2_t ax = vcreate_s32(*ptr);
-        int32x4_t a = vcombine_s32(ax, ax);
-                  a = vld1q_lane_s32((const int32_t*)ptr + stride,   a, 1);
-                  a = vld1q_lane_s32((const int32_t*)ptr + stride*2, a, 2);
-                  a = vld1q_lane_s32((const int32_t*)ptr + stride*3, a, 3);
-        return a;
-    }
+    int32x4_t a;
+    a = vld1q_lane_s32((const int32_t*)ptr,            a, 0);
+    a = vld1q_lane_s32((const int32_t*)ptr + stride,   a, 1);
+    a = vld1q_lane_s32((const int32_t*)ptr + stride*2, a, 2);
+    a = vld1q_lane_s32((const int32_t*)ptr + stride*3, a, 3);
+    return a;
 }
 
 NPY_FINLINE npyv_u32 npyv_loadn_u32(const npy_uint32 *ptr, npy_intp stride)