cris: Enable additions and subtractions to set condition codes.

Enabling dropping of compares with zero of the result, through
the non-VC-setting CCmode substitution.  Beware that the
substitutions for 8- and 16-bit patterns will in some cases be
size-neutral; e.g. replacing an "addq 1..63,$rN" + "test.w $rN"
or "subq 1..63,$rN" + "test.w $rN" with an "add.w -63..63,$rN".

gcc:
	* config/cris/cris.md ("*adddi3<setnz>"): Rename from "*adddi3".
	cris: Enable 32-bit addition to set condition codes.
	("*subdi3<setnz>"): Similarly from "*subdi3".
	("*addsi3<setnz>"): Similarly from "*addsi3".
	("*subsi3<setnz>"): Similarly from "*subsi3".
	("*addhi3<setnz>"): Similarly from "*addhi3" and decorate the
	"cc" attribute to "cc<ccnz>".
	("*addqi3<setnz>"): Similarly from "*addqi3".
	("*sub<mode>3<setnz>"): Similarly from "*sub<mode>3".

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f0800fe1b193b66d516034c175e1146401e1d008..9ec085218af9f054b0923ebbc7926283f748a835 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -124,6 +124,14 @@
        Rename from "extend<mode>si2".
        ("<acc><anz><anzvc>zero_extend<mode>si2<setcc><setnz><setnzvc>"):
        Similar, from "zero_extend<mode>si2".
+       ("*adddi3<setnz>"): Rename from "*adddi3".
+       ("*subdi3<setnz>"): Similarly from "*subdi3".
+       ("*addsi3<setnz>"): Similarly from "*addsi3".
+       ("*subsi3<setnz>"): Similarly from "*subsi3".
+       ("*addhi3<setnz>"): Similarly from "*addhi3" and decorate the
+       "cc" attribute to "cc<ccnz>".
+       ("*addqi3<setnz>"): Similarly from "*addqi3".
+       ("*sub<mode>3<setnz>"): Similarly from "*sub<mode>3".
 
 2020-05-08  Vladimir Makarov  <vmakarov@redhat.com>
 

diff --git a/gcc/config/cris/cris.md b/gcc/config/cris/cris.md
index 2f3f328f5c5a9e33de5eed320f8e3a221026f191..8652f358630c38d1afaad1c599f62679000c2cfc 100644 (file)
--- a/gcc/config/cris/cris.md
+++ b/gcc/config/cris/cris.md
@@ -913,7 +913,7 @@
   ""
   "")
 
-(define_insn "*adddi3"
+(define_insn "*adddi3<setnz>"
   [(set (match_operand:DI 0 "register_operand" "=r,r,r,&r,&r")
        (plus:DI (match_operand:DI 1 "register_operand" "%0,0,0,0,r")
                 (match_operand:DI 2 "general_operand" "J,N,P,g,!To")))
@@ -936,7 +936,7 @@
   ""
   "")
 
-(define_insn "*addsi3"
+(define_insn "*addsi3<setnz>"
   [(set (match_operand:SI 0 "register_operand"  "=r,r, r,r,r,r,r,  r")
        (plus:SI
         (match_operand:SI 1 "register_operand" "%0,0, 0,0,0,0,r,  r")
@@ -989,7 +989,7 @@
 }
  [(set_attr "slottable" "yes,yes,yes,yes,no,no,no,yes")])
 \f
-(define_insn "*addhi3"
+(define_insn "*addhi3<setnz>"
   [(set (match_operand:HI 0 "register_operand"         "=r,r, r,r,r,r")
        (plus:HI (match_operand:HI 1 "register_operand" "%0,0, 0,0,0,r")
                 (match_operand:HI 2 "general_operand"   "r,Q>,J,N,g,!To")))
@@ -1003,9 +1003,9 @@
    add.w %2,%0
    add.w %2,%1,%0"
   [(set_attr "slottable" "yes,yes,yes,yes,no,no")
-   (set_attr "cc" "normal,normal,clobber,clobber,normal,normal")])
+   (set_attr "cc<ccnz>" "normal,normal,clobber,clobber,normal,normal")])
 
-(define_insn "*addqi3"
+(define_insn "*addqi3<setnz>"
   [(set (match_operand:QI 0 "register_operand"         "=r,r, r,r,r,r,r")
        (plus:QI (match_operand:QI 1 "register_operand" "%0,0, 0,0,0,0,r")
                 (match_operand:QI 2 "general_operand"   "r,Q>,J,N,O,g,!To")))
@@ -1020,7 +1020,7 @@
    add.b %2,%0
    add.b %2,%1,%0"
   [(set_attr "slottable" "yes,yes,yes,yes,yes,no,no")
-   (set_attr "cc" "normal,normal,clobber,clobber,clobber,normal,normal")])
+   (set_attr "cc<ccnz>" "normal,normal,clobber,clobber,clobber,normal,normal")])
 \f
 ;; Subtract.
 ;;
@@ -1039,7 +1039,7 @@
   ""
   "")
 
-(define_insn "*subdi3"
+(define_insn "*subdi3<setnz>"
   [(set (match_operand:DI 0 "register_operand" "=r,r,r,&r,&r")
        (minus:DI (match_operand:DI 1 "register_operand" "0,0,0,0,r")
                  (match_operand:DI 2 "general_operand" "J,N,P,g,!To")))
@@ -1062,7 +1062,7 @@
   ""
   "")
 
-(define_insn "*subsi3"
+(define_insn "*subsi3<setnz>"
   [(set (match_operand:SI 0 "register_operand" "=r,r, r,r,r,r,r,r")
        (minus:SI
         (match_operand:SI 1 "register_operand" "0,0, 0,0,0,0,0,r")
@@ -1084,7 +1084,7 @@
    sub.d %2,%1,%0"
   [(set_attr "slottable" "yes,yes,yes,yes,no,no,no,no")])
 \f
-(define_insn "*sub<mode>3"
+(define_insn "*sub<mode>3<setnz>"
   [(set (match_operand:BW 0 "register_operand"         "=r,r, r,r,r,r")
        (minus:BW (match_operand:BW 1 "register_operand" "0,0, 0,0,0,r")
                  (match_operand:BW 2 "general_operand"  "r,Q>,J,N,g,!To")))
@@ -1098,7 +1098,7 @@
    sub<m> %2,%0
    sub<m> %2,%1,%0"
   [(set_attr "slottable" "yes,yes,yes,yes,no,no")
-   (set_attr "cc" "normal,normal,clobber,clobber,normal,normal")])
+   (set_attr "cc<ccnz>" "normal,normal,clobber,clobber,normal,normal")])
 \f
 ;; This is the special case when we use what corresponds to the
 ;; instruction above in "casesi".  Do *not* change it to use the generic