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.
#error Foo
#endif
-#pragma GCC target "+sve2+sme"
+#pragma GCC target "+sme"
#ifndef __ARM_FEATURE_SME
#error Foo
#endif
#error Foo
#endif
-#pragma GCC target "+nothing+sve2+sme"
+#pragma GCC target "+nothing+sme"
#ifdef __ARM_FEATURE_SME_I16I64
#error Foo
#endif
#error Foo
#endif
-#pragma GCC target "+nothing+sve2+sme-i16i64"
+#pragma GCC target "+nothing+sme-i16i64"
#ifndef __ARM_FEATURE_SME_I16I64
#error Foo
#endif
#error Foo
#endif
-#pragma GCC target "+nothing+sve2+sme-b16b16"
+#pragma GCC target "+nothing+sme-b16b16"
#ifndef __ARM_FEATURE_SME_B16B16
#error Foo
#endif
#error Foo
#endif
-#pragma GCC target "+nothing+sve2+sme-f16f16"
+#pragma GCC target "+nothing+sme-f16f16"
#ifndef __ARM_FEATURE_SME_F16F16
#error Foo
#endif
#error Foo
#endif
-#pragma GCC target "+nothing+sve2+sme-f64f64"
+#pragma GCC target "+nothing+sme-f64f64"
#ifndef __ARM_FEATURE_SME_F64F64
#error Foo
#endif
#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
#error Foo
#endif
-#pragma GCC target "+nothing+sve2+sme2p1"
+#pragma GCC target "+nothing+sme2p1"
#ifndef __ARM_FEATURE_SME
#error Foo
#endif
/* { dg-do compile } */
-#pragma GCC target "+sve2+sme2"
+#pragma GCC target "+sme2"
#include <arm_sve.h>
/* { dg-do compile } */
-#pragma GCC target "+sve2+sme2"
+#pragma GCC target "+sme2"
#include <arm_sve.h>
/* { dg-do compile } */
-#pragma GCC target "+sve2+sme2"
+#pragma GCC target "+sme2"
#include <arm_sve.h>
#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,
#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,
#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,
#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,
#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,
#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,
#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,
#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,
#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,
#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,
#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,
#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 };
#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,
#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,
#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,
#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,
#include <arm_sve.h>
-#pragma GCC target ("+sve2+sme2")
+#pragma GCC target ("+sme2")
void
f1 (svboolx2_t pgx2,
#include <arm_sve.h>
-#pragma GCC target "+sve2+sme2"
+#pragma GCC target "+sme2"
struct s { signed char x; };
#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,
#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,
#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,
#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,
#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,
#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,
#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,
#include <arm_sve.h>
-#pragma GCC target "+sve2+sme2"
+#pragma GCC target "+sme2"
void
test (svfloat32_t f32, svfloat32x2_t f32x2, svfloat32x3_t f32x3,
#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,
#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,