Revert "arm: vst1_types_x2 ACLE intrinsics"

This reverts commit a69a7c7b6782c5b6f213f1f34af8dbb6541f27bb.

diff --git a/gcc/config/arm/arm_neon.h b/gcc/config/arm/arm_neon.h
index 60f1077752c6be7615e83017ac376b41c63b1eaa..c03be9912f872ab8fa286c77db04031702d973db 100644 (file)
--- a/gcc/config/arm/arm_neon.h
+++ b/gcc/config/arm/arm_neon.h
@@ -11242,14 +11242,6 @@ vst1_p64 (poly64_t * __a, poly64x1_t __b)
   __builtin_neon_vst1di ((__builtin_neon_di *) __a, __b);
 }
 
-__extension__ extern __inline void
-__attribute__  ((__always_inline__, __gnu_inline__, __artificial__))
-vst1_p64_x2 (poly64_t * __a, poly64x1x2_t __b)
-{
-  union { poly64x1x2_t __i; __builtin_neon_ti __o; } __bu = { __b };
-  __builtin_neon_vst1_x2di ((__builtin_neon_di *) __a, __bu.__o);
-}
-
 #pragma GCC pop_options
 __extension__ extern __inline void
 __attribute__  ((__always_inline__, __gnu_inline__, __artificial__))
@@ -11279,38 +11271,6 @@ vst1_s64 (int64_t * __a, int64x1_t __b)
   __builtin_neon_vst1di ((__builtin_neon_di *) __a, __b);
 }
 
-__extension__ extern __inline void
-__attribute__  ((__always_inline__, __gnu_inline__, __artificial__))
-vst1_s8_x2 (int8_t * __a, int8x8x2_t __b)
-{
-  union { int8x8x2_t __i; __builtin_neon_ti __o; } __bu = { __b };
-  __builtin_neon_vst1_x2v8qi ((__builtin_neon_qi *) __a, __bu.__o);
-}
-
-__extension__ extern __inline void
-__attribute__  ((__always_inline__, __gnu_inline__, __artificial__))
-vst1_s16_x2 (int16_t * __a, int16x4x2_t __b)
-{
-  union { int16x4x2_t __i; __builtin_neon_ti __o; } __bu = { __b };
-  __builtin_neon_vst1_x2v4hi ((__builtin_neon_hi *) __a, __bu.__o);
-}
-
-__extension__ extern __inline void
-__attribute__  ((__always_inline__, __gnu_inline__, __artificial__))
-vst1_s32_x2 (int32_t * __a, int32x2x2_t __b)
-{
-  union { int32x2x2_t __i; __builtin_neon_ti __o; } __bu = { __b };
-  __builtin_neon_vst1_x2v2si ((__builtin_neon_si *) __a, __bu.__o);
-}
-
-__extension__ extern __inline void
-__attribute__  ((__always_inline__, __gnu_inline__, __artificial__))
-vst1_s64_x2 (int64_t * __a, int64x1x2_t __b)
-{
-  union { int64x1x2_t __i; __builtin_neon_ti __o; } __bu = { __b };
-  __builtin_neon_vst1_x2di ((__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__))
@@ -11327,24 +11287,6 @@ vst1_f32 (float32_t * __a, float32x2_t __b)
   __builtin_neon_vst1v2sf ((__builtin_neon_sf *) __a, __b);
 }
 
-#if defined (__ARM_FP16_FORMAT_IEEE) || defined (__ARM_FP16_FORMAT_ALTERNATIVE)
-__extension__ extern __inline void
-__attribute__  ((__always_inline__, __gnu_inline__, __artificial__))
-vst1_f16_x2 (float16_t * __a, float16x4x2_t __b)
-{
-  union { float16x4x2_t __i; __builtin_neon_ti __o; } __bu = { __b };
-  __builtin_neon_vst1_x2v4hf (__a, __bu.__o);
-}
-#endif
-
-__extension__ extern __inline void
-__attribute__  ((__always_inline__, __gnu_inline__, __artificial__))
-vst1_f32_x2 (float32_t * __a, float32x2x2_t __b)
-{
-  union { float32x2x2_t __i; __builtin_neon_ti __o; } __bu = { __b };
-  __builtin_neon_vst1_x2v2sf ((__builtin_neon_sf *) __a, __bu.__o);
-}
-
 __extension__ extern __inline void
 __attribute__  ((__always_inline__, __gnu_inline__, __artificial__))
 vst1_u8 (uint8_t * __a, uint8x8_t __b)
@@ -11373,38 +11315,6 @@ vst1_u64 (uint64_t * __a, uint64x1_t __b)
   __builtin_neon_vst1di ((__builtin_neon_di *) __a, (int64x1_t) __b);
 }
 
