https://gcc.gnu.org/g:39ed159af934130946010437b59c7db84bbf53ef
commit r17-6226-g39ed159af934130946010437b59c7db84bbf53ef Author: Dhruv Chawla <[email protected]> Date: Thu Nov 5 15:43:54 2026 +0530 aarch64: Port NEON saturating shifts by an immediate to the pragma-based framework Port the following families of NEON intrinsics to the pragma-based framework: * vqshl_n * vqshlu_n * vqshlb_n * vqshlh_n * vqshls_n * vqshld_n * vqshlub_n * vqshluh_n * vqshlus_n * vqshlud_n Bootstrapped and regtested on aarch64-linux-gnu. Signed-off-by: Dhruv Chawla <[email protected]> gcc/ChangeLog: * config/aarch64/aarch64-neon-builtins-base.cc (code_for_qshl_n): New function. (vqshl_n, vqshlq_n, vqshlb_n, vqshlh_n, vqshls_n, vqshld_n, vqshlu_n, vqshluq_n, vqshlub_n, vqshluh_n, vqshlus_n, vqshlud_n): New function bases. * config/aarch64/aarch64-neon-builtins-base.def: Add the corresponding function group. * config/aarch64/aarch64-simd-builtins.def: Delete the sqshl_n, uqshl_n and sqshlu_n builtins, which no longer have any caller. * config/aarch64/arm_neon.h (vqshl_n_s16, vqshl_n_s32, vqshl_n_s64, vqshl_n_s8, vqshl_n_u16, vqshl_n_u32, vqshl_n_u64, vqshl_n_u8, vqshlb_n_s8, vqshlb_n_u8, vqshld_n_s64, vqshld_n_u64, vqshlh_n_s16, vqshlh_n_u16, vqshlq_n_s16, vqshlq_n_s32, vqshlq_n_s64, vqshlq_n_s8, vqshlq_n_u16, vqshlq_n_u32, vqshlq_n_u64, vqshlq_n_u8, vqshls_n_s32, vqshls_n_u32, vqshlu_n_s16, vqshlu_n_s32, vqshlu_n_s64, vqshlu_n_s8, vqshlub_n_s8, vqshlud_n_s64, vqshluh_n_s16, vqshluq_n_s16, vqshluq_n_s32, vqshluq_n_s64, vqshluq_n_s8, vqshlus_n_s32): Delete. gcc/testsuite/ChangeLog: * gcc.target/aarch64/neon/vqshl_n.c: New test. Diff: --- gcc/config/aarch64/aarch64-neon-builtins-base.cc | 13 ++ gcc/config/aarch64/aarch64-neon-builtins-base.def | 16 ++ gcc/config/aarch64/aarch64-simd-builtins.def | 4 - gcc/config/aarch64/arm_neon.h | 256 ---------------------- gcc/testsuite/gcc.target/aarch64/neon/vqshl_n.c | 71 ++++++ 5 files changed, 100 insertions(+), 260 deletions(-) diff --git a/gcc/config/aarch64/aarch64-neon-builtins-base.cc b/gcc/config/aarch64/aarch64-neon-builtins-base.cc index 3a5aacf7a789..87fa2807114c 100644 --- a/gcc/config/aarch64/aarch64-neon-builtins-base.cc +++ b/gcc/config/aarch64/aarch64-neon-builtins-base.cc @@ -330,6 +330,13 @@ code_for_qshl (int unspec, machine_mode mode) return code_for_aarch64_qshl (unspec, unspec, mode); } +/* Likewise for `aarch64_<sur>qshl<u>_n<mode>`. */ +static insn_code +code_for_qshl_n (int unspec, machine_mode mode) +{ + return code_for_aarch64_qshl_n (unspec, unspec, mode); +} + /* For intrinsics whose instruction is selected by a mode through the code_for_* helpers that insn-opinit.h generates for `@`-prefixed pattterns. */ @@ -1647,6 +1654,12 @@ NEON_FUNCTION (vqrshl, vqrshlq, vqrshlb, vqrshlh, vqrshls, vqrshld, NEON_FUNCTION (vrshr_n, vrshrq_n, vrshrd_n, gimple_rtx_code_function, (code_for_aarch64_rshr_n, ASHIFTRT, LSHIFTRT)) NEON_FUNCTION (vrsra_n, vrsraq_n, vrsrad_n, gimple_rtx_code_function, (code_for_aarch64_rsra_n, ASHIFTRT, LSHIFTRT)) +// Saturating shifts by an immediate +NEON_FUNCTION (vqshl_n, vqshlq_n, vqshlb_n, vqshlh_n, vqshls_n, vqshld_n, + gimple_unspec_based_function, (code_for_qshl_n, UNSPEC_SQSHL, UNSPEC_UQSHL)) +NEON_FUNCTION (vqshlu_n, vqshluq_n, vqshlub_n, vqshluh_n, vqshlus_n, vqshlud_n, + gimple_unspec_based_function, (code_for_qshl_n, UNSPEC_SQSHLU, UNSPEC_SQSHLU)) + // Bitwise operations NEON_FUNCTION (vand, vandq, gimple_expr, (BIT_AND_EXPR)) diff --git a/gcc/config/aarch64/aarch64-neon-builtins-base.def b/gcc/config/aarch64/aarch64-neon-builtins-base.def index b405d2da30ef..f6edd2102e2d 100644 --- a/gcc/config/aarch64/aarch64-neon-builtins-base.def +++ b/gcc/config/aarch64/aarch64-neon-builtins-base.def @@ -433,6 +433,22 @@ DEF_NEON_FUNCTION (vrshrd_n, d_integer, ("s0,s0,ss32", shift_right<1>)) DEF_NEON_FUNCTION (vrsrad_n, d_integer, ("s0,s0,s0,ss32", shift_right<2>)) #undef REQUIRED_EXTENSIONS +// Saturating shifts by an immediate +#define REQUIRED_EXTENSIONS nonstreaming_only (AARCH64_FL_SIMD) +DEF_NEON_FUNCTION (vqshl_n, all_integer, ("D0,D0,ss32", shift<1>)) +DEF_NEON_FUNCTION (vqshlq_n, all_integer, ("Q0,Q0,ss32", shift<1>)) +DEF_NEON_FUNCTION (vqshlu_n, all_signed, ("Du0,D0,ss32", shift<1>)) +DEF_NEON_FUNCTION (vqshluq_n, all_signed, ("Qu0,Q0,ss32", shift<1>)) +DEF_NEON_FUNCTION (vqshlb_n, b_integer, ("s0,s0,ss32", shift<1>)) +DEF_NEON_FUNCTION (vqshlh_n, h_integer, ("s0,s0,ss32", shift<1>)) +DEF_NEON_FUNCTION (vqshls_n, s_integer, ("s0,s0,ss32", shift<1>)) +DEF_NEON_FUNCTION (vqshld_n, d_integer, ("s0,s0,ss32", shift<1>)) +DEF_NEON_FUNCTION (vqshlub_n, b_signed, ("su0,s0,ss32", shift<1>)) +DEF_NEON_FUNCTION (vqshluh_n, h_signed, ("su0,s0,ss32", shift<1>)) +DEF_NEON_FUNCTION (vqshlus_n, s_signed, ("su0,s0,ss32", shift<1>)) +DEF_NEON_FUNCTION (vqshlud_n, d_signed, ("su0,s0,ss32", shift<1>)) +#undef REQUIRED_EXTENSIONS + // Bitwise operations (FEAT_SHA3) #define REQUIRED_EXTENSIONS nonstreaming_only (AARCH64_FL_SHA3) DEF_NEON_FUNCTION (vbcaxq, all_integer, ("Q0,Q0,Q0,Q0")) diff --git a/gcc/config/aarch64/aarch64-simd-builtins.def b/gcc/config/aarch64/aarch64-simd-builtins.def index 34950e82531f..909ea518b166 100644 --- a/gcc/config/aarch64/aarch64-simd-builtins.def +++ b/gcc/config/aarch64/aarch64-simd-builtins.def @@ -439,10 +439,6 @@ BUILTIN_VSDQ_I_DI (SHIFTINSERT, ssli_n, 0, DEFAULT) BUILTIN_VALLP (SHIFTINSERTP, ssli_n, 0, DEFAULT) BUILTIN_VSDQ_I_DI (USHIFTACC, usli_n, 0, DEFAULT) - /* Implemented by aarch64_<sur>qshl<u>_n<mode>. */ - BUILTIN_VSDQ_I (SHIFTIMM_USS, sqshlu_n, 0, DEFAULT) - BUILTIN_VSDQ_I (SHIFTIMM, sqshl_n, 0, DEFAULT) - BUILTIN_VSDQ_I (USHIFTIMM, uqshl_n, 0, DEFAULT) /* Implemented by aarch64_xtn2<mode>. */ BUILTIN_VQN (BINOP, xtn2, 0, DEFAULT) diff --git a/gcc/config/aarch64/arm_neon.h b/gcc/config/aarch64/arm_neon.h index ab05e3bd8738..68e4c2ef7569 100644 --- a/gcc/config/aarch64/arm_neon.h +++ b/gcc/config/aarch64/arm_neon.h @@ -11462,262 +11462,6 @@ vqrshrund_n_s64 (int64_t __a, const int __b) return (int32_t) __builtin_aarch64_sqrshrun_ndi (__a, __b); } -/* vqshl */ - -__extension__ extern __inline int8x8_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshl_n_s8 (int8x8_t __a, const int __b) -{ - return (int8x8_t) __builtin_aarch64_sqshl_nv8qi (__a, __b); -} - -__extension__ extern __inline int16x4_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshl_n_s16 (int16x4_t __a, const int __b) -{ - return (int16x4_t) __builtin_aarch64_sqshl_nv4hi (__a, __b); -} - -__extension__ extern __inline int32x2_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshl_n_s32 (int32x2_t __a, const int __b) -{ - return (int32x2_t) __builtin_aarch64_sqshl_nv2si (__a, __b); -} - -__extension__ extern __inline int64x1_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshl_n_s64 (int64x1_t __a, const int __b) -{ - return (int64x1_t) {__builtin_aarch64_sqshl_ndi (__a[0], __b)}; -} - -__extension__ extern __inline uint8x8_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshl_n_u8 (uint8x8_t __a, const int __b) -{ - return __builtin_aarch64_uqshl_nv8qi_uus (__a, __b); -} - -__extension__ extern __inline uint16x4_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshl_n_u16 (uint16x4_t __a, const int __b) -{ - return __builtin_aarch64_uqshl_nv4hi_uus (__a, __b); -} - -__extension__ extern __inline uint32x2_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshl_n_u32 (uint32x2_t __a, const int __b) -{ - return __builtin_aarch64_uqshl_nv2si_uus (__a, __b); -} - -__extension__ extern __inline uint64x1_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshl_n_u64 (uint64x1_t __a, const int __b) -{ - return (uint64x1_t) {__builtin_aarch64_uqshl_ndi_uus (__a[0], __b)}; -} - -__extension__ extern __inline int8x16_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshlq_n_s8 (int8x16_t __a, const int __b) -{ - return (int8x16_t) __builtin_aarch64_sqshl_nv16qi (__a, __b); -} - -__extension__ extern __inline int16x8_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshlq_n_s16 (int16x8_t __a, const int __b) -{ - return (int16x8_t) __builtin_aarch64_sqshl_nv8hi (__a, __b); -} - -__extension__ extern __inline int32x4_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshlq_n_s32 (int32x4_t __a, const int __b) -{ - return (int32x4_t) __builtin_aarch64_sqshl_nv4si (__a, __b); -} - -__extension__ extern __inline int64x2_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshlq_n_s64 (int64x2_t __a, const int __b) -{ - return (int64x2_t) __builtin_aarch64_sqshl_nv2di (__a, __b); -} - -__extension__ extern __inline uint8x16_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshlq_n_u8 (uint8x16_t __a, const int __b) -{ - return __builtin_aarch64_uqshl_nv16qi_uus (__a, __b); -} - -__extension__ extern __inline uint16x8_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshlq_n_u16 (uint16x8_t __a, const int __b) -{ - return __builtin_aarch64_uqshl_nv8hi_uus (__a, __b); -} - -__extension__ extern __inline uint32x4_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshlq_n_u32 (uint32x4_t __a, const int __b) -{ - return __builtin_aarch64_uqshl_nv4si_uus (__a, __b); -} - -__extension__ extern __inline uint64x2_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshlq_n_u64 (uint64x2_t __a, const int __b) -{ - return __builtin_aarch64_uqshl_nv2di_uus (__a, __b); -} - -__extension__ extern __inline int8_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshlb_n_s8 (int8_t __a, const int __b) -{ - return (int8_t) __builtin_aarch64_sqshl_nqi (__a, __b); -} - -__extension__ extern __inline int16_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshlh_n_s16 (int16_t __a, const int __b) -{ - return (int16_t) __builtin_aarch64_sqshl_nhi (__a, __b); -} - -__extension__ extern __inline int32_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshls_n_s32 (int32_t __a, const int __b) -{ - return (int32_t) __builtin_aarch64_sqshl_nsi (__a, __b); -} - -__extension__ extern __inline int64_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshld_n_s64 (int64_t __a, const int __b) -{ - return __builtin_aarch64_sqshl_ndi (__a, __b); -} - -__extension__ extern __inline uint8_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshlb_n_u8 (uint8_t __a, const int __b) -{ - return __builtin_aarch64_uqshl_nqi_uus (__a, __b); -} - -__extension__ extern __inline uint16_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshlh_n_u16 (uint16_t __a, const int __b) -{ - return __builtin_aarch64_uqshl_nhi_uus (__a, __b); -} - -__extension__ extern __inline uint32_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshls_n_u32 (uint32_t __a, const int __b) -{ - return __builtin_aarch64_uqshl_nsi_uus (__a, __b); -} - -__extension__ extern __inline uint64_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshld_n_u64 (uint64_t __a, const int __b) -{ - return __builtin_aarch64_uqshl_ndi_uus (__a, __b); -} - -/* vqshlu */ - -__extension__ extern __inline uint8x8_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshlu_n_s8 (int8x8_t __a, const int __b) -{ - return __builtin_aarch64_sqshlu_nv8qi_uss (__a, __b); -} - -__extension__ extern __inline uint16x4_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshlu_n_s16 (int16x4_t __a, const int __b) -{ - return __builtin_aarch64_sqshlu_nv4hi_uss (__a, __b); -} - -__extension__ extern __inline uint32x2_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshlu_n_s32 (int32x2_t __a, const int __b) -{ - return __builtin_aarch64_sqshlu_nv2si_uss (__a, __b); -} - -__extension__ extern __inline uint64x1_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshlu_n_s64 (int64x1_t __a, const int __b) -{ - return (uint64x1_t) {__builtin_aarch64_sqshlu_ndi_uss (__a[0], __b)}; -} - -__extension__ extern __inline uint8x16_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshluq_n_s8 (int8x16_t __a, const int __b) -{ - return __builtin_aarch64_sqshlu_nv16qi_uss (__a, __b); -} - -__extension__ extern __inline uint16x8_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshluq_n_s16 (int16x8_t __a, const int __b) -{ - return __builtin_aarch64_sqshlu_nv8hi_uss (__a, __b); -} - -__extension__ extern __inline uint32x4_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshluq_n_s32 (int32x4_t __a, const int __b) -{ - return __builtin_aarch64_sqshlu_nv4si_uss (__a, __b); -} - -__extension__ extern __inline uint64x2_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshluq_n_s64 (int64x2_t __a, const int __b) -{ - return __builtin_aarch64_sqshlu_nv2di_uss (__a, __b); -} - -__extension__ extern __inline int8_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshlub_n_s8 (int8_t __a, const int __b) -{ - return (int8_t) __builtin_aarch64_sqshlu_nqi_uss (__a, __b); -} - -__extension__ extern __inline int16_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshluh_n_s16 (int16_t __a, const int __b) -{ - return (int16_t) __builtin_aarch64_sqshlu_nhi_uss (__a, __b); -} - -__extension__ extern __inline int32_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshlus_n_s32 (int32_t __a, const int __b) -{ - return (int32_t) __builtin_aarch64_sqshlu_nsi_uss (__a, __b); -} - -__extension__ extern __inline uint64_t -__attribute__ ((__always_inline__, __gnu_inline__, __artificial__)) -vqshlud_n_s64 (int64_t __a, const int __b) -{ - return __builtin_aarch64_sqshlu_ndi_uss (__a, __b); -} - /* vqshrn */ __extension__ extern __inline int8x8_t diff --git a/gcc/testsuite/gcc.target/aarch64/neon/vqshl_n.c b/gcc/testsuite/gcc.target/aarch64/neon/vqshl_n.c new file mode 100644 index 000000000000..ac2402435f0f --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/neon/vqshl_n.c @@ -0,0 +1,71 @@ +/* { dg-do compile } */ +/* { dg-final { check-function-bodies "**" "" } } */ + +#include "arm_neon_test.h" + +/* +** test_vqshl_n_s8_3: +** sqshl v0\.8b, v0\.8b, 3 +** ret +*/ +TEST_UNIFORM_UNARY_N (vqshl_n_s8, int8x8_t, 3) + +/* +** test_vqshlq_n_u16_15: +** uqshl v0\.8h, v0\.8h, 15 +** ret +*/ +TEST_UNIFORM_UNARY_N (vqshlq_n_u16, uint16x8_t, 15) + +/* +** test_vqshl_n_s64_7: +** sqshl d0, d0, 7 +** ret +*/ +TEST_UNIFORM_UNARY_N (vqshl_n_s64, int64x1_t, 7) + +/* +** test_vqshlq_n_s64_0: +** sqshl v0\.2d, v0\.2d, 0 +** ret +*/ +TEST_UNIFORM_UNARY_N (vqshlq_n_s64, int64x2_t, 0) + +/* +** test_vqshlu_n_s8_3: +** sqshlu v0\.8b, v0\.8b, 3 +** ret +*/ +TEST_UNARY_N (vqshlu_n_s8, uint8x8_t, int8x8_t, 3) + +/* +** test_vqshluq_n_s32_31: +** sqshlu v0\.4s, v0\.4s, 31 +** ret +*/ +TEST_UNARY_N (vqshluq_n_s32, uint32x4_t, int32x4_t, 31) + +/* +** test_vqshlu_n_s64_2: +** sqshlu d0, d0, 2 +** ret +*/ +TEST_UNARY_N (vqshlu_n_s64, uint64x1_t, int64x1_t, 2) + +/* +** test_vqshlh_n_s16_3: +** dup v[0-9]+\.4h, w0 +** sqshl h[0-9]+, h[0-9]+, 3 +** umov w0, v[0-9]+\.h\[0\] +** ret +*/ +TEST_UNARY_N (vqshlh_n_s16, int16_t, int16_t, 3) + +/* +** test_vqshlub_n_s8_3: +** dup v[0-9]+\.8b, w0 +** sqshlu b[0-9]+, b[0-9]+, 3 +** umov w0, v[0-9]+\.b\[0\] +** ret +*/ +TEST_UNARY_N (vqshlub_n_s8, uint8_t, int8_t, 3)
