From 5b052959dcd2e9c390c7de34f806c4b22a66d8f7 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Thu, 9 Jan 2020 15:21:47 +0000 Subject: [PATCH] [AArch64] Rename SVE shape "unary_count" to "unary_to_uint" The SVE ACLE shape names use "_int" and "_uint" for arguments that are signed-integer or unsigned-integer variants of the main vector type. With SVE2 this variation also becomes common for return values, which the main SVE2 patch handles using "_to_int" and "_to_uint". This patch renames the existing unary_count shape to match the new scheme. 2020-01-09 Richard Sandiford gcc/ * config/aarch64/aarch64-sve-builtins-shapes.h (unary_count): Delete. (unary_to_uint): Define. * config/aarch64/aarch64-sve-builtins-shapes.cc (unary_count_def) (unary_count): Rename to... (unary_to_uint_def, unary_to_uint): ...this. * config/aarch64/aarch64-sve-builtins-base.def: Update accordingly. gcc/testsuite/ * gcc.target/aarch64/sve/acle/general-c/unary_count_1.c: Rename to... * gcc.target/aarch64/sve/acle/general-c/unary_to_uint_1.c: ...this. * gcc.target/aarch64/sve/acle/general-c/unary_count_2.c: Rename to... * gcc.target/aarch64/sve/acle/general-c/unary_to_uint_2.c: ...this. * gcc.target/aarch64/sve/acle/general-c/unary_count_3.c: Rename to... * gcc.target/aarch64/sve/acle/general-c/unary_to_uint_3.c: ...this. From-SVN: r280052 --- gcc/ChangeLog | 9 ++++ .../aarch64/aarch64-sve-builtins-base.def | 6 +-- .../aarch64/aarch64-sve-builtins-shapes.cc | 42 +++++++++---------- .../aarch64/aarch64-sve-builtins-shapes.h | 2 +- gcc/testsuite/ChangeLog | 9 ++++ .../{unary_count_1.c => unary_to_uint_1.c} | 0 .../{unary_count_2.c => unary_to_uint_2.c} | 0 .../{unary_count_3.c => unary_to_uint_3.c} | 0 8 files changed, 43 insertions(+), 25 deletions(-) rename gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/{unary_count_1.c => unary_to_uint_1.c} (100%) rename gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/{unary_count_2.c => unary_to_uint_2.c} (100%) rename gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/{unary_count_3.c => unary_to_uint_3.c} (100%) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1c2a4a92d69..ad7f519521c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2020-01-09 Richard Sandiford + + * config/aarch64/aarch64-sve-builtins-shapes.h (unary_count): Delete. + (unary_to_uint): Define. + * config/aarch64/aarch64-sve-builtins-shapes.cc (unary_count_def) + (unary_count): Rename to... + (unary_to_uint_def, unary_to_uint): ...this. + * config/aarch64/aarch64-sve-builtins-base.def: Update accordingly. + 2020-01-09 Richard Sandiford * config/aarch64/aarch64-sve-builtins-functions.h diff --git a/gcc/config/aarch64/aarch64-sve-builtins-base.def b/gcc/config/aarch64/aarch64-sve-builtins-base.def index 4cb7da70977..cd0a9bef08f 100644 --- a/gcc/config/aarch64/aarch64-sve-builtins-base.def +++ b/gcc/config/aarch64/aarch64-sve-builtins-base.def @@ -47,8 +47,8 @@ DEF_SVE_FUNCTION (svbrkpb, binary, b, z) DEF_SVE_FUNCTION (svcadd, binary_rotate, all_float, mxz) DEF_SVE_FUNCTION (svclasta, clast, all_data, implicit) DEF_SVE_FUNCTION (svclastb, clast, all_data, implicit) -DEF_SVE_FUNCTION (svcls, unary_count, all_signed, mxz) -DEF_SVE_FUNCTION (svclz, unary_count, all_integer, mxz) +DEF_SVE_FUNCTION (svcls, unary_to_uint, all_signed, mxz) +DEF_SVE_FUNCTION (svclz, unary_to_uint, all_integer, mxz) DEF_SVE_FUNCTION (svcmla, ternary_rotate, all_float, mxz) DEF_SVE_FUNCTION (svcmla_lane, ternary_lane_rotate, hs_float, none) DEF_SVE_FUNCTION (svcmpeq, compare_opt_n, all_data, implicit) @@ -65,7 +65,7 @@ DEF_SVE_FUNCTION (svcmpne, compare_opt_n, all_data, implicit) DEF_SVE_FUNCTION (svcmpne_wide, compare_wide_opt_n, bhs_signed, implicit) DEF_SVE_FUNCTION (svcmpuo, compare_opt_n, all_float, implicit) DEF_SVE_FUNCTION (svcnot, unary, all_integer, mxz) -DEF_SVE_FUNCTION (svcnt, unary_count, all_data, mxz) +DEF_SVE_FUNCTION (svcnt, unary_to_uint, all_data, mxz) DEF_SVE_FUNCTION (svcntb, count_inherent, none, none) DEF_SVE_FUNCTION (svcntb_pat, count_pat, none, none) DEF_SVE_FUNCTION (svcntd, count_inherent, none, none) diff --git a/gcc/config/aarch64/aarch64-sve-builtins-shapes.cc b/gcc/config/aarch64/aarch64-sve-builtins-shapes.cc index 6da093c81ba..69a062124f3 100644 --- a/gcc/config/aarch64/aarch64-sve-builtins-shapes.cc +++ b/gcc/config/aarch64/aarch64-sve-builtins-shapes.cc @@ -2104,27 +2104,6 @@ struct unary_convert_def : public overloaded_base<1> }; SHAPE (unary_convert) -/* sv_t svfoo[_t0](sv_t) - - i.e. a version of "unary" in which the returned vector contains - unsigned integers. */ -struct unary_count_def : public overloaded_base<0> -{ - void - build (function_builder &b, const function_group_info &group) const OVERRIDE - { - b.add_overloaded_functions (group, MODE_none); - build_all (b, "vu0,v0", group, MODE_none); - } - - tree - resolve (function_resolver &r) const OVERRIDE - { - return r.resolve_unary (TYPE_unsigned); - } -}; -SHAPE (unary_count) - /* sv_t svfoo[_n]_t0(_t). */ struct unary_n_def : public overloaded_base<1> { @@ -2156,6 +2135,27 @@ struct unary_pred_def : public nonoverloaded_base }; SHAPE (unary_pred) +/* sv_t svfoo[_t0](sv_t) + + i.e. a version of "unary" in which the returned vector contains + unsigned integers. */ +struct unary_to_uint_def : public overloaded_base<0> +{ + void + build (function_builder &b, const function_group_info &group) const OVERRIDE + { + b.add_overloaded_functions (group, MODE_none); + build_all (b, "vu0,v0", group, MODE_none); + } + + tree + resolve (function_resolver &r) const OVERRIDE + { + return r.resolve_unary (TYPE_unsigned); + } +}; +SHAPE (unary_to_uint) + /* sv_t svfoo[_t0](sv_t) where always belongs a certain type class, and where diff --git a/gcc/config/aarch64/aarch64-sve-builtins-shapes.h b/gcc/config/aarch64/aarch64-sve-builtins-shapes.h index e9a429bb3f9..151371289e2 100644 --- a/gcc/config/aarch64/aarch64-sve-builtins-shapes.h +++ b/gcc/config/aarch64/aarch64-sve-builtins-shapes.h @@ -135,9 +135,9 @@ namespace aarch64_sve extern const function_shape *const tmad; extern const function_shape *const unary; extern const function_shape *const unary_convert; - extern const function_shape *const unary_count; extern const function_shape *const unary_n; extern const function_shape *const unary_pred; + extern const function_shape *const unary_to_uint; extern const function_shape *const unary_uint; extern const function_shape *const unary_widen; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cdb8e0df72a..943b632adc7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2020-01-09 Richard Sandiford + + * gcc.target/aarch64/sve/acle/general-c/unary_count_1.c: Rename to... + * gcc.target/aarch64/sve/acle/general-c/unary_to_uint_1.c: ...this. + * gcc.target/aarch64/sve/acle/general-c/unary_count_2.c: Rename to... + * gcc.target/aarch64/sve/acle/general-c/unary_to_uint_2.c: ...this. + * gcc.target/aarch64/sve/acle/general-c/unary_count_3.c: Rename to... + * gcc.target/aarch64/sve/acle/general-c/unary_to_uint_3.c: ...this. + 2020-01-09 Richard Sandiford * gcc.target/aarch64/sve/acle/general/nrv_1.c: New test. diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_count_1.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_to_uint_1.c similarity index 100% rename from gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_count_1.c rename to gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_to_uint_1.c diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_count_2.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_to_uint_2.c similarity index 100% rename from gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_count_2.c rename to gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_to_uint_2.c diff --git a/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_count_3.c b/gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_to_uint_3.c similarity index 100% rename from gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_count_3.c rename to gcc/testsuite/gcc.target/aarch64/sve/acle/general-c/unary_to_uint_3.c -- 2.30.2