Drop unused comparison shortening pattern and consolidate remaining comparison shorte...

	* config/h8300/h8300.md (comparison shortening peepholes): Drop
	(and (xor)) variant.  Combine other two into single peephole.

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 735cc47a3dd5cc0284159b532ec9cbeb49a874d8..1927290f568a031e76860653f7926095b5cd9fcf 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2020-02-12  Jeff Law  <law@redhat.com>
+
+       * config/h8300/h8300.md (comparison shortening peepholes): Drop
+       (and (xor)) variant.  Combine other two into single peephole.
+
 2020-02-12  Wilco Dijkstra  <wdijkstr@arm.com>
 
        PR rtl-optimization/93565

diff --git a/gcc/config/h8300/h8300.md b/gcc/config/h8300/h8300.md
index 0548368215b0f7843c6f8bc652f87065760421f3..dcc9c3682d62c5009499536431503c0bab8c802f 100644 (file)
--- a/gcc/config/h8300/h8300.md
+++ b/gcc/config/h8300/h8300.md
@@ -5405,7 +5405,9 @@
                       [(cc0) (const_int 0)])
                      (label_ref (match_operand 2 "" ""))
                      (pc)))]
-  "peep2_reg_dead_p (2, operands[0])"
+  "((const_int_qi_operand (operands[1], QImode)
+     || const_int_hi_operand (operands[1], HImode))
+    && peep2_reg_dead_p (2, operands[0]))"
   [(set (match_dup 4)
        (and:QI (match_dup 4)
                (match_dup 5)))
@@ -5416,68 +5418,11 @@
                      (label_ref (match_dup 2))
                      (pc)))]
   {
-    operands[4] = gen_rtx_REG (QImode, REGNO (operands[0]));
-    operands[5] = gen_int_mode (INTVAL (operands[1]), QImode);
-  })
+    enum machine_mode mode;
 
-(define_peephole2
-  [(set (match_operand:SI 0 "register_operand" "")
-       (and:SI (match_dup 0)
-               (match_operand:SI 1 "const_int_hi_operand" "")))
-   (set (cc0) (compare (match_dup 0)
-                      (const_int 0)))
-   (set (pc)
-       (if_then_else (match_operator 3 "eqne_operator"
-                      [(cc0) (const_int 0)])
-                     (label_ref (match_operand 2 "" ""))
-                     (pc)))]
-  "peep2_reg_dead_p (2, operands[0])"
-  [(set (match_dup 4)
-       (and:HI (match_dup 4)
-               (match_dup 5)))
-   (set (cc0) (compare (match_dup 4)
-                      (const_int 0)))
-   (set (pc)
-       (if_then_else (match_op_dup 3 [(cc0) (const_int 0)])
-                     (label_ref (match_dup 2))
-                     (pc)))]
-  {
-    operands[4] = gen_rtx_REG (HImode, REGNO (operands[0]));
-    operands[5] = gen_int_mode (INTVAL (operands[1]), HImode);
-  })
-
-(define_peephole2
-  [(set (match_operand:SI 0 "register_operand" "")
-       (and:SI (match_dup 0)
-               (match_operand:SI 1 "const_int_qi_operand" "")))
-   (set (match_dup 0)
-       (xor:SI (match_dup 0)
-               (match_operand:SI 2 "const_int_qi_operand" "")))
-   (set (cc0) (compare (match_dup 0)
-                      (const_int 0)))
-   (set (pc)
-       (if_then_else (match_operator 4 "eqne_operator"
-                      [(cc0) (const_int 0)])
-                     (label_ref (match_operand 3 "" ""))
-                     (pc)))]
-  "peep2_reg_dead_p (3, operands[0])
-   && (~INTVAL (operands[1]) & INTVAL (operands[2])) == 0"
-  [(set (match_dup 5)
-       (and:QI (match_dup 5)
-               (match_dup 6)))
-   (set (match_dup 5)
-       (xor:QI (match_dup 5)
-               (match_dup 7)))
-   (set (cc0) (compare (match_dup 5)
-                      (const_int 0)))
-   (set (pc)
-       (if_then_else (match_op_dup 4 [(cc0) (const_int 0)])
-                     (label_ref (match_dup 3))
-                     (pc)))]
-  {
-    operands[5] = gen_rtx_REG (QImode, REGNO (operands[0]));
-    operands[6] = gen_int_mode (INTVAL (operands[1]), QImode);
-    operands[7] = gen_int_mode (INTVAL (operands[2]), QImode);
+    mode = const_int_qi_operand (operands[1], QImode) ? QImode : HImode;
+    operands[4] = gen_rtx_REG (mode, REGNO (operands[0]));
+    operands[5] = gen_int_mode (INTVAL (operands[1]), mode);
   })
 
 ;; These triggers right at the end of allocation of locals in the