From: Richard Earnshaw Date: Fri, 8 Dec 2023 16:04:18 +0000 (+0000) Subject: Revert "arm: vst1_types_x3 ACLE intrinsics" X-Git-Tag: basepoints/gcc-15~3805 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1f800ccda704a88838c04e6403ad09e0ae2ff77;p=thirdparty%2Fgcc.git Revert "arm: vst1_types_x3 ACLE intrinsics" This reverts commit ef07ae652c25ec04c2e3ef8cec14b0771a809861. --- diff --git a/gcc/config/arm/arm_neon.h b/gcc/config/arm/arm_neon.h index e76be3516d95..60f1077752c6 100644 --- a/gcc/config/arm/arm_neon.h +++ b/gcc/config/arm/arm_neon.h @@ -11250,14 +11250,6 @@ vst1_p64_x2 (poly64_t * __a, poly64x1x2_t __b) __builtin_neon_vst1_x2di ((__builtin_neon_di *) __a, __bu.__o); } -__extension__ extern __inline void -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vst1_p64_x3 (poly64_t * __a, poly64x1x3_t __b) -{ - union { poly64x1x3_t __i; __builtin_neon_ei __o; } __bu = { __b }; - __builtin_neon_vst1_x3di ((__builtin_neon_di *) __a, __bu.__o); -} - #pragma GCC pop_options __extension__ extern __inline void __attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) @@ -11319,38 +11311,6 @@ vst1_s64_x2 (int64_t * __a, int64x1x2_t __b) __builtin_neon_vst1_x2di ((__builtin_neon_di *) __a, __bu.__o); } -__extension__ extern __inline void -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vst1_s8_x3 (int8_t * __a, int8x8x3_t __b) -{ - union { int8x8x3_t __i; __builtin_neon_ei __o; } __bu = { __b }; - __builtin_neon_vst1_x3v8qi ((__builtin_neon_qi *) __a, __bu.__o); -} - -__extension__ extern __inline void -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vst1_s16_x3 (int16_t * __a, int16x4x3_t __b) -{ - union { int16x4x3_t __i; __builtin_neon_ei __o; } __bu = { __b }; - __builtin_neon_vst1_x3v4hi ((__builtin_neon_hi *) __a, __bu.__o); -} - -__extension__ extern __inline void -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vst1_s32_x3 (int32_t * __a, int32x2x3_t __b) -{ - union { int32x2x3_t __i; __builtin_neon_ei __o; } __bu = { __b }; - __builtin_neon_vst1_x3v2si ((__builtin_neon_si *) __a, __bu.__o); -} - -__extension__ extern __inline void -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vst1_s64_x3 (int64_t * __a, int64x1x3_t __b) -{ - union { int64x1x3_t __i; __builtin_neon_ei __o; } __bu = { __b }; - __builtin_neon_vst1_x3di ((__builtin_neon_di *) __a, __bu.__o); -} - #if defined (__ARM_FP16_FORMAT_IEEE) || defined (__ARM_FP16_FORMAT_ALTERNATIVE) __extension__ extern __inline void __attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) @@ -11385,24 +11345,6 @@ vst1_f32_x2 (float32_t * __a, float32x2x2_t __b) __builtin_neon_vst1_x2v2sf ((__builtin_neon_sf *) __a, __bu.__o); } -#if defined (__ARM_FP16_FORMAT_IEEE) || defined (__ARM_FP16_FORMAT_ALTERNATIVE) -__extension__ extern __inline void -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vst1_f16_x3 (float16_t * __a, float16x4x3_t __b) -{ - union { float16x4x3_t __i; __builtin_neon_ei __o; } __bu = { __b }; - __builtin_neon_vst1_x3v4hf (__a, __bu.__o); -} -#endif - -__extension__ extern __inline void -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vst1_f32_x3 (float32_t * __a, float32x2x3_t __b) -{ - union { float32x2x3_t __i; __builtin_neon_ei __o; } __bu = { __b }; - __builtin_neon_vst1_x3v2sf ((__builtin_neon_sf *) __a, __bu.__o); -} - __extension__ extern __inline void __attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) vst1_u8 (uint8_t * __a, uint8x8_t __b) @@ -11463,38 +11405,6 @@ vst1_u64_x2 (uint64_t * __a, uint64x1x2_t __b) __builtin_neon_vst1_x2di ((__builtin_neon_di *) __a, __bu.__o); } -__extension__ extern __inline void -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vst1_u8_x3 (uint8_t * __a, uint8x8x3_t __b) -{ - union { uint8x8x3_t __i; __builtin_neon_ei __o; } __bu = { __b }; - __builtin_neon_vst1_x3v8qi ((__builtin_neon_qi *) __a, __bu.__o); -} - -__extension__ extern __inline void -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vst1_u16_x3 (uint16_t * __a, uint16x4x3_t __b) -{ - union { uint16x4x3_t __i; __builtin_neon_ei __o; } __bu = { __b }; - __builtin_neon_vst1_x3v4hi ((__builtin_neon_hi *) __a, __bu.__o); -} - -__extension__ extern __inline void -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vst1_u32_x3 (uint32_t * __a, uint32x2x3_t __b) -{ - union { uint32x2x3_t __i; __builtin_neon_ei __o; } __bu = { __b }; - __builtin_neon_vst1_x3v2si ((__builtin_neon_si *) __a, __bu.__o); -} - -__extension__ extern __inline void -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vst1_u64_x3 (uint64_t * __a, uint64x1x3_t __b) -{ - union { uint64x1x3_t __i; __builtin_neon_ei __o; } __bu = { __b }; - __builtin_neon_vst1_x3di ((__builtin_neon_di *) __a, __bu.__o); -} - __extension__ extern __inline void __attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) vst1_p8 (poly8_t * __a, poly8x8_t __b) @@ -11525,22 +11435,6 @@ vst1_p16_x2 (poly16_t * __a, poly16x4x2_t __b) __builtin_neon_vst1_x2v4hi ((__builtin_neon_hi *) __a, __bu.__o); } -__extension__ extern __inline void -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vst1_p8_x3 (poly8_t * __a, poly8x8x3_t __b) -{ - union { poly8x8x3_t __i; __builtin_neon_ei __o; } __bu = { __b }; - __builtin_neon_vst1_x3v8qi ((__builtin_neon_qi *) __a, __bu.__o); -} - -__extension__ extern __inline void -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vst1_p16_x3 (poly16_t * __a, poly16x4x3_t __b) -{ - union { poly16x4x3_t __i; __builtin_neon_ei __o; } __bu = { __b }; - __builtin_neon_vst1_x3v4hi ((__builtin_neon_hi *) __a, __bu.__o); -} - #pragma GCC push_options #pragma GCC target ("fpu=crypto-neon-fp-armv8") __extension__ extern __inline void @@ -20290,14 +20184,6 @@ vst1_bf16_x2 (bfloat16_t * __a, bfloat16x4x2_t __b) __builtin_neon_vst1_x2v4bf ((__builtin_neon_bf *) __a, __bu.__o); } -__extension__ extern __inline void -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vst1_bf16_x3 (bfloat16_t * __a, bfloat16x4x3_t __b) -{ - union { bfloat16x4x3_t __i; __builtin_neon_ei __o; } __bu = { __b }; - __builtin_neon_vst1_x3v4bf ((__builtin_neon_bf *) __a, __bu.__o); -} - __extension__ extern __inline void __attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) vst1q_bf16 (bfloat16_t * __a, bfloat16x8_t __b) diff --git a/gcc/config/arm/arm_neon_builtins.def b/gcc/config/arm/arm_neon_builtins.def index 8b104b1a700b..6f16bf0863c8 100644 --- a/gcc/config/arm/arm_neon_builtins.def +++ b/gcc/config/arm/arm_neon_builtins.def @@ -312,7 +312,6 @@ VAR14 (STORE1, vst1, v8qi, v4hi, v4hf, v2si, v2sf, di, v16qi, v8hi, v8hf, v4si, v4sf, v2di, v4bf, v8bf) VAR7 (STORE1, vst1_x2, v8qi, v4hi, v2si, di, v4hf, v2sf, v4bf) -VAR7 (STORE1, vst1_x3, v8qi, v4hi, v2si, di, v4hf, v2sf, v4bf) VAR14 (STORE1LANE, vst1_lane, v8qi, v4hi, v4hf, v2si, v2sf, di, v16qi, v8hi, v8hf, v4si, v4sf, v2di, v4bf, v8bf) VAR13 (LOAD1, vld2, diff --git a/gcc/config/arm/neon.md b/gcc/config/arm/neon.md index 5185434d6d93..2a7286dee52d 100644 --- a/gcc/config/arm/neon.md +++ b/gcc/config/arm/neon.md @@ -5135,16 +5135,6 @@ if (BYTES_BIG_ENDIAN) [(set_attr "type" "neon_store1_2reg")] ) -(define_insn "neon_vst1_x3" - [(set (match_operand:EI 0 "neon_struct_operand" "=Um") - (unspec:EI [(match_operand:EI 1 "s_register_operand" "w") - (unspec:VDQX [(const_int 0)] UNSPEC_VSTRUCTDUMMY)] - UNSPEC_VST1))] - "TARGET_NEON" - "vst1.\t%h1, %A0" - [(set_attr "type" "neon_store1_3reg")] -) - (define_insn "neon_vst1" [(set (match_operand:VDQX 0 "neon_struct_operand" "=Um") (unspec:VDQX [(match_operand:VDQX 1 "s_register_operand" "w")] diff --git a/gcc/testsuite/gcc.target/arm/simd/vst1_base_xN_1.c b/gcc/testsuite/gcc.target/arm/simd/vst1_base_xN_1.c index 5f820a6a496e..575897fa422e 100644 --- a/gcc/testsuite/gcc.target/arm/simd/vst1_base_xN_1.c +++ b/gcc/testsuite/gcc.target/arm/simd/vst1_base_xN_1.c @@ -60,63 +60,8 @@ void test_vst1_p16_x2 (poly16_t * ptr, poly16x4x2_t val) vst1_p16_x2 (ptr, val); } -void test_vst1_u8_x3 (uint8_t * ptr, uint8x8x3_t val) -{ - vst1_u8_x3 (ptr, val); -} - -void test_vst1_u16_x3 (uint16_t * ptr, uint16x4x3_t val) -{ - vst1_u16_x3 (ptr, val); -} - -void test_vst1_u32_x3 (uint32_t * ptr, uint32x2x3_t val) -{ - vst1_u32_x3 (ptr, val); -} - -void test_vst1_u64_x3 (uint64_t * ptr, uint64x1x3_t val) -{ - vst1_u64_x3 (ptr, val); -} - -void test_vst1_s8_x3 (int8_t * ptr, int8x8x3_t val) -{ - vst1_s8_x3 (ptr, val); -} - -void test_vst1_s16_x3 (int16_t * ptr, int16x4x3_t val) -{ - vst1_s16_x3 (ptr, val); -} - -void test_vst1_s32_x3 (int32_t * ptr, int32x2x3_t val) -{ - vst1_s32_x3 (ptr, val); -} - -void test_vst1_s64_x3 (int64_t * ptr, int64x1x3_t val) -{ - vst1_s64_x3 (ptr, val); -} - -void test_vst1_f32_x3 (float32_t * ptr, float32x2x3_t val) -{ - vst1_f32_x3 (ptr, val); -} - -void test_vst1_p8_x3 (poly8_t * ptr, poly8x8x3_t val) -{ - vst1_p8_x3 (ptr, val); -} - -void test_vst1_p16_x3 (poly16_t * ptr, poly16x4x3_t val) -{ - vst1_p16_x3 (ptr, val); -} - -/* { dg-final { scan-assembler-times {vst1.8\t\{d[0-9]+-d[0-9]+\}, \[r[0-9]+\]\n} 6 } } */ -/* { dg-final { scan-assembler-times {vst1.16\t\{d[0-9]+-d[0-9]+\}, \[r[0-9]+\]\n} 6 } } */ -/* { dg-final { scan-assembler-times {vst1.32\t\{d[0-9]+-d[0-9]+\}, \[r[0-9]+\]\n} 6 } } */ -/* { dg-final { scan-assembler-times {vst1.64\t\{d[0-9]+-d[0-9]+\}, \[r[0-9]+:64\]\n} 4 } } */ +/* { dg-final { scan-assembler-times {vst1.8\t\{d[0-9]+-d[0-9]+\}, \[r[0-9]+\]\n} 3 } } */ +/* { dg-final { scan-assembler-times {vst1.16\t\{d[0-9]+-d[0-9]+\}, \[r[0-9]+\]\n} 3 } } */ +/* { dg-final { scan-assembler-times {vst1.32\t\{d[0-9]+-d[0-9]+\}, \[r[0-9]+\]\n} 3 } } */ +/* { dg-final { scan-assembler-times {vst1.64\t\{d[0-9]+-d[0-9]+\}, \[r[0-9]+:64\]\n} 2 } } */ diff --git a/gcc/testsuite/gcc.target/arm/simd/vst1_bf16_xN_1.c b/gcc/testsuite/gcc.target/arm/simd/vst1_bf16_xN_1.c index a3a00ead4682..213fd20ee65f 100644 --- a/gcc/testsuite/gcc.target/arm/simd/vst1_bf16_xN_1.c +++ b/gcc/testsuite/gcc.target/arm/simd/vst1_bf16_xN_1.c @@ -10,9 +10,4 @@ void test_vst1_bf16_x2 (bfloat16_t * ptr, bfloat16x4x2_t val) vst1_bf16_x2 (ptr, val); } -void test_vst1_bf16_x3 (bfloat16_t * ptr, bfloat16x4x3_t val) -{ - vst1_bf16_x3 (ptr, val); -} - -/* { dg-final { scan-assembler-times {vst1.16\t\{d[0-9]+-d[0-9]+\}, \[r[0-9]+\]\n} 2 } } */ +/* { dg-final { scan-assembler-times {vst1.16\t\{d[0-9]+-d[0-9]+\}, \[r[0-9]+\]\n} 1 } } */ diff --git a/gcc/testsuite/gcc.target/arm/simd/vst1_fp16_xN_1.c b/gcc/testsuite/gcc.target/arm/simd/vst1_fp16_xN_1.c index 0a6863e24c6c..523aec92db24 100644 --- a/gcc/testsuite/gcc.target/arm/simd/vst1_fp16_xN_1.c +++ b/gcc/testsuite/gcc.target/arm/simd/vst1_fp16_xN_1.c @@ -10,9 +10,4 @@ void test_vst1_f16_x2 (float16_t * ptr, float16x4x2_t val) vst1_f16_x2 (ptr, val); } -void test_vst1_f16_x3 (float16_t * ptr, float16x4x3_t val) -{ - vst1_f16_x3 (ptr, val); -} - -/* { dg-final { scan-assembler-times {vst1.16\t\{d[0-9]+-d[0-9]+\}, \[r[0-9]+\]\n} 2 } } */ +/* { dg-final { scan-assembler-times {vst1.16\t\{d[0-9]+-d[0-9]+\}, \[r[0-9]+\]\n} 1 } } */ diff --git a/gcc/testsuite/gcc.target/arm/simd/vst1_p64_xN_1.c b/gcc/testsuite/gcc.target/arm/simd/vst1_p64_xN_1.c index 5dbd6049bc9f..f590ebd7b943 100644 --- a/gcc/testsuite/gcc.target/arm/simd/vst1_p64_xN_1.c +++ b/gcc/testsuite/gcc.target/arm/simd/vst1_p64_xN_1.c @@ -10,9 +10,4 @@ void test_vst1_p64_x2 (poly64_t * ptr, poly64x1x2_t val) vst1_p64_x2 (ptr, val); } -void test_vst1_p64_x3 (poly64_t * ptr, poly64x1x3_t val) -{ - vst1_p64_x3 (ptr, val); -} - -/* { dg-final { scan-assembler-times {vst1.64\t\{d[0-9]+-d[0-9]+\}, \[r[0-9]+:64\]\n} 2 } } */ \ No newline at end of file +/* { dg-final { scan-assembler-times {vst1.64\t\{d[0-9]+-d[0-9]+\}, \[r[0-9]+:64\]\n} 1 } } */ \ No newline at end of file