This reverts the testsuite changes in r15-9067-g432f0dd62c3b29.
gcc/testsuite/ChangeLog:
* gcc.target/aarch64/pragma_cpp_predefs_4.c: Remove unnecessary
uses of +sve2.
* gcc.target/aarch64/sve/acle/general-c/binary_int_opt_single_n_2.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/binary_opt_single_n_2.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/binary_single_1.c:
Ditto.
*
gcc.target/aarch64/sve/acle/general-c/binary_za_slice_int_opt_single_1.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_1.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_2.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_3.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_4.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/binary_za_slice_opt_single_1.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/binary_za_slice_opt_single_2.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/binary_za_slice_opt_single_3.c:
Ditto.
*
gcc.target/aarch64/sve/acle/general-c/binary_za_slice_uint_opt_single_1.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/binaryxn_2.c: Ditto.
* gcc.target/aarch64/sve/acle/general-c/clamp_1.c: Ditto.
* gcc.target/aarch64/sve/acle/general-c/compare_scalar_count_1.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/dot_za_slice_int_lane_1.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/dot_za_slice_lane_1.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/dot_za_slice_lane_2.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/dot_za_slice_uint_lane_1.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/shift_right_imm_narrowxn_1.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/storexn_1.c: Ditto.
* gcc.target/aarch64/sve/acle/general-c/ternary_mfloat8_lane_1.c:
Ditto.
*
gcc.target/aarch64/sve/acle/general-c/ternary_mfloat8_lane_group_selection_1.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/ternary_qq_or_011_lane_1.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/unary_convertxn_1.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/unary_convertxn_narrow_1.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/unary_convertxn_narrowt_1.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/unary_za_slice_1.c:
Ditto.
* gcc.target/aarch64/sve/acle/general-c/unaryxn_1.c: Ditto.
* gcc.target/aarch64/sve/acle/general-c/write_za_1.c: Ditto.
* gcc.target/aarch64/sve/acle/general-c/write_za_slice_1.c:
Ditto.
diff --git a/gcc/testsuite/gcc.target/aarch64/pragma_cpp_predefs_4.c
b/gcc/testsuite/gcc.target/aarch64/pragma_cpp_predefs_4.c
index
284c2a232520517125f92c3f1ba74d3bb8e90059..0025de6a139645db00d041d0f3f9ab147a7442b0
100644
--- a/gcc/testsuite/gcc.target/aarch64/pragma_cpp_predefs_4.c
+++ b/gcc/testsuite/gcc.target/aarch64/pragma_cpp_predefs_4.c
@@ -46,7 +46,7 @@
#error Foo
#endif
-#pragma GCC target "+sve2+sme"
+#pragma GCC target "+sme"
#ifndef __ARM_FEATURE_SME
#error Foo
#endif
@@ -66,7 +66,7 @@
#error Foo
#endif
-#pragma GCC target "+nothing+sve2+sme"
+#pragma GCC target "+nothing+sme"
#ifdef __ARM_FEATURE_SME_I16I64
#error Foo
#endif
@@ -86,7 +86,7 @@
#error Foo
#endif
-#pragma GCC target "+nothing+sve2+sme-i16i64"
+#pragma GCC target "+nothing+sme-i16i64"
#ifndef __ARM_FEATURE_SME_I16I64
#error Foo
#endif
@@ -97,7 +97,7 @@
#error Foo
#endif
-#pragma GCC target "+nothing+sve2+sme-b16b16"
+#pragma GCC target "+nothing+sme-b16b16"
#ifndef __ARM_FEATURE_SME_B16B16
#error Foo
#endif
@@ -139,7 +139,7 @@
#error Foo
#endif
-#pragma GCC target "+nothing+sve2+sme-f16f16"
+#pragma GCC target "+nothing+sme-f16f16"
#ifndef __ARM_FEATURE_SME_F16F16
#error Foo
#endif
@@ -150,7 +150,7 @@
#error Foo
#endif
-#pragma GCC target "+nothing+sve2+sme-f64f64"
+#pragma GCC target "+nothing+sme-f64f64"
#ifndef __ARM_FEATURE_SME_F64F64
#error Foo
#endif
@@ -194,7 +194,7 @@
#error Foo
#endif
-#pragma GCC target "+nothing+sve2+sve-b16b16+sme2"
+#pragma GCC target "+nothing+sve-b16b16+sme2"
#ifndef __ARM_FEATURE_SVE_B16B16
#error Foo
#endif
@@ -202,7 +202,7 @@
#error Foo
#endif
-#pragma GCC target "+nothing+sve2+sme2p1"
+#pragma GCC target "+nothing+sme2p1"
#ifndef __ARM_FEATURE_SME
#error Foo
#endif
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_int_opt_single_n_2.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_int_opt_single_n_2.c
index
7150d37a2aa78e79ab7ae1852cea7c435dda8be1..976d5af7f2373d826bfdb7fcef0a6d267f172db4
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_int_opt_single_n_2.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_int_opt_single_n_2.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-#pragma GCC target "+sve2+sme2"
+#pragma GCC target "+sme2"
#include <arm_sve.h>
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_opt_single_n_2.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_opt_single_n_2.c
index
2823264edbdac1988cfbf9cc70bfd89b567f3459..5cc8a4c5c50fcd663db2c43c16ae5aec9b1b14a1
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_opt_single_n_2.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_opt_single_n_2.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-#pragma GCC target "+sve2+sme2"
+#pragma GCC target "+sme2"
#include <arm_sve.h>
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_single_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_single_1.c
index
52f2c090f57b5817f8f7d1938c873f064a0af631..aa7633bb322f331ce57f293bfda2c7e124e63873
100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_single_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_single_1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-#pragma GCC target "+sve2+sme2"
+#pragma GCC target "+sme2"
#include <arm_sve.h>
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_int_opt_single_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_int_opt_single_1.c
index
0e88c1409f414180b50359fcddff9424151ca8c2..01cd88f180b84c1b5644ae81eb892c920dc58bc0
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_int_opt_single_1.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_int_opt_single_1.c
@@ -2,7 +2,7 @@
#include <arm_sme.h>
-#pragma GCC target ("+sve2+sme2")
+#pragma GCC target ("+sme2")
void
f1 (svbool_t pg, svint16_t s16, svint8_t s8, svuint8_t u8,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_1.c
index
885529804232c985a8e35583e66e70494be100a4..8fa2a0b06fc68f92825c77f7047c98812284da77
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_1.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_1.c
@@ -2,7 +2,7 @@
#include <arm_sme.h>
-#pragma GCC target ("+sve2+sme2")
+#pragma GCC target ("+sme2")
void
f1 (svbool_t pg, svint16_t s16, svuint16_t u16, svint32_t s32, svuint32_t u32,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_2.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_2.c
index
dd90ebc309ed564c904177b7c293a507bfb30b61..126a764c998e1c2b8e6ed7e3230f82066b6ec10b
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_2.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_2.c
@@ -2,7 +2,7 @@
#include <arm_sme.h>
-#pragma GCC target ("+sve2+sme2")
+#pragma GCC target ("+sme2")
void
f1 (svbool_t pg, svint16_t s16, svuint16_t u16, svint32_t s32, svuint32_t u32,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_3.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_3.c
index
f53cc55be3bf4ec4069b3eafa74502253847bfb9..17bed0c72dc5e6a877f41e78b1154d0084dd4d89
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_3.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_3.c
@@ -2,7 +2,7 @@
#include <arm_sme.h>
-#pragma GCC target ("+sve2+sme2")
+#pragma GCC target ("+sme2")
void
f1 (svbool_t pg, svint16_t s16, svuint16_t u16, svint32_t s32, svuint32_t u32,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_4.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_4.c
index
83c659d94fa8c133400eebb81e497076311c5f7d..d2a67c678dff591086e4aef9b72a86d0b2f76ac6
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_4.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_lane_4.c
@@ -2,7 +2,7 @@
#include <arm_sme.h>
-#pragma GCC target ("+sve2+sme2")
+#pragma GCC target ("+sme2")
void
f1 (svint8_t s8, svuint8_t u8, svint16_t s16, svuint16_t u16,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_opt_single_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_opt_single_1.c
index
b1d9a82916ac8c9f891bca0dee02c51c61956c17..759d0b2ff6178275c1ac3b9f3310773494b6730f
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_opt_single_1.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_opt_single_1.c
@@ -2,7 +2,7 @@
#include <arm_sme.h>
-#pragma GCC target ("+sve2+sme2")
+#pragma GCC target ("+sme2")
void
f1 (svbool_t pg, svint16_t s16, svint32_t s32, svuint32_t u32,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_opt_single_2.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_opt_single_2.c
index
959e2229ea9337aa7f188399b845b9214082a3a6..181f509eee13eb7e70ddba019f5b2c36cd10a31f
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_opt_single_2.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_opt_single_2.c
@@ -2,7 +2,7 @@
#include <arm_sme.h>
-#pragma GCC target ("+sve2+sme2")
+#pragma GCC target ("+sme2")
void
f1 (svbool_t pg, svint16_t s16, svint32_t s32, svuint32_t u32,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_opt_single_3.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_opt_single_3.c
index
9cc42c0174eae9fd2b07bf2c533772c95cfd64bf..8c8414ec55cf43ff10a0291f6f901f65d332646f
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_opt_single_3.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_opt_single_3.c
@@ -2,7 +2,7 @@
#include <arm_sme.h>
-#pragma GCC target ("+sve2+sme2+nosme-i16i64")
+#pragma GCC target ("+sme2+nosme-i16i64")
void
f1 (svint32x2_t s32x2, svuint32x2_t u32x2,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_uint_opt_single_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_uint_opt_single_1.c
index
b289c9c871fe18d806b52de52da510b711cf6d4f..b00c04320bf06c72f62ec3f249952d235991180e
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_uint_opt_single_1.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binary_za_slice_uint_opt_single_1.c
@@ -2,7 +2,7 @@
#include <arm_sme.h>
-#pragma GCC target ("+sve2+sme2")
+#pragma GCC target ("+sme2")
void
f1 (svbool_t pg, svuint16_t u16, svint8_t s8, svuint8_t u8,
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binaryxn_2.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binaryxn_2.c
index
4f8ebf8c2c7ad703f9702bf2a58eb0bae995480b..600b7fc7959d1c8b42ea6c6d843349422677ad24
100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binaryxn_2.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/binaryxn_2.c
@@ -2,7 +2,7 @@
#include <arm_sve.h>
-#pragma GCC target "+sve2+sme2"
+#pragma GCC target "+sme2"
void
f1 (svbool_t pg, svcount_t pn, svuint8_t u8, svint16_t s16,
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/clamp_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/clamp_1.c
index
958c40a2fc6b9a9045cc8c0cd3ddaf7a6e790c3f..07e22d2dd715da7457e4944a01e24bb9dcb4652e
100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/clamp_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/clamp_1.c
@@ -2,7 +2,7 @@
#include <arm_sve.h>
-#pragma GCC target "+sve2+sme2"
+#pragma GCC target "+sme2"
void
f1 (svcount_t pn, svfloat16_t f16, svint16_t s16, svfloat32_t f32,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/compare_scalar_count_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/compare_scalar_count_1.c
index
4a4222c1e820e62bf780f6caa357694a2ddc4d30..47077f7a4e5b48d6efb2f5b18994c2c0dd79f25f
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/compare_scalar_count_1.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/compare_scalar_count_1.c
@@ -3,7 +3,7 @@
#include <arm_sve.h>
#include <stdbool.h>
-#pragma GCC target "+sve2+sme2"
+#pragma GCC target "+sme2"
enum signed_enum { SA = -1, SB };
enum unsigned_enum { UA, UB };
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/dot_za_slice_int_lane_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/dot_za_slice_int_lane_1.c
index
aed92b57ac8ddf20d3ad77414b66b4a75e288837..ca2a039b3903cccb7f98913004750a0086c22c81
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/dot_za_slice_int_lane_1.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/dot_za_slice_int_lane_1.c
@@ -2,7 +2,7 @@
#include <arm_sme.h>
-#pragma GCC target ("+sve2+sme2")
+#pragma GCC target ("+sme2")
void
f1 (svbool_t pg, svint8_t s8, svuint8_t u8, svint16_t s16, svuint16_t u16,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/dot_za_slice_lane_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/dot_za_slice_lane_1.c
index
bb408682d6b4a5f14125fcf88636b3ecd85890f3..e37d24ab6087f68da92f31ddeb5160f676b2d432
100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/dot_za_slice_lane_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/dot_za_slice_lane_1.c
@@ -2,7 +2,7 @@
#include <arm_sme.h>
-#pragma GCC target ("+sve2+sme2")
+#pragma GCC target ("+sme2")
void
f1 (svbool_t pg, svint8_t s8, svuint8_t u8, svint16_t s16, svuint16_t u16,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/dot_za_slice_lane_2.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/dot_za_slice_lane_2.c
index
7d57bd1bdadcb8b14a43d1839b4c854a79ec2b03..7af3c6f9eef9cfade446583b0ef13c483ffc7d76
100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/dot_za_slice_lane_2.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/dot_za_slice_lane_2.c
@@ -2,7 +2,7 @@
#include <arm_sme.h>
-#pragma GCC target ("+sve2+sme2")
+#pragma GCC target ("+sme2")
void
f1 (svbool_t pg, svint8_t s8, svuint8_t u8, svint16_t s16, svuint16_t u16,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/dot_za_slice_uint_lane_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/dot_za_slice_uint_lane_1.c
index
cba11a423802e0364b66500033ce5d0ca28b5f3a..2efa2eb15ee0f713815b1d4a83dbdcbfb8a3cf87
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/dot_za_slice_uint_lane_1.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/dot_za_slice_uint_lane_1.c
@@ -2,7 +2,7 @@
#include <arm_sme.h>
-#pragma GCC target ("+sve2+sme2")
+#pragma GCC target ("+sme2")
void
f1 (svbool_t pg, svint8_t s8, svuint8_t u8, svint16_t s16, svuint16_t u16,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/shift_right_imm_narrowxn_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/shift_right_imm_narrowxn_1.c
index
685d0700400d1e21b6b82a8ee45192e258578478..ab5602f0aa69e1a3a02546f48739e56ffb6f968f
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/shift_right_imm_narrowxn_1.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/shift_right_imm_narrowxn_1.c
@@ -2,7 +2,7 @@
#include <arm_sve.h>
-#pragma GCC target ("+sve2+sme2")
+#pragma GCC target ("+sme2")
void
f1 (svboolx2_t pgx2,
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/storexn_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/storexn_1.c
index
ba0096b4b4b36513fe7ebf66c14883e6b3833db9..7ad4ca8a580ac9623dabc4ba32c0d978070f93c0
100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/storexn_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/storexn_1.c
@@ -3,7 +3,7 @@
#include <arm_sve.h>
-#pragma GCC target "+sve2+sme2"
+#pragma GCC target "+sme2"
struct s { signed char x; };
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/ternary_mfloat8_lane_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/ternary_mfloat8_lane_1.c
index
c01710f45649b0d49229939004b2dc45d5770bc3..6bdd3c06dc2b289186d27fa598b75e7a303e0432
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/ternary_mfloat8_lane_1.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/ternary_mfloat8_lane_1.c
@@ -2,7 +2,7 @@
#include <arm_sve.h>
-#pragma GCC target ("arch=armv8.2-a+sve2+ssve-fp8fma")
+#pragma GCC target ("arch=armv8.2-a+ssve-fp8fma")
void
f1 (svfloat16_t f16, svmfloat8_t f8, fpm_t fpm,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/ternary_mfloat8_lane_group_selection_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/ternary_mfloat8_lane_group_selection_1.c
index
fecaf98101a6a3d8ac4e16ae5608d1d7f0587861..f6fce2f5c40f3da214da115d76ad7600f98749bc
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/ternary_mfloat8_lane_group_selection_1.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/ternary_mfloat8_lane_group_selection_1.c
@@ -2,7 +2,7 @@
#include <arm_sve.h>
-#pragma GCC target
("arch=armv8.2-a+sve2+ssve-fp8fma+ssve-fp8dot4+ssve-fp8dot2")
+#pragma GCC target ("arch=armv8.2-a+ssve-fp8fma+ssve-fp8dot4+ssve-fp8dot2")
void
f1 (svfloat16_t f16, svmfloat8_t f8, fpm_t fpm,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/ternary_qq_or_011_lane_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/ternary_qq_or_011_lane_1.c
index
5579e0d11b002f09944c19f6169236eeb3bf6851..b8968c878e1d315299c39a6dee7ee261cd4e9c43
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/ternary_qq_or_011_lane_1.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/ternary_qq_or_011_lane_1.c
@@ -2,7 +2,7 @@
#include <arm_sve.h>
-#pragma GCC target "+sve2+sme2"
+#pragma GCC target "+sme2"
void
f1 (svbool_t pg, svint8_t s8, svuint8_t u8, svint16_t s16, svuint16_t u16,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_convertxn_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_convertxn_1.c
index
e14ec71f0c3351a2cd396ebf1a4034b6e1641a52..85f8b45032d1a0d0d0a1bd1d8f42d98f65f94be3
100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_convertxn_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_convertxn_1.c
@@ -1,6 +1,6 @@
#include <arm_sve.h>
-#pragma GCC target "+sve2+sme2"
+#pragma GCC target "+sme2"
void
test (svbool_t pg, float f, svint8_t s8, svfloat32_t f32,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_convertxn_narrow_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_convertxn_narrow_1.c
index
e93cc64328f8f318924013371755594451ad2870..d312e857d8146ba0f362dc78602af9c8e371c2ff
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_convertxn_narrow_1.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_convertxn_narrow_1.c
@@ -1,6 +1,6 @@
#include <arm_sve.h>
-#pragma GCC target "+sve2+sme2+fp8"
+#pragma GCC target "+sme2+fp8"
void
test (svfloat16x2_t f16x2, svbfloat16x2_t bf16x2, svfloat32x2_t f32x2,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_convertxn_narrowt_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_convertxn_narrowt_1.c
index
da828f0aaf1720a47208f15c7965b4cf02cdb105..ab97eef3472c8683176455f8034da990b67efb7c
100644
---
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_convertxn_narrowt_1.c
+++
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_convertxn_narrowt_1.c
@@ -1,6 +1,6 @@
#include <arm_sve.h>
-#pragma GCC target "+sve2+sme2+fp8"
+#pragma GCC target "+sme2+fp8"
void
test (svmfloat8_t f8, svfloat32x2_t f32x2, fpm_t fpm0,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_za_slice_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_za_slice_1.c
index
c3052a0a0f432d29420fdbe065e94158d94768f5..e02fe5405b1f0b0bc95b97c0ecfaf7f6020afcff
100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_za_slice_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_za_slice_1.c
@@ -2,7 +2,7 @@
#include <arm_sme.h>
-#pragma GCC target ("+sve2+sme2")
+#pragma GCC target ("+sme2")
void
f1 (svbool_t pg, svint32_t s32, svint16x2_t s16x2, svint32x2_t s32x2,
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unaryxn_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unaryxn_1.c
index
e9656bc69afcd33b3c51fc86bdcae71b5379e382..f478945562c8dcc154f88c1fac658092f07cba3e
100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unaryxn_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unaryxn_1.c
@@ -1,6 +1,6 @@
#include <arm_sve.h>
-#pragma GCC target "+sve2+sme2"
+#pragma GCC target "+sme2"
void
test (svfloat32_t f32, svfloat32x2_t f32x2, svfloat32x3_t f32x3,
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/write_za_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/write_za_1.c
index
95ead96a579bbf6c30b5d1e4163c644730cb702a..3a45b58b023490e6e33c4f5285c0422530f8f827
100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/write_za_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/write_za_1.c
@@ -2,7 +2,7 @@
#include <arm_sme.h>
-#pragma GCC target "+sve2+sme2"
+#pragma GCC target "+sme2"
void
f1 (svint8_t s8, svint8x2_t s8x2, svint8x3_t s8x3, svint8x4_t s8x4,
diff --git
a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/write_za_slice_1.c
b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/write_za_slice_1.c
index
dae88926e9852a3597e181d10a8a723c72ad01d5..dedd4b16ea2450e88a5177c4a00350a70a913245
100644
--- a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/write_za_slice_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/write_za_slice_1.c
@@ -2,7 +2,7 @@
#include <arm_sme.h>
-#pragma GCC target "+sve2+sme2"
+#pragma GCC target "+sme2"
void
f1 (svint8_t s8, svint8x2_t s8x2, svint8x3_t s8x3, svint8x4_t s8x4,
