[AArch64] Simplify WHILERW and WHILEWR definition

I'd made WHILERW and WHILEWR use separate patterns from the SVE
WHILE instructions, but they're similar enough that we can use
a single pattern.  This means that we also get the flag-related
patterns "for free".

2020-01-09  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* config/aarch64/iterators.md (SVE_WHILE): Add UNSPEC_WHILERW
	and UNSPEC_WHILEWR.
	(while_optab_cmp): Handle them.
	* config/aarch64/aarch64-sve.md
	(*while_<while_optab_cmp><GPI:mode><PRED_ALL:mode>_ptest): Make public
	and add a "@" marker.
	* config/aarch64/aarch64-sve2.md (check_<raw_war>_ptrs<mode>): Use it
	instead of gen_aarch64_sve2_while_ptest.
	(@aarch64_sve2_while<cmp_op><GPI:mode><PRED_ALL:mode>_ptest): Delete.

From-SVN: r280054

4 files changed, 22 insertions, 28 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e78cc37..121146d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,17 @@
 2020-01-09  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* config/aarch64/iterators.md (SVE_WHILE): Add UNSPEC_WHILERW
+	and UNSPEC_WHILEWR.
+	(while_optab_cmp): Handle them.
+	* config/aarch64/aarch64-sve.md
+	(*while_<while_optab_cmp><GPI:mode><PRED_ALL:mode>_ptest): Make public
+	and add a "@" marker.
+	* config/aarch64/aarch64-sve2.md (check_<raw_war>_ptrs<mode>): Use it
+	instead of gen_aarch64_sve2_while_ptest.
+	(@aarch64_sve2_while<cmp_op><GPI:mode><PRED_ALL:mode>_ptest): Delete.
+
+2020-01-09  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* config/aarch64/aarch64.md (UNSPEC_WHILE_LE): Rename to...
 	(UNSPEC_WHILELE): ...this.
 	(UNSPEC_WHILE_LO): Rename to...
diff --git a/gcc/config/aarch64/aarch64-sve.md b/gcc/config/aarch64/aarch64-sve.md
index fb33260..fcb674f 100644
--- a/gcc/config/aarch64/aarch64-sve.md
+++ b/gcc/config/aarch64/aarch64-sve.md
@@ -6839,6 +6839,8 @@
 ;; - WHILELO
 ;; - WHILELS
 ;; - WHILELT
+;; - WHILERW (SVE2)
+;; - WHILEWR (SVE2)
 ;; -------------------------------------------------------------------------
 
 ;; Set element I of the result if (cmp (plus operand1 J) operand2) is
@@ -6883,7 +6885,7 @@
 )
 
 ;; Same, but handle the case in which only the flags result is useful.
-(define_insn_and_rewrite "*while_<while_optab_cmp><GPI:mode><PRED_ALL:mode>_ptest"
+(define_insn_and_rewrite "@while_<while_optab_cmp><GPI:mode><PRED_ALL:mode>_ptest"
   [(set (reg:CC_NZC CC_REGNUM)
 	(unspec:CC_NZC
 	  [(match_operand 3)
diff --git a/gcc/config/aarch64/aarch64-sve2.md b/gcc/config/aarch64/aarch64-sve2.md
index c4660db..349d0c4 100644
--- a/gcc/config/aarch64/aarch64-sve2.md
+++ b/gcc/config/aarch64/aarch64-sve2.md
@@ -353,7 +353,7 @@
 
   /* Emit a WHILERW or WHILEWR, setting the condition codes based on
      the result.  */
-  emit_insn (gen_aarch64_sve2_while_ptest
+  emit_insn (gen_while_ptest
 	     (<SVE2_WHILE_PTR:unspec>, <MODE>mode, pred_mode,
 	      gen_rtx_SCRATCH (pred_mode), operands[1], operands[2],
 	      CONSTM1_RTX (VNx16BImode), CONSTM1_RTX (pred_mode)));
@@ -365,27 +365,3 @@
   emit_insn (gen_aarch64_cstore<mode> (operands[0], cmp, cc_reg));
   DONE;
 })
-
-;; A WHILERW or WHILEWR in which only the flags result is interesting.
-(define_insn_and_rewrite "@aarch64_sve2_while<cmp_op><GPI:mode><PRED_ALL:mode>_ptest"
-  [(set (reg:CC_NZC CC_REGNUM)
-	(unspec:CC_NZC
-	  [(match_operand 3)
-	   (match_operand 4)
-	   (const_int SVE_KNOWN_PTRUE)
-	   (unspec:PRED_ALL
-	     [(match_operand:GPI 1 "register_operand" "r")
-	      (match_operand:GPI 2 "register_operand" "r")]
-	     SVE2_WHILE_PTR)]
-	  UNSPEC_PTEST))
-   (clobber (match_scratch:PRED_ALL 0 "=Upa"))]
-  "TARGET_SVE2"
-  "while<cmp_op>\t%0.<PRED_ALL:Vetype>, %x1, %x2"
-  ;; Force the compiler to drop the unused predicate operand, so that we
-  ;; don't have an unnecessary PTRUE.
-  "&& (!CONSTANT_P (operands[3]) || !CONSTANT_P (operands[4]))"
-  {
-    operands[3] = CONSTM1_RTX (VNx16BImode);
-    operands[4] = CONSTM1_RTX (<PRED_ALL:MODE>mode);
-  }
-)
diff --git a/gcc/config/aarch64/iterators.md b/gcc/config/aarch64/iterators.md
index 2c9d966..c6b71a6 100644
--- a/gcc/config/aarch64/iterators.md
+++ b/gcc/config/aarch64/iterators.md
@@ -2083,7 +2083,9 @@
 					   UNSPEC_FCMLA180 UNSPEC_FCMLA270])
 
 (define_int_iterator SVE_WHILE [UNSPEC_WHILELE UNSPEC_WHILELO
-				UNSPEC_WHILELS UNSPEC_WHILELT])
+				UNSPEC_WHILELS UNSPEC_WHILELT
+				(UNSPEC_WHILERW "TARGET_SVE2")
+				(UNSPEC_WHILEWR "TARGET_SVE2")])
 
 (define_int_iterator SVE2_WHILE_PTR [UNSPEC_WHILERW UNSPEC_WHILEWR])
 
@@ -2496,7 +2498,9 @@
 (define_int_attr while_optab_cmp [(UNSPEC_WHILELE "le")
 				  (UNSPEC_WHILELO "ult")
 				  (UNSPEC_WHILELS "ule")
-				  (UNSPEC_WHILELT "lt")])
+				  (UNSPEC_WHILELT "lt")
+				  (UNSPEC_WHILERW "rw")
+				  (UNSPEC_WHILEWR "wr")])
 
 (define_int_attr raw_war [(UNSPEC_WHILERW "raw")
 			  (UNSPEC_WHILEWR "war")])