-__extension__ extern __inline void
-__attribute__  ((__always_inline__, __gnu_inline__, __artificial__))
-vst1_u8_x2 (uint8_t * __a, uint8x8x2_t __b)
-{
-  union { uint8x8x2_t __i; __builtin_neon_ti __o; } __bu = { __b };
-  __builtin_neon_vst1_x2v8qi ((__builtin_neon_qi *) __a, __bu.__o);
-}
-
-__extension__ extern __inline void
-__attribute__  ((__always_inline__, __gnu_inline__, __artificial__))
-vst1_u16_x2 (uint16_t * __a, uint16x4x2_t __b)
-{
-  union { uint16x4x2_t __i; __builtin_neon_ti __o; } __bu = { __b };
-  __builtin_neon_vst1_x2v4hi ((__builtin_neon_hi *) __a, __bu.__o);
-}
-
-__extension__ extern __inline void
-__attribute__  ((__always_inline__, __gnu_inline__, __artificial__))
-vst1_u32_x2 (uint32_t * __a, uint32x2x2_t __b)
-{
-  union { uint32x2x2_t __i; __builtin_neon_ti __o; } __bu = { __b };
-  __builtin_neon_vst1_x2v2si ((__builtin_neon_si *) __a, __bu.__o);
-}
-
-__extension__ extern __inline void
-__attribute__  ((__always_inline__, __gnu_inline__, __artificial__))
-vst1_u64_x2 (uint64_t * __a, uint64x1x2_t __b)
-{
-  union { uint64x1x2_t __i; __builtin_neon_ti __o; } __bu = { __b };
-  __builtin_neon_vst1_x2di ((__builtin_neon_di *) __a, __bu.__o);
-}
-
 __extension__ extern __inline void
 __attribute__  ((__always_inline__, __gnu_inline__, __artificial__))
 vst1_p8 (poly8_t * __a, poly8x8_t __b)
@@ -11419,22 +11329,6 @@ vst1_p16 (poly16_t * __a, poly16x4_t __b)
   __builtin_neon_vst1v4hi ((__builtin_neon_hi *) __a, (int16x4_t) __b);
 }
 
-__extension__ extern __inline void
-__attribute__  ((__always_inline__, __gnu_inline__, __artificial__))
-vst1_p8_x2 (poly8_t * __a, poly8x8x2_t __b)
-{
-  union { poly8x8x2_t __i; __builtin_neon_ti __o; } __bu = { __b };
-  __builtin_neon_vst1_x2v8qi ((__builtin_neon_qi *) __a, __bu.__o);
-}
-
-__extension__ extern __inline void
-__attribute__  ((__always_inline__, __gnu_inline__, __artificial__))
-vst1_p16_x2 (poly16_t * __a, poly16x4x2_t __b)
-{
-  union { poly16x4x2_t __i; __builtin_neon_ti __o; } __bu = { __b };
-  __builtin_neon_vst1_x2v4hi ((__builtin_neon_hi *) __a, __bu.__o);
-}
-
 #pragma GCC push_options
 #pragma GCC target ("fpu=crypto-neon-fp-armv8")
 __extension__ extern __inline void
@@ -20176,14 +20070,6 @@ vst1_bf16 (bfloat16_t * __a, bfloat16x4_t __b)
   __builtin_neon_vst1v4bf (__a, __b);
 }
 
-__extension__ extern __inline void
-__attribute__  ((__always_inline__, __gnu_inline__, __artificial__))
-vst1_bf16_x2 (bfloat16_t * __a, bfloat16x4x2_t __b)
-{
-  union { bfloat16x4x2_t __i; __builtin_neon_ti __o; } __bu = { __b };
-  __builtin_neon_vst1_x2v4bf ((__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 6f16bf0863c8c59e477a92db2ef9a58aeda460a7..90dad8cf6d188774f15f2a182180e32a20a05150 100644 (file)
--- a/gcc/config/arm/arm_neon_builtins.def
+++ b/gcc/config/arm/arm_neon_builtins.def
@@ -311,7 +311,6 @@ VAR10 (LOAD1, vld1_dup,
 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)
 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 2a7286dee52d002f8be5b00ac8a7fda7a1266532..b8f8fd6b9280f5a02897c9adc96b8933d2dd1bb4 100644 (file)
--- a/gcc/config/arm/neon.md
+++ b/gcc/config/arm/neon.md
@@ -5125,16 +5125,6 @@ if (BYTES_BIG_ENDIAN)
                     UNSPEC_VST1))]
   "TARGET_NEON")
 
