[PATCH 6/9] rs6000: Clean up sub<mode>3

Segher Boessenkool segher@kernel.crashing.org
Sat Sep 20 18:47:00 GMT 2014


The instruction patterns are now called subf, with the corresponding
operand order, to be less confusing.  I tried using the "sub" extended
mnemonics instead but that only made things way, way worse.

Do not allow an integer as second operand of sub<mode>3; expand doesn't
use it.  Only strlensi used it, fix that.

For an integer first operand, now use a separate insn sub<mode>3_imm,
which clobbers the carry (it is subfic after all).  ctz, ffz, plus_ltu,
plus_gtu need changes for that (the latter two will be removed later).


2014-09-20  Segher Boessenkool  <segher@kernel.crashing.org>

	* config/rs6000/rs6000.md (strlensi): Don't use subsi3 with a
	constant, use addsi3 directly.
	(three anonymous define_insn, two define_split): Delete.
	(sub<mode>3): Move.  Do not allow constant second operand.
	Generate different insn for constant first operand.
	(*subf<mode>3, *subf<mode>3_dot, *subf<mode>3_dot2): New.
	(subf<mode>3_imm): New.
	(ctz<mode>2, ffs<mode>2): Clobber CA_REGNO where required.
	(*plus_ltu<mode>): Only handle registers.
	(*plus_ltu<mode>_1): New.  Handle integer third operand.
	(*plus_gtu<mode>): Only handle registers.
	(*plus_gtu<mode>_1): New.  Handle integer third operand.


---
 gcc/config/rs6000/rs6000.md | 168 ++++++++++++++++++++++++--------------------
 1 file changed, 93 insertions(+), 75 deletions(-)

diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index 4d07269..5f5edaa 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -1426,7 +1426,7 @@ (define_expand "strlensi"
   emit_label (end_label);
   emit_insn (gen_addsi3 (scratch_string, scratch_string, scratch_dlmzb));
   emit_insn (gen_subsi3 (result, scratch_string, addr));
-  emit_insn (gen_subsi3 (result, result, const1_rtx));
+  emit_insn (gen_addsi3 (result, result, constm1_rtx));
   DONE;
 })
 
@@ -1643,92 +1643,82 @@ (define_insn_and_split "*one_cmpl<mode>2_dot2"
    (set_attr "length" "4,8")])
 
 
