[gcc r10-7101] i386: Fix up *testqi_ext_3 insn&split for the *testdi_1 changes [PR94088]

[Jakub Jelinek]

https://gcc.gnu.org/g:cc5c935937d01d96c6b070dae31854180249064c

commit r10-7101-gcc5c935937d01d96c6b070dae31854180249064c
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Tue Mar 10 09:26:44 2020 +0100

    i386: Fix up *testqi_ext_3 insn&split for the *testdi_1 changes [PR94088]
    
    In r10-1938-g460bf043c8266dd080308f4783137aee0d0f862c *testdi_1 has been
    changed, so that if the mask has upper 32-bits 0 and then at least one bit
    set, it requires CCZmode rather than CCNOmode, because in that case it uses
    testl instruction rather than testq and so the SF flag wouldn't respect the
    state of the 64-bit result.
    The *testqi_ext_3 define_insn_and_split needs to match that though,
    otherwise it can create an RTL pattern that used to match *testdi_1 but
    doesn't anymore and we'd ICE due to an unrecognizable insn.
    
    2020-03-10  Jakub Jelinek  <jakub@redhat.com>
    
            PR target/94088
            * config/i386/i386.md (*testqi_ext_3): Call ix86_match_ccmode with
            CCZmode instead of CCNOmode if operands[2] has DImode and pos + len
            is 32.
    
            * gcc.target/i386/pr94088.c: New test.

Diff:
---
 gcc/ChangeLog                           |  7 +++++++
 gcc/config/i386/i386.md                 | 17 +++++++++++------
 gcc/testsuite/ChangeLog                 |  5 +++++
 gcc/testsuite/gcc.target/i386/pr94088.c |  9 +++++++++
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 085ef66a207..5d5bbf4fed5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2020-03-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/94088
+	* config/i386/i386.md (*testqi_ext_3): Call ix86_match_ccmode with
+	CCZmode instead of CCNOmode if operands[2] has DImode and pos + len
+	is 32.
+
 2020-03-09  Jason Merrill  <jason@redhat.com>
 
 	* gdbinit.in (pgs): Fix typo in documentation.
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index a4ee549567d..8b5ae34ee11 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -8826,18 +8826,23 @@
 	     (match_operand 3 "const_int_operand" "n")
 	     (match_operand 4 "const_int_operand" "n"))
 	   (const_int 0)]))]
-  "ix86_match_ccmode (insn, CCNOmode)
-   && ((TARGET_64BIT && GET_MODE (operands[2]) == DImode)
-       || GET_MODE (operands[2]) == SImode
-       || GET_MODE (operands[2]) == HImode
-       || GET_MODE (operands[2]) == QImode)
+  "((TARGET_64BIT && GET_MODE (operands[2]) == DImode)
+    || GET_MODE (operands[2]) == SImode
+    || GET_MODE (operands[2]) == HImode
+    || GET_MODE (operands[2]) == QImode)
    /* Ensure that resulting mask is zero or sign extended operand.  */
    && INTVAL (operands[4]) >= 0
    && ((INTVAL (operands[3]) > 0
 	&& INTVAL (operands[3]) + INTVAL (operands[4]) <= 32)
        || (<MODE>mode == DImode
 	   && INTVAL (operands[3]) > 32
-	   && INTVAL (operands[3]) + INTVAL (operands[4]) == 64))"
+	   && INTVAL (operands[3]) + INTVAL (operands[4]) == 64))
+   && ix86_match_ccmode (insn,
+			 /* *testdi_1 requires CCZmode if the mask has bit
+			    31 set and all bits above it clear.  */
+			 GET_MODE (operands[2]) == DImode
+			 && INTVAL (operands[3]) + INTVAL (operands[4]) == 32
+			 ? CCZmode : CCNOmode)"
   "#"
   "&& 1"
   [(set (match_dup 0) (match_op_dup 1 [(match_dup 2) (const_int 0)]))]
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f91af78a302..5ed497dc44c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-03-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/94088
+	* gcc.target/i386/pr94088.c: New test.
+
 2020-03-09  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/92031 - bogus taking address of rvalue error.
diff --git a/gcc/testsuite/gcc.target/i386/pr94088.c b/gcc/testsuite/gcc.target/i386/pr94088.c
new file mode 100644
index 00000000000..d8cdba5280d
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr94088.c
@@ -0,0 +1,9 @@
+/* PR target/94088 */
+/* { dg-do compile } */
+/* { dg-options "-mtbm -O1 -fira-loop-pressure -fno-dce" } */
+
+double
+foo (int x)
+{
+  return x / (4294950402U % -65472 + 161);
+}