public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/gccgo] [AArch64] Pass a mode to some SVE immediate queries
@ 2020-01-23 0:09 Ian Lance Taylor
0 siblings, 0 replies; only message in thread
From: Ian Lance Taylor @ 2020-01-23 0:09 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:f3582fda783496cc268467973c2c9860cd159b3d
commit f3582fda783496cc268467973c2c9860cd159b3d
Author: Richard Sandiford <richard.sandiford@arm.com>
Date: Thu Jan 9 16:26:47 2020 +0000
[AArch64] Pass a mode to some SVE immediate queries
It helps the SVE2 ACLE support if aarch64_sve_arith_immediate_p and
aarch64_sve_sqadd_sqsub_immediate_p accept scalars as well as vectors.
2020-01-09 Richard Sandiford <richard.sandiford@arm.com>
gcc/
* config/aarch64/aarch64-protos.h (aarch64_sve_arith_immediate_p)
(aarch64_sve_sqadd_sqsub_immediate_p): Add a machine_mode argument.
* config/aarch64/aarch64.c (aarch64_sve_arith_immediate_p)
(aarch64_sve_sqadd_sqsub_immediate_p): Likewise. Handle scalar
immediates as well as vector ones.
* config/aarch64/predicates.md (aarch64_sve_arith_immediate)
(aarch64_sve_sub_arith_immediate, aarch64_sve_qadd_immediate)
(aarch64_sve_qsub_immediate): Update calls accordingly.
From-SVN: r280059
Diff:
---
gcc/ChangeLog | 11 +++++++++++
gcc/config/aarch64/aarch64-protos.h | 4 ++--
gcc/config/aarch64/aarch64.c | 28 +++++++++++-----------------
gcc/config/aarch64/predicates.md | 8 ++++----
4 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8910d86..de59d4c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,16 @@
2020-01-09 Richard Sandiford <richard.sandiford@arm.com>
+ * config/aarch64/aarch64-protos.h (aarch64_sve_arith_immediate_p)
+ (aarch64_sve_sqadd_sqsub_immediate_p): Add a machine_mode argument.
+ * config/aarch64/aarch64.c (aarch64_sve_arith_immediate_p)
+ (aarch64_sve_sqadd_sqsub_immediate_p): Likewise. Handle scalar
+ immediates as well as vector ones.
+ * config/aarch64/predicates.md (aarch64_sve_arith_immediate)
+ (aarch64_sve_sub_arith_immediate, aarch64_sve_qadd_immediate)
+ (aarch64_sve_qsub_immediate): Update calls accordingly.
+
+2020-01-09 Richard Sandiford <richard.sandiford@arm.com>
+
* config/aarch64/aarch64-sve2.md: Add banner comments.
(<su>mulh<r>s<mode>3): Move further up file.
(<su>mull<bt><Vwide>, <r>shrnb<mode>, <r>shrnt<mode>)
diff --git a/gcc/config/aarch64/aarch64-protos.h b/gcc/config/aarch64/aarch64-protos.h
index a400430..3c9e5da 100644
--- a/gcc/config/aarch64/aarch64-protos.h
+++ b/gcc/config/aarch64/aarch64-protos.h
@@ -550,8 +550,8 @@ bool aarch64_simd_valid_immediate (rtx, struct simd_immediate_info *,
enum simd_immediate_check w = AARCH64_CHECK_MOV);
rtx aarch64_check_zero_based_sve_index_immediate (rtx);
bool aarch64_sve_index_immediate_p (rtx);
-bool aarch64_sve_arith_immediate_p (rtx, bool);
-bool aarch64_sve_sqadd_sqsub_immediate_p (rtx, bool);
+bool aarch64_sve_arith_immediate_p (machine_mode, rtx, bool);
+bool aarch64_sve_sqadd_sqsub_immediate_p (machine_mode, rtx, bool);
bool aarch64_sve_bitmask_immediate_p (rtx);
bool aarch64_sve_dup_immediate_p (rtx);
bool aarch64_sve_cmp_immediate_p (rtx, bool);
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index e3bbf12..f83764f 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -16407,22 +16407,20 @@ aarch64_sve_index_immediate_p (rtx base_or_step)
&& IN_RANGE (INTVAL (base_or_step), -16, 15));
}
-/* Return true if X is a valid immediate for the SVE ADD and SUB
- instructions. Negate X first if NEGATE_P is true. */
+/* Return true if X is a valid immediate for the SVE ADD and SUB instructions
+ when applied to mode MODE. Negate X first if NEGATE_P is true. */
bool
-aarch64_sve_arith_immediate_p (rtx x, bool negate_p)
+aarch64_sve_arith_immediate_p (machine_mode mode, rtx x, bool negate_p)
{
- rtx elt;
-
- if (!const_vec_duplicate_p (x, &elt)
- || !CONST_INT_P (elt))
+ rtx elt = unwrap_const_vec_duplicate (x);
+ if (!CONST_INT_P (elt))
return false;
HOST_WIDE_INT val = INTVAL (elt);
if (negate_p)
val = -val;
- val &= GET_MODE_MASK (GET_MODE_INNER (GET_MODE (x)));
+ val &= GET_MODE_MASK (GET_MODE_INNER (mode));
if (val & 0xff)
return IN_RANGE (val, 0, 0xff);
@@ -16430,23 +16428,19 @@ aarch64_sve_arith_immediate_p (rtx x, bool negate_p)
}
/* Return true if X is a valid immediate for the SVE SQADD and SQSUB
- instructions. Negate X first if NEGATE_P is true. */
+ instructions when applied to mode MODE. Negate X first if NEGATE_P
+ is true. */
bool
-aarch64_sve_sqadd_sqsub_immediate_p (rtx x, bool negate_p)
+aarch64_sve_sqadd_sqsub_immediate_p (machine_mode mode, rtx x, bool negate_p)
{
- rtx elt;
-
- if (!const_vec_duplicate_p (x, &elt)
- || !CONST_INT_P (elt))
- return false;
-
- if (!aarch64_sve_arith_immediate_p (x, negate_p))
+ if (!aarch64_sve_arith_immediate_p (mode, x, negate_p))
return false;
/* After the optional negation, the immediate must be nonnegative.
E.g. a saturating add of -127 must be done via SQSUB Zn.B, Zn.B, #127
instead of SQADD Zn.B, Zn.B, #129. */
+ rtx elt = unwrap_const_vec_duplicate (x);
return negate_p == (INTVAL (elt) < 0);
}
diff --git a/gcc/config/aarch64/predicates.md b/gcc/config/aarch64/predicates.md
index 23605b6..8e8c5ee 100644
--- a/gcc/config/aarch64/predicates.md
+++ b/gcc/config/aarch64/predicates.md
@@ -636,19 +636,19 @@
(define_predicate "aarch64_sve_arith_immediate"
(and (match_code "const,const_vector")
- (match_test "aarch64_sve_arith_immediate_p (op, false)")))
+ (match_test "aarch64_sve_arith_immediate_p (mode, op, false)")))
(define_predicate "aarch64_sve_sub_arith_immediate"
(and (match_code "const,const_vector")
- (match_test "aarch64_sve_arith_immediate_p (op, true)")))
+ (match_test "aarch64_sve_arith_immediate_p (mode, op, true)")))
(define_predicate "aarch64_sve_qadd_immediate"
(and (match_code "const,const_vector")
- (match_test "aarch64_sve_sqadd_sqsub_immediate_p (op, false)")))
+ (match_test "aarch64_sve_sqadd_sqsub_immediate_p (mode, op, false)")))
(define_predicate "aarch64_sve_qsub_immediate"
(and (match_code "const,const_vector")
- (match_test "aarch64_sve_sqadd_sqsub_immediate_p (op, true)")))
+ (match_test "aarch64_sve_sqadd_sqsub_immediate_p (mode, op, true)")))
(define_predicate "aarch64_sve_vector_inc_dec_immediate"
(and (match_code "const,const_vector")
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-01-23 0:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-23 0:09 [gcc/devel/gccgo] [AArch64] Pass a mode to some SVE immediate queries Ian Lance Taylor
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).