-(define_insn ""
-  [(set (match_operand:GPR 0 "gpc_reg_operand" "=r,r")
-	(minus:GPR (match_operand:GPR 1 "reg_or_short_operand" "r,I")
-		   (match_operand:GPR 2 "gpc_reg_operand" "r,r")))]
+(define_expand "sub<mode>3"
+  [(set (match_operand:SDI 0 "gpc_reg_operand" "")
+	(minus:SDI (match_operand:SDI 1 "reg_or_short_operand" "")
+		   (match_operand:SDI 2 "gpc_reg_operand" "")))]
   ""
-  "@
-   subf %0,%2,%1
-   subfic %0,%2,%1"
+{
+  if (short_cint_operand (operands[1], <MODE>mode)
+      && !(<MODE>mode == DImode && !TARGET_POWERPC64))
+    {
+      emit_insn (gen_subf<mode>3_imm (operands[0], operands[2], operands[1]));
+      DONE;
+    }
+})
+
+(define_insn "*subf<mode>3"
+  [(set (match_operand:GPR 0 "gpc_reg_operand" "=r")
+	(minus:GPR (match_operand:GPR 2 "gpc_reg_operand" "r")
+		   (match_operand:GPR 1 "gpc_reg_operand" "r")))]
+  ""
+  "subf %0,%1,%2"
   [(set_attr "type" "add")])
 
-(define_insn ""
-  [(set (match_operand:CC 0 "cc_reg_operand" "=x,?y")
-	(compare:CC (minus:P (match_operand:P 1 "gpc_reg_operand" "r,r")
-			     (match_operand:P 2 "gpc_reg_operand" "r,r"))
+(define_insn_and_split "*subf<mode>3_dot"
+  [(set (match_operand:CC 3 "cc_reg_operand" "=x,?y")
+	(compare:CC (minus:GPR (match_operand:GPR 2 "gpc_reg_operand" "r,r")
+			       (match_operand:GPR 1 "gpc_reg_operand" "r,r"))
 		    (const_int 0)))
-   (clobber (match_scratch:P 3 "=r,r"))]
-  ""
+   (clobber (match_scratch:GPR 0 "=r,r"))]
+  "<MODE>mode == Pmode"
   "@
-   subf. %3,%2,%1
+   subf. %0,%1,%2
    #"
+  "&& reload_completed && cc_reg_not_cr0_operand (operands[3], CCmode)"
+  [(set (match_dup 0)
+	(minus:GPR (match_dup 2)
+		   (match_dup 1)))
+   (set (match_dup 3)
+	(compare:CC (match_dup 0)
+		    (const_int 0)))]
+  ""
   [(set_attr "type" "add")
    (set_attr "dot" "yes")
    (set_attr "length" "4,8")])
 
-(define_split
-  [(set (match_operand:CC 0 "cc_reg_not_cr0_operand" "")
-	(compare:CC (minus:P (match_operand:P 1 "gpc_reg_operand" "")
-			     (match_operand:P 2 "gpc_reg_operand" ""))
-		    (const_int 0)))
-   (clobber (match_scratch:P 3 ""))]
-  "reload_completed"
-  [(set (match_dup 3)
-	(minus:P (match_dup 1)
-		  (match_dup 2)))
-   (set (match_dup 0)
-	(compare:CC (match_dup 3)
-		    (const_int 0)))]
-  "")
-
-(define_insn ""
+(define_insn_and_split "*subf<mode>3_dot2"
   [(set (match_operand:CC 3 "cc_reg_operand" "=x,?y")
-	(compare:CC (minus:P (match_operand:P 1 "gpc_reg_operand" "r,r")
-			     (match_operand:P 2 "gpc_reg_operand" "r,r"))
+	(compare:CC (minus:GPR (match_operand:GPR 2 "gpc_reg_operand" "r,r")
+			       (match_operand:GPR 1 "gpc_reg_operand" "r,r"))
 		    (const_int 0)))
-   (set (match_operand:P 0 "gpc_reg_operand" "=r,r")
-	(minus:P (match_dup 1)
-		  (match_dup 2)))]
-  ""
+   (set (match_operand:GPR 0 "gpc_reg_operand" "=r,r")
+	(minus:GPR (match_dup 2)
+		   (match_dup 1)))]
+  "<MODE>mode == Pmode"
   "@
-   subf. %0,%2,%1
+   subf. %0,%1,%2
    #"
-  [(set_attr "type" "add")
-   (set_attr "dot" "yes")
-   (set_attr "length" "4,8")])
-
-(define_split
-  [(set (match_operand:CC 3 "cc_reg_not_cr0_operand" "")
-	(compare:CC (minus:P (match_operand:P 1 "gpc_reg_operand" "")
-			     (match_operand:P 2 "gpc_reg_operand" ""))
-		    (const_int 0)))
-   (set (match_operand:P 0 "gpc_reg_operand" "")
-	(minus:P (match_dup 1)
-		  (match_dup 2)))]
-  "reload_completed"
+  "&& reload_completed && cc_reg_not_cr0_operand (operands[3], CCmode)"
   [(set (match_dup 0)
-	(minus:P (match_dup 1)
-		  (match_dup 2)))
+	(minus:GPR (match_dup 2)
+		   (match_dup 1)))
    (set (match_dup 3)
 	(compare:CC (match_dup 0)
 		    (const_int 0)))]
-  "")
+  ""
+  [(set_attr "type" "add")
+   (set_attr "dot" "yes")
+   (set_attr "length" "4,8")])
 
-(define_expand "sub<mode>3"
-  [(set (match_operand:SDI 0 "gpc_reg_operand" "")
-	(minus:SDI (match_operand:SDI 1 "reg_or_short_operand" "")
-		   (match_operand:SDI 2 "reg_or_sub_cint_operand" "")))]
+(define_insn "subf<mode>3_imm"
+  [(set (match_operand:GPR 0 "gpc_reg_operand" "=r")
+	(minus:GPR (match_operand:GPR 2 "short_cint_operand" "I")
+		   (match_operand:GPR 1 "gpc_reg_operand" "r")))
+   (clobber (reg:GPR CA_REGNO))]
   ""
-  "
-{
-  if (GET_CODE (operands[2]) == CONST_INT)
-    {
-      emit_insn (gen_add<mode>3 (operands[0], operands[1],
-				 negate_rtx (<MODE>mode, operands[2])));
-      DONE;
-    }
-}")
+  "subfic %0,%1,%2"
+  [(set_attr "type" "add")])
 
 
 (define_expand "neg<mode>2"
@@ -1801,9 +1791,10 @@ (define_expand "ctz<mode>2"
 		 (match_dup 2)))
    (set (match_dup 4)
 	(clz:GPR (match_dup 3)))
-   (set (match_operand:GPR 0 "gpc_reg_operand" "")
-	(minus:GPR (match_dup 5)
-		   (match_dup 4)))]
+   (parallel [(set (match_operand:GPR 0 "gpc_reg_operand" "")
+		   (minus:GPR (match_dup 5)
+			      (match_dup 4)))
+	      (clobber (reg:GPR CA_REGNO))])]
   ""
   {
      operands[2] = gen_reg_rtx (<MODE>mode);
@@ -1820,9 +1811,10 @@ (define_expand "ffs<mode>2"
 		 (match_dup 2)))
    (set (match_dup 4)
 	(clz:GPR (match_dup 3)))
-   (set (match_operand:GPR 0 "gpc_reg_operand" "")
-	(minus:GPR (match_dup 5)
-		   (match_dup 4)))]
+   (parallel [(set (match_operand:GPR 0 "gpc_reg_operand" "")
+		   (minus:GPR (match_dup 5)
+			      (match_dup 4)))
+	      (clobber (reg:GPR CA_REGNO))])]
   ""
   {
      operands[2] = gen_reg_rtx (<MODE>mode);
@@ -12581,7 +12573,7 @@ (define_insn_and_split "*plus_ltu<mode>"
   [(set (match_operand:P 0 "gpc_reg_operand" "=&r,r")
 	(plus:P (ltu:P (match_operand:P 1 "gpc_reg_operand" "r,r")
 		       (match_operand:P 2 "reg_or_neg_short_operand" "r,P"))
-		(match_operand:P 3 "reg_or_short_operand" "rI,rI")))]
+		(match_operand:P 3 "gpc_reg_operand" "r,r")))]
   ""
   "#"
   "&& !reg_overlap_mentioned_p (operands[0], operands[3])"