-(define_insn "neon_vst1_x2<mode>"
-  [(set (match_operand:TI 0 "neon_struct_operand" "=Um")
-        (unspec:TI [(match_operand:TI 1 "s_register_operand" "w")
-                    (unspec:VDQX [(const_int 0)] UNSPEC_VSTRUCTDUMMY)]
-                   UNSPEC_VST1))]
-  "TARGET_NEON"
-  "vst1.<V_sz_elem>\t%h1, %A0"
-  [(set_attr "type" "neon_store1_2reg<q>")]
-)
-
 (define_insn "neon_vst1<mode>"
   [(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
deleted file mode 100644 (file)
index 575897f..0000000
--- a/gcc/testsuite/gcc.target/arm/simd/vst1_base_xN_1.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* { dg-do assemble } */
-/* { dg-require-effective-target arm_neon_ok } */
-/* { dg-options "-save-temps -O2" } */
-/* { dg-add-options arm_neon } */
-
-#include "arm_neon.h"
-
-void test_vst1_u8_x2 (uint8_t * ptr, uint8x8x2_t val)
-{
-    vst1_u8_x2 (ptr, val);
-}
-
-void test_vst1_u16_x2 (uint16_t * ptr, uint16x4x2_t val)
-{
-    vst1_u16_x2 (ptr, val);
-}
-
-void test_vst1_u32_x2 (uint32_t * ptr, uint32x2x2_t val)
-{
-    vst1_u32_x2 (ptr, val);
-}
-
-void test_vst1_u64_x2 (uint64_t * ptr, uint64x1x2_t val)
-{
-    vst1_u64_x2 (ptr, val);
-}
-
-void test_vst1_s8_x2 (int8_t * ptr, int8x8x2_t val)
-{
-    vst1_s8_x2 (ptr, val);
-}
-
-void test_vst1_s16_x2 (int16_t * ptr, int16x4x2_t val)
-{
-    vst1_s16_x2 (ptr, val);
-}
-
-void test_vst1_s32_x2 (int32_t * ptr, int32x2x2_t val)
-{
-    vst1_s32_x2 (ptr, val);
-}
-
-void test_vst1_s64_x2 (int64_t * ptr, int64x1x2_t val)
-{
-    vst1_s64_x2 (ptr, val);
-}
-
-void test_vst1_f32_x2 (float32_t * ptr, float32x2x2_t val)
-{
-    vst1_f32_x2 (ptr, val);
-}
-
-void test_vst1_p8_x2 (poly8_t * ptr, poly8x8x2_t val)
-{
-    vst1_p8_x2 (ptr, val);
-}
-
-void test_vst1_p16_x2 (poly16_t * ptr, poly16x4x2_t val)
-{
-    vst1_p16_x2 (ptr, val);
-}
-
-
-/* { 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
deleted file mode 100644 (file)
index 213fd20..0000000
--- a/gcc/testsuite/gcc.target/arm/simd/vst1_bf16_xN_1.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* { dg-do assemble } */
-/* { dg-require-effective-target arm_v8_2a_bf16_neon_ok } */
-/* { dg-options "-save-temps -O2" } */
-/* { dg-add-options arm_v8_2a_bf16_neon } */
-
-#include "arm_neon.h"
-
-void test_vst1_bf16_x2 (bfloat16_t * ptr, bfloat16x4x2_t val)
-{
-    vst1_bf16_x2 (ptr, val);
-}
-
-/* { 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
deleted file mode 100644 (file)
index 523aec9..0000000
--- a/gcc/testsuite/gcc.target/arm/simd/vst1_fp16_xN_1.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* { dg-do assemble } */
-/* { dg-require-effective-target arm_neon_fp16_ok } */
-/* { dg-options "-save-temps -O2" } */
-/* { dg-add-options arm_neon_fp16 } */
-
-#include "arm_neon.h"
-
-void test_vst1_f16_x2 (float16_t * ptr, float16x4x2_t val)
-{
-    vst1_f16_x2 (ptr, val);
-}
-
-/* { 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
deleted file mode 100644 (file)
index f590ebd..0000000
--- a/gcc/testsuite/gcc.target/arm/simd/vst1_p64_xN_1.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* { dg-do assemble } */
-/* { dg-require-effective-target arm_crypto_ok } */
-/* { dg-options "-save-temps -O2" } */
-/* { dg-add-options arm_crypto } */
-
-#include "arm_neon.h"
-
-void test_vst1_p64_x2 (poly64_t * ptr, poly64x1x2_t val)
-{
-    vst1_p64_x2 (ptr, val);
-}
-
-/* { 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