diff options
11 files changed, 44 insertions, 15 deletions
diff --git a/gcc/config/aarch64/aarch64-sve-builtins-base.cc b/gcc/config/aarch64/aarch64-sve-builtins-base.cc index fe16d93adcd..1c9f515a52c 100644 --- a/gcc/config/aarch64/aarch64-sve-builtins-base.cc +++ b/gcc/config/aarch64/aarch64-sve-builtins-base.cc @@ -3184,10 +3184,6 @@ FUNCTION (svadrb, svadr_bhwd_impl, (0)) FUNCTION (svadrd, svadr_bhwd_impl, (3)) FUNCTION (svadrh, svadr_bhwd_impl, (1)) FUNCTION (svadrw, svadr_bhwd_impl, (2)) -FUNCTION (svamax, cond_or_uncond_unspec_function, - (UNSPEC_COND_FAMAX, UNSPEC_FAMAX)) -FUNCTION (svamin, cond_or_uncond_unspec_function, - (UNSPEC_COND_FAMIN, UNSPEC_FAMIN)) FUNCTION (svand, rtx_code_function, (AND, AND)) FUNCTION (svandv, reduction, (UNSPEC_ANDV)) FUNCTION (svasr, rtx_code_function, (ASHIFTRT, ASHIFTRT)) diff --git a/gcc/config/aarch64/aarch64-sve-builtins-base.def b/gcc/config/aarch64/aarch64-sve-builtins-base.def index edfe2574507..da2a0e41aa5 100644 --- a/gcc/config/aarch64/aarch64-sve-builtins-base.def +++ b/gcc/config/aarch64/aarch64-sve-builtins-base.def @@ -368,8 +368,3 @@ DEF_SVE_FUNCTION (svuzp2q, binary, all_data, none) DEF_SVE_FUNCTION (svzip1q, binary, all_data, none) DEF_SVE_FUNCTION (svzip2q, binary, all_data, none) #undef REQUIRED_EXTENSIONS - -#define REQUIRED_EXTENSIONS ssve (AARCH64_FL_FAMINMAX) -DEF_SVE_FUNCTION (svamax, binary_opt_single_n, all_float, mxz) -DEF_SVE_FUNCTION (svamin, binary_opt_single_n, all_float, mxz) -#undef REQUIRED_EXTENSIONS diff --git a/gcc/config/aarch64/aarch64-sve-builtins-sve2.cc b/gcc/config/aarch64/aarch64-sve-builtins-sve2.cc index d29c2209fdf..64f86035c30 100644 --- a/gcc/config/aarch64/aarch64-sve-builtins-sve2.cc +++ b/gcc/config/aarch64/aarch64-sve-builtins-sve2.cc @@ -591,6 +591,10 @@ FUNCTION (svaesd, fixed_insn_function, (CODE_FOR_aarch64_sve2_aesd)) FUNCTION (svaese, fixed_insn_function, (CODE_FOR_aarch64_sve2_aese)) FUNCTION (svaesimc, fixed_insn_function, (CODE_FOR_aarch64_sve2_aesimc)) FUNCTION (svaesmc, fixed_insn_function, (CODE_FOR_aarch64_sve2_aesmc)) +FUNCTION (svamax, cond_or_uncond_unspec_function, + (UNSPEC_COND_FAMAX, UNSPEC_FAMAX)) +FUNCTION (svamin, cond_or_uncond_unspec_function, + (UNSPEC_COND_FAMIN, UNSPEC_FAMIN)) FUNCTION (svbcax, CODE_FOR_MODE0 (aarch64_sve2_bcax),) FUNCTION (svbdep, unspec_based_function, (UNSPEC_BDEP, UNSPEC_BDEP, -1)) FUNCTION (svbext, unspec_based_function, (UNSPEC_BEXT, UNSPEC_BEXT, -1)) diff --git a/gcc/config/aarch64/aarch64-sve-builtins-sve2.def b/gcc/config/aarch64/aarch64-sve-builtins-sve2.def index 345a7621b6f..e4021559f36 100644 --- a/gcc/config/aarch64/aarch64-sve-builtins-sve2.def +++ b/gcc/config/aarch64/aarch64-sve-builtins-sve2.def @@ -283,3 +283,10 @@ DEF_SVE_FUNCTION (svwhilelt, compare_scalar_count, while_x_c, none) DEF_SVE_FUNCTION_GS (svzip, unaryxn, all_data, x24, none) DEF_SVE_FUNCTION_GS (svzipq, unaryxn, all_data, x24, none) #undef REQUIRED_EXTENSIONS + +#define REQUIRED_EXTENSIONS \ + sve_and_sme (AARCH64_FL_SVE2 | AARCH64_FL_FAMINMAX, \ + AARCH64_FL_SME2 | AARCH64_FL_FAMINMAX) +DEF_SVE_FUNCTION (svamax, binary_opt_single_n, all_float, mxz) +DEF_SVE_FUNCTION (svamin, binary_opt_single_n, all_float, mxz) +#undef REQUIRED_EXTENSIONS diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general/amin_1.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general/amin_1.c new file mode 100644 index 00000000000..e2c28cfaf62 --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/sve/acle/general/amin_1.c @@ -0,0 +1,9 @@ +#include <arm_sve.h> + +#pragma GCC target "+nosme2+sve2+faminmax+sme" + +svfloat32_t +foo (svfloat32_t x, svfloat32_t y) __arm_streaming +{ + return svamin_x (svptrue_b8 (), x, y); /* { dg-error {ACLE function '[^']*' requires ISA extension 'sme2'} } */ +} diff --git a/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amax_f16.c b/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amax_f16.c index 3d99e4bd92d..43c1e4d9c51 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amax_f16.c +++ b/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amax_f16.c @@ -3,7 +3,10 @@ #include "test_sve_acle.h" -#pragma GCC target "+sve+faminmax" +#pragma GCC target "+sve2+faminmax" +#if STREAMING_COMPATIBLE +#pragma GCC target "+sme2" +#endif /* ** amax_f16_m_tied1: diff --git a/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amax_f32.c b/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amax_f32.c index 686996625fb..56e6b7333a0 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amax_f32.c +++ b/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amax_f32.c @@ -3,7 +3,10 @@ #include "test_sve_acle.h" -#pragma GCC target "+sve+faminmax" +#pragma GCC target "+sve2+faminmax" +#if STREAMING_COMPATIBLE +#pragma GCC target "+sme2" +#endif /* ** amax_f32_m_tied1: diff --git a/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amax_f64.c b/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amax_f64.c index e0f0ac32e54..458c7051702 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amax_f64.c +++ b/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amax_f64.c @@ -3,7 +3,10 @@ #include "test_sve_acle.h" -#pragma GCC target "+sve+faminmax" +#pragma GCC target "+sve2+faminmax" +#if STREAMING_COMPATIBLE +#pragma GCC target "+sme2" +#endif /* ** amax_f64_m_tied1: diff --git a/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amin_f16.c b/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amin_f16.c index f93aed6cba5..4c36c425493 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amin_f16.c +++ b/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amin_f16.c @@ -3,7 +3,10 @@ #include "test_sve_acle.h" -#pragma GCC target "+sve+faminmax" +#pragma GCC target "+sve2+faminmax" +#if STREAMING_COMPATIBLE +#pragma GCC target "+sme2" +#endif /* ** amin_f16_m_tied1: diff --git a/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amin_f32.c b/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amin_f32.c index cc1a343160e..56943fc0657 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amin_f32.c +++ b/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amin_f32.c @@ -3,7 +3,10 @@ #include "test_sve_acle.h" -#pragma GCC target "+sve+faminmax" +#pragma GCC target "+sve2+faminmax" +#if STREAMING_COMPATIBLE +#pragma GCC target "+sme2" +#endif /* ** amin_f32_m_tied1: diff --git a/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amin_f64.c b/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amin_f64.c index b5133f12950..a93f7d687f5 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amin_f64.c +++ b/gcc/testsuite/gcc.target/aarch64/sve2/acle/asm/amin_f64.c @@ -3,7 +3,10 @@ #include "test_sve_acle.h" -#pragma GCC target "+sve+faminmax" +#pragma GCC target "+sve2+faminmax" +#if STREAMING_COMPATIBLE +#pragma GCC target "+sme2" +#endif /* ** amin_f64_m_tied1: |