[09/15] aarch64: Sort some SVE2 lists alphabetically

Message ID	mptzfmc8brp.fsf@arm.com
State	New
Headers	show Return-Path: <gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org> DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 62B153858D20 From: Richard Sandiford <richard.sandiford@arm.com> To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org,richard.earnshaw@arm.com, ktkachov@gcc.gnu.org, richard.sandiford@arm.com Cc: richard.earnshaw@arm.com, ktkachov@gcc.gnu.org Subject: [PATCH 09/15] aarch64: Sort some SVE2 lists alphabetically In-Reply-To: <mptikt0b53u.fsf@arm.com> (Richard Sandiford's message of "Wed, 06 Nov 2024 18:16:05 +0000") References: <mptikt0b53u.fsf@arm.com> Date: Wed, 06 Nov 2024 18:20:26 +0000 Message-ID: <mptzfmc8brp.fsf@arm.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain Precedence: list Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org
Series	aarch64: Add support for SVE2.1 \| expand [00/15] aarch64: Add support for SVE2.1 [01/15] aarch64: Make more use of TARGET_STREAMING_SME2 [02/15] aarch64: Test TARGET_STREAMING instead of TARGET_STREAMING_SME [03/15] aarch64: Tweak definition of all_data & co [04/15] aarch64: Use braces in SVE TBL instructions [05/15] aarch64: Add an abstraction for vector base addresses [06/15] aarch64: Add an abstraction for scatter store type inference [07/15] aarch64: Parameterise SVE pointer type inference [08/15] aarch64: Factor out part of the SVE ext_def class [09/15] aarch64: Sort some SVE2 lists alphabetically [10/15] aarch64: Add svboolx4_t [11/15] aarch64: Define arm_neon.h types in arm_sve.h too [12/15] aarch64: Add common subset of SVE2p1 and SME [13/15] aarch64: Add common subset of SVE2p1 and SME2 [14/15] aarch64: Add remaining SVE2p1 support [15/15] aarch64: Conditionally define __ARM_FEATURE_SVE2p1

diff --git a/gcc/config/aarch64/aarch64-sve-builtins-sve2.cc b/gcc/config/aarch64/aarch64-sve-builtins-sve2.cc index f0ab7400ef5..24e95afd6eb 100644 --- a/gcc/config/aarch64/aarch64-sve-builtins-sve2.cc +++ b/gcc/config/aarch64/aarch64-sve-builtins-sve2.cc @@ -589,20 +589,20 @@ FUNCTION (svabalb, unspec_based_add_function, (UNSPEC_SABDLB, UNSPEC_UABDLB, -1)) FUNCTION (svabalt, unspec_based_add_function, (UNSPEC_SABDLT, UNSPEC_UABDLT, -1)) +FUNCTION (svabdlb, unspec_based_function, (UNSPEC_SABDLB, UNSPEC_UABDLB, -1)) +FUNCTION (svabdlt, unspec_based_function, (UNSPEC_SABDLT, UNSPEC_UABDLT, -1)) +FUNCTION (svadalp, unspec_based_function, (UNSPEC_SADALP, UNSPEC_UADALP, -1)) FUNCTION (svadclb, unspec_based_function, (-1, UNSPEC_ADCLB, -1)) FUNCTION (svadclt, unspec_based_function, (-1, UNSPEC_ADCLT, -1)) FUNCTION (svaddhnb, unspec_based_function, (UNSPEC_ADDHNB, UNSPEC_ADDHNB, -1)) FUNCTION (svaddhnt, unspec_based_function, (UNSPEC_ADDHNT, UNSPEC_ADDHNT, -1)) -FUNCTION (svabdlb, unspec_based_function, (UNSPEC_SABDLB, UNSPEC_UABDLB, -1)) -FUNCTION (svabdlt, unspec_based_function, (UNSPEC_SABDLT, UNSPEC_UABDLT, -1)) -FUNCTION (svadalp, unspec_based_function, (UNSPEC_SADALP, UNSPEC_UADALP, -1)) FUNCTION (svaddlb, unspec_based_function, (UNSPEC_SADDLB, UNSPEC_UADDLB, -1)) FUNCTION (svaddlbt, unspec_based_function, (UNSPEC_SADDLBT, -1, -1)) FUNCTION (svaddlt, unspec_based_function, (UNSPEC_SADDLT, UNSPEC_UADDLT, -1)) -FUNCTION (svaddwb, unspec_based_function, (UNSPEC_SADDWB, UNSPEC_UADDWB, -1)) -FUNCTION (svaddwt, unspec_based_function, (UNSPEC_SADDWT, UNSPEC_UADDWT, -1)) FUNCTION (svaddp, unspec_based_pred_function, (UNSPEC_ADDP, UNSPEC_ADDP, UNSPEC_FADDP)) +FUNCTION (svaddwb, unspec_based_function, (UNSPEC_SADDWB, UNSPEC_UADDWB, -1)) +FUNCTION (svaddwt, unspec_based_function, (UNSPEC_SADDWT, UNSPEC_UADDWT, -1)) 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)) @@ -649,12 +649,12 @@ FUNCTION (svldnt1uh_gather, svldnt1_gather_extend_impl, (TYPE_SUFFIX_u16)) FUNCTION (svldnt1uw_gather, svldnt1_gather_extend_impl, (TYPE_SUFFIX_u32)) FUNCTION (svlogb, unspec_based_function, (-1, -1, UNSPEC_COND_FLOGB)) FUNCTION (svmatch, svmatch_svnmatch_impl, (UNSPEC_MATCH)) +FUNCTION (svmaxnmp, unspec_based_pred_function, (-1, -1, UNSPEC_FMAXNMP)) FUNCTION (svmaxp, unspec_based_pred_function, (UNSPEC_SMAXP, UNSPEC_UMAXP, UNSPEC_FMAXP)) -FUNCTION (svmaxnmp, unspec_based_pred_function, (-1, -1, UNSPEC_FMAXNMP)) +FUNCTION (svminnmp, unspec_based_pred_function, (-1, -1, UNSPEC_FMINNMP)) FUNCTION (svminp, unspec_based_pred_function, (UNSPEC_SMINP, UNSPEC_UMINP, UNSPEC_FMINP)) -FUNCTION (svminnmp, unspec_based_pred_function, (-1, -1, UNSPEC_FMINNMP)) FUNCTION (svmlalb, unspec_based_mla_function, (UNSPEC_SMULLB, UNSPEC_UMULLB, UNSPEC_FMLALB)) FUNCTION (svmlalb_lane, unspec_based_mla_lane_function, (UNSPEC_SMULLB, @@ -723,15 +723,15 @@ FUNCTION (svqdmullt_lane, unspec_based_lane_function, (UNSPEC_SQDMULLT, FUNCTION (svqneg, rtx_code_function, (SS_NEG, UNKNOWN, UNKNOWN)) FUNCTION (svqrdcmlah, svqrdcmlah_impl,) FUNCTION (svqrdcmlah_lane, svqrdcmlah_lane_impl,) -FUNCTION (svqrdmulh, unspec_based_function, (UNSPEC_SQRDMULH, -1, -1)) -FUNCTION (svqrdmulh_lane, unspec_based_lane_function, (UNSPEC_SQRDMULH, - -1, -1)) FUNCTION (svqrdmlah, unspec_based_function, (UNSPEC_SQRDMLAH, -1, -1)) FUNCTION (svqrdmlah_lane, unspec_based_lane_function, (UNSPEC_SQRDMLAH, -1, -1)) FUNCTION (svqrdmlsh, unspec_based_function, (UNSPEC_SQRDMLSH, -1, -1)) FUNCTION (svqrdmlsh_lane, unspec_based_lane_function, (UNSPEC_SQRDMLSH, -1, -1)) +FUNCTION (svqrdmulh, unspec_based_function, (UNSPEC_SQRDMULH, -1, -1)) +FUNCTION (svqrdmulh_lane, unspec_based_lane_function, (UNSPEC_SQRDMULH, + -1, -1)) FUNCTION (svqrshl, svqrshl_impl,) FUNCTION (svqrshr, unspec_based_uncond_function, (UNSPEC_SQRSHR, UNSPEC_UQRSHR, -1, 1)) @@ -805,12 +805,12 @@ FUNCTION (svunpk, svunpk_impl,) FUNCTION (svuqadd, svuqadd_impl,) FUNCTION (svuzp, multireg_permute, (UNSPEC_UZP)) FUNCTION (svuzpq, multireg_permute, (UNSPEC_UZPQ)) -FUNCTION (svzip, multireg_permute, (UNSPEC_ZIP)) -FUNCTION (svzipq, multireg_permute, (UNSPEC_ZIPQ)) FUNCTION (svwhilege, while_comparison, (UNSPEC_WHILEGE, UNSPEC_WHILEHS)) FUNCTION (svwhilegt, while_comparison, (UNSPEC_WHILEGT, UNSPEC_WHILEHI)) FUNCTION (svwhilerw, svwhilerw_svwhilewr_impl, (UNSPEC_WHILERW)) FUNCTION (svwhilewr, svwhilerw_svwhilewr_impl, (UNSPEC_WHILEWR)) FUNCTION (svxar, svxar_impl,) +FUNCTION (svzip, multireg_permute, (UNSPEC_ZIP)) +FUNCTION (svzipq, multireg_permute, (UNSPEC_ZIPQ)) } /* end namespace aarch64_sve */ diff --git a/gcc/config/aarch64/aarch64-sve-builtins-sve2.def b/gcc/config/aarch64/aarch64-sve-builtins-sve2.def index e4021559f36..12548fe39cb 100644 --- a/gcc/config/aarch64/aarch64-sve-builtins-sve2.def +++ b/gcc/config/aarch64/aarch64-sve-builtins-sve2.def @@ -21,13 +21,13 @@ DEF_SVE_FUNCTION (svaba, ternary_opt_n, all_integer, none) DEF_SVE_FUNCTION (svabalb, ternary_long_opt_n, hsd_integer, none) DEF_SVE_FUNCTION (svabalt, ternary_long_opt_n, hsd_integer, none) +DEF_SVE_FUNCTION (svabdlb, binary_long_opt_n, hsd_integer, none) +DEF_SVE_FUNCTION (svabdlt, binary_long_opt_n, hsd_integer, none) DEF_SVE_FUNCTION (svadalp, binary_wide, hsd_integer, mxz) DEF_SVE_FUNCTION (svadclb, ternary_opt_n, sd_unsigned, none) DEF_SVE_FUNCTION (svadclt, ternary_opt_n, sd_unsigned, none) DEF_SVE_FUNCTION (svaddhnb, binary_narrowb_opt_n, hsd_integer, none) DEF_SVE_FUNCTION (svaddhnt, binary_narrowt_opt_n, hsd_integer, none) -DEF_SVE_FUNCTION (svabdlb, binary_long_opt_n, hsd_integer, none) -DEF_SVE_FUNCTION (svabdlt, binary_long_opt_n, hsd_integer, none) DEF_SVE_FUNCTION (svaddlb, binary_long_opt_n, hsd_integer, none) DEF_SVE_FUNCTION (svaddlbt, binary_long_opt_n, hsd_signed, none) DEF_SVE_FUNCTION (svaddlt, binary_long_opt_n, hsd_integer, none) @@ -54,8 +54,10 @@ DEF_SVE_FUNCTION (svhadd, binary_opt_n, all_integer, mxz) DEF_SVE_FUNCTION (svhsub, binary_opt_n, all_integer, mxz) DEF_SVE_FUNCTION (svhsubr, binary_opt_n, all_integer, mxz) DEF_SVE_FUNCTION (svlogb, unary_to_int, all_float, mxz) -DEF_SVE_FUNCTION (svmaxp, binary, all_arith, mx) DEF_SVE_FUNCTION (svmaxnmp, binary, all_float, mx) +DEF_SVE_FUNCTION (svmaxp, binary, all_arith, mx) +DEF_SVE_FUNCTION (svminnmp, binary, all_float, mx) +DEF_SVE_FUNCTION (svminp, binary, all_arith, mx) DEF_SVE_FUNCTION (svmla_lane, ternary_lane, hsd_integer, none) DEF_SVE_FUNCTION (svmlalb, ternary_long_opt_n, s_float_hsd_integer, none) DEF_SVE_FUNCTION (svmlalb_lane, ternary_long_lane, s_float_sd_integer, none) @@ -66,8 +68,6 @@ DEF_SVE_FUNCTION (svmlslb, ternary_long_opt_n, s_float_hsd_integer, none) DEF_SVE_FUNCTION (svmlslb_lane, ternary_long_lane, s_float_sd_integer, none) DEF_SVE_FUNCTION (svmlslt, ternary_long_opt_n, s_float_hsd_integer, none) DEF_SVE_FUNCTION (svmlslt_lane, ternary_long_lane, s_float_sd_integer, none) -DEF_SVE_FUNCTION (svminp, binary, all_arith, mx) -DEF_SVE_FUNCTION (svminnmp, binary, all_float, mx) DEF_SVE_FUNCTION (svmovlb, unary_long, hsd_integer, none) DEF_SVE_FUNCTION (svmovlt, unary_long, hsd_integer, none) DEF_SVE_FUNCTION (svmul_lane, binary_lane, hsd_integer, none) @@ -101,14 +101,15 @@ DEF_SVE_FUNCTION (svqdmullb_lane, binary_long_lane, sd_signed, none) DEF_SVE_FUNCTION (svqdmullt, binary_long_opt_n, hsd_signed, none) DEF_SVE_FUNCTION (svqdmullt_lane, binary_long_lane, sd_signed, none) DEF_SVE_FUNCTION (svqneg, unary, all_signed, mxz) -DEF_SVE_FUNCTION (svqrdmulh, binary_opt_n, all_signed, none) -DEF_SVE_FUNCTION (svqrdmulh_lane, binary_lane, hsd_signed, none) +DEF_SVE_FUNCTION (svqrdcmlah, ternary_rotate, all_signed, none) +DEF_SVE_FUNCTION (svqrdcmlah_lane, ternary_lane_rotate, hs_signed, none) DEF_SVE_FUNCTION (svqrdmlah, ternary_opt_n, all_signed, none) DEF_SVE_FUNCTION (svqrdmlah_lane, ternary_lane, hsd_signed, none) DEF_SVE_FUNCTION (svqrdmlsh, ternary_opt_n, all_signed, none) DEF_SVE_FUNCTION (svqrdmlsh_lane, ternary_lane, hsd_signed, none) -DEF_SVE_FUNCTION (svqrdcmlah, ternary_rotate, all_signed, none) -DEF_SVE_FUNCTION (svqrdcmlah_lane, ternary_lane_rotate, hs_signed, none) +DEF_SVE_FUNCTION (svqrdmulh, binary_opt_n, all_signed, none) +DEF_SVE_FUNCTION (svqrdmulh_lane, binary_lane, hsd_signed, none) +DEF_SVE_FUNCTION (svqrshl, binary_int_opt_n, all_integer, mxz) DEF_SVE_FUNCTION (svqrshrnb, shift_right_imm_narrowb, hsd_integer, none) DEF_SVE_FUNCTION (svqrshrnt, shift_right_imm_narrowt, hsd_integer, none) DEF_SVE_FUNCTION (svqrshrunb, shift_right_imm_narrowb_to_uint, hsd_signed, none) @@ -119,7 +120,6 @@ DEF_SVE_FUNCTION (svqshrnb, shift_right_imm_narrowb, hsd_integer, none) DEF_SVE_FUNCTION (svqshrnt, shift_right_imm_narrowt, hsd_integer, none) DEF_SVE_FUNCTION (svqshrunb, shift_right_imm_narrowb_to_uint, hsd_signed, none) DEF_SVE_FUNCTION (svqshrunt, shift_right_imm_narrowt_to_uint, hsd_signed, none) -DEF_SVE_FUNCTION (svqrshl, binary_int_opt_n, all_integer, mxz) DEF_SVE_FUNCTION (svqsub, binary_opt_n, all_integer, mxz) DEF_SVE_FUNCTION (svqsubr, binary_opt_n, all_integer, mxz) DEF_SVE_FUNCTION (svqxtnb, unary_narrowb, hsd_integer, none) @@ -130,11 +130,11 @@ DEF_SVE_FUNCTION (svraddhnb, binary_narrowb_opt_n, hsd_integer, none) DEF_SVE_FUNCTION (svraddhnt, binary_narrowt_opt_n, hsd_integer, none) DEF_SVE_FUNCTION (svrecpe, unary, s_unsigned, mxz) DEF_SVE_FUNCTION (svrhadd, binary_opt_n, all_integer, mxz) -DEF_SVE_FUNCTION (svrsqrte, unary, s_unsigned, mxz) DEF_SVE_FUNCTION (svrshl, binary_int_opt_single_n, all_integer, mxz) DEF_SVE_FUNCTION (svrshr, shift_right_imm, all_integer, mxz) DEF_SVE_FUNCTION (svrshrnb, shift_right_imm_narrowb, hsd_integer, none) DEF_SVE_FUNCTION (svrshrnt, shift_right_imm_narrowt, hsd_integer, none) +DEF_SVE_FUNCTION (svrsqrte, unary, s_unsigned, mxz) DEF_SVE_FUNCTION (svrsra, ternary_shift_right_imm, all_integer, none) DEF_SVE_FUNCTION (svrsubhnb, binary_narrowb_opt_n, hsd_integer, none) DEF_SVE_FUNCTION (svrsubhnt, binary_narrowt_opt_n, hsd_integer, none) @@ -172,15 +172,15 @@ DEF_SVE_FUNCTION (svhistseg, binary_to_uint, b_integer, none) DEF_SVE_FUNCTION (svldnt1_gather, load_gather_sv_restricted, sd_data, implicit) DEF_SVE_FUNCTION (svldnt1_gather, load_gather_vs, sd_data, implicit) DEF_SVE_FUNCTION (svldnt1sb_gather, load_ext_gather_offset_restricted, sd_integer, implicit) -DEF_SVE_FUNCTION (svldnt1sh_gather, load_ext_gather_offset_restricted, sd_integer, implicit) DEF_SVE_FUNCTION (svldnt1sh_gather, load_ext_gather_index_restricted, sd_integer, implicit) -DEF_SVE_FUNCTION (svldnt1sw_gather, load_ext_gather_offset_restricted, d_integer, implicit) +DEF_SVE_FUNCTION (svldnt1sh_gather, load_ext_gather_offset_restricted, sd_integer, implicit) DEF_SVE_FUNCTION (svldnt1sw_gather, load_ext_gather_index_restricted, d_integer, implicit) +DEF_SVE_FUNCTION (svldnt1sw_gather, load_ext_gather_offset_restricted, d_integer, implicit) DEF_SVE_FUNCTION (svldnt1ub_gather, load_ext_gather_offset_restricted, sd_integer, implicit) -DEF_SVE_FUNCTION (svldnt1uh_gather, load_ext_gather_offset_restricted, sd_integer, implicit) DEF_SVE_FUNCTION (svldnt1uh_gather, load_ext_gather_index_restricted, sd_integer, implicit) -DEF_SVE_FUNCTION (svldnt1uw_gather, load_ext_gather_offset_restricted, d_integer, implicit) +DEF_SVE_FUNCTION (svldnt1uh_gather, load_ext_gather_offset_restricted, sd_integer, implicit) DEF_SVE_FUNCTION (svldnt1uw_gather, load_ext_gather_index_restricted, d_integer, implicit) +DEF_SVE_FUNCTION (svldnt1uw_gather, load_ext_gather_offset_restricted, d_integer, implicit) DEF_SVE_FUNCTION (svmatch, compare, bh_integer, implicit) DEF_SVE_FUNCTION (svnmatch, compare, bh_integer, implicit) DEF_SVE_FUNCTION (svstnt1_scatter, store_scatter_index_restricted, sd_data, implicit) @@ -196,8 +196,8 @@ DEF_SVE_FUNCTION (svstnt1w_scatter, store_scatter_offset_restricted, d_integer, | AARCH64_FL_SVE2_AES) DEF_SVE_FUNCTION (svaesd, binary, b_unsigned, none) DEF_SVE_FUNCTION (svaese, binary, b_unsigned, none) -DEF_SVE_FUNCTION (svaesmc, unary, b_unsigned, none) DEF_SVE_FUNCTION (svaesimc, unary, b_unsigned, none) +DEF_SVE_FUNCTION (svaesmc, unary, b_unsigned, none) DEF_SVE_FUNCTION (svpmullb_pair, binary_opt_n, d_unsigned, none) DEF_SVE_FUNCTION (svpmullt_pair, binary_opt_n, d_unsigned, none) #undef REQUIRED_EXTENSIONS diff --git a/gcc/config/aarch64/aarch64-sve-builtins-sve2.h b/gcc/config/aarch64/aarch64-sve-builtins-sve2.h index 013a9dfc5fa..d58190280a8 100644 --- a/gcc/config/aarch64/aarch64-sve-builtins-sve2.h +++ b/gcc/config/aarch64/aarch64-sve-builtins-sve2.h @@ -80,8 +80,10 @@ namespace aarch64_sve extern const function_base *const svldnt1uw_gather; extern const function_base *const svlogb; extern const function_base *const svmatch; - extern const function_base *const svmaxp; extern const function_base *const svmaxnmp; + extern const function_base *const svmaxp; + extern const function_base *const svminnmp; + extern const function_base *const svminp; extern const function_base *const svmlalb; extern const function_base *const svmlalb_lane; extern const function_base *const svmlalt; @@ -90,8 +92,6 @@ namespace aarch64_sve extern const function_base *const svmlslb_lane; extern const function_base *const svmlslt; extern const function_base *const svmlslt_lane; - extern const function_base *const svminp; - extern const function_base *const svminnmp; extern const function_base *const svmovlb; extern const function_base *const svmovlt; extern const function_base *const svmullb; @@ -130,12 +130,12 @@ namespace aarch64_sve extern const function_base *const svqneg; extern const function_base *const svqrdcmlah; extern const function_base *const svqrdcmlah_lane; - extern const function_base *const svqrdmulh; - extern const function_base *const svqrdmulh_lane; extern const function_base *const svqrdmlah; extern const function_base *const svqrdmlah_lane; extern const function_base *const svqrdmlsh; extern const function_base *const svqrdmlsh_lane; + extern const function_base *const svqrdmulh; + extern const function_base *const svqrdmulh_lane; extern const function_base *const svqrshl; extern const function_base *const svqrshr; extern const function_base *const svqrshrn; @@ -198,13 +198,13 @@ namespace aarch64_sve extern const function_base *const svuqadd; extern const function_base *const svuzp; extern const function_base *const svuzpq; - extern const function_base *const svzip; - extern const function_base *const svzipq; extern const function_base *const svwhilege; extern const function_base *const svwhilegt; extern const function_base *const svwhilerw; extern const function_base *const svwhilewr; extern const function_base *const svxar; + extern const function_base *const svzip; + extern const function_base *const svzipq; } }

[09/15] aarch64: Sort some SVE2 lists alphabetically

Commit Message

Patch