@@ -12589,6 +12581,19 @@ (define_insn_and_split "*plus_ltu<mode>"
    (set (match_dup 0) (minus:P (match_dup 3) (match_dup 0)))]
   "")
 
+(define_insn_and_split "*plus_ltu<mode>_1"
+  [(set (match_operand:P 0 "gpc_reg_operand" "=&r,r")
+	(plus:P (ltu:P (match_operand:P 1 "gpc_reg_operand" "r,r")
+		       (match_operand:P 2 "reg_or_neg_short_operand" "r,P"))
+		(match_operand:P 3 "short_cint_operand" "I,I")))]
+  ""
+  "#"
+  "&& !reg_overlap_mentioned_p (operands[0], operands[3])"
+  [(set (match_dup 0) (neg:P (ltu:P (match_dup 1) (match_dup 2))))
+   (parallel [(set (match_dup 0) (minus:P (match_dup 3) (match_dup 0)))
+	      (clobber (reg:P CA_REGNO))])]
+  "")
+
 (define_insn_and_split "*plus_ltu<mode>_compare"
   [(set (match_operand:CC 4 "cc_reg_operand" "=x,x,?y,?y")
 	(compare:CC
@@ -13013,7 +13018,7 @@ (define_insn_and_split "*plus_gtu<mode>"
   [(set (match_operand:P 0 "gpc_reg_operand" "=&r")
         (plus:P (gtu:P (match_operand:P 1 "gpc_reg_operand" "r")
 		       (match_operand:P 2 "reg_or_short_operand" "rI"))
-		(match_operand:P 3 "reg_or_short_operand" "rI")))]
+		(match_operand:P 3 "gpc_reg_operand" "r")))]
   ""
   "#"
   "&& !reg_overlap_mentioned_p (operands[0], operands[3])"
@@ -13021,6 +13026,19 @@ (define_insn_and_split "*plus_gtu<mode>"
    (set (match_dup 0) (minus:P (match_dup 3) (match_dup 0)))]
   "")
 
+(define_insn_and_split "*plus_gtu<mode>_1"
+  [(set (match_operand:P 0 "gpc_reg_operand" "=&r")
+        (plus:P (gtu:P (match_operand:P 1 "gpc_reg_operand" "r")
+		       (match_operand:P 2 "reg_or_short_operand" "rI"))
+		(match_operand:P 3 "short_cint_operand" "I")))]
+  ""
+  "#"
+  "&& !reg_overlap_mentioned_p (operands[0], operands[3])"
+  [(set (match_dup 0) (neg:P (gtu:P (match_dup 1) (match_dup 2))))
+   (parallel [(set (match_dup 0) (minus:P (match_dup 3) (match_dup 0)))
+	      (clobber (reg:P CA_REGNO))])]
+  "")
+
 (define_insn_and_split "*plus_gtu<mode>_compare"
   [(set (match_operand:CC 4 "cc_reg_operand" "=x,x,?y,?y")
 	(compare:CC
-- 
1.8.1.4



More information about the Gcc-patches mailing list