re PR target/50310 (ICE: in gen_vcondv2div2df, at config/i386/sse.md:1435 with -O...

	* config/i386/sse.md (sseinsnmode): Remove 32-byte integer vector
	duplicates.

	PR target/50310
	* config/i386/sse.md (*andnot<mode>3, *<code><mode>3): Fix up
	"mode" attribute computation.

	* gcc.dg/pr50310-1.c: New test.

From-SVN: r178659

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 550c051d02c260edd3e8e19f180212573e3d3820..3f79363feaf8ca654be6edf8406489d065b262cf 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2011-09-07  Jakub Jelinek  <jakub@redhat.com>
+
+       * config/i386/sse.md (sseinsnmode): Remove 32-byte integer vector
+       duplicates.
+
+       PR target/50310
+       * config/i386/sse.md (*andnot<mode>3, *<code><mode>3): Fix up
+       "mode" attribute computation.
+
 2011-09-07  Bernd Schmidt  <bernds@codesourcery.com>
 
        * regrename.c (struct du_head): Make nregs signed.

diff --git a/gcc/config/i386/sse.md b/gcc/config/i386/sse.md
index 353f4b62a7d0f60250673fdef13b0826f1eac003..e96fb7d300c2bc8a6146d884fd03a83e231ad94f 100644 (file)
--- a/gcc/config/i386/sse.md
+++ b/gcc/config/i386/sse.md
@@ -229,7 +229,7 @@
    (V16QI "TI") (V8HI "TI") (V4SI "TI") (V2DI "TI") (V1TI "TI")
    (V8SF "V8SF") (V4DF "V4DF")
    (V4SF "V4SF") (V2DF "V2DF")
-   (TI "TI") (V32QI "OI") (V16HI "OI") (V8SI "OI") (V4DI "OI")])
+   (TI "TI")])
 
 ;; Mapping of vector float modes to an integer mode of the same size
 (define_mode_attr sseintvecmode
@@ -6340,14 +6340,13 @@
        (const_string "*")))
    (set_attr "prefix" "orig,vex")
    (set (attr "mode")
-     (cond [(match_test "TARGET_AVX2")
-             (const_string "OI")
-           (match_test "GET_MODE_SIZE (<MODE>mode) > 128")
+     (cond [(and (not (match_test "TARGET_AVX2"))
+                (match_test "GET_MODE_SIZE (<MODE>mode) > 16"))
              (const_string "V8SF")
-           (match_test "TARGET_SSE2")
-             (const_string "TI")
+           (not (match_test "TARGET_SSE2"))
+             (const_string "V4SF")
           ]
-          (const_string "V4SF")))])
+          (const_string "<sseinsnmode>")))])
 
 (define_expand "<code><mode>3"
   [(set (match_operand:VI 0 "register_operand" "")
@@ -6416,14 +6415,13 @@
        (const_string "*")))
    (set_attr "prefix" "orig,vex")
    (set (attr "mode")
-     (cond [(match_test "TARGET_AVX2")
-             (const_string "OI")
-           (match_test "GET_MODE_SIZE (<MODE>mode) > 128")
+     (cond [(and (not (match_test "TARGET_AVX2"))
+                (match_test "GET_MODE_SIZE (<MODE>mode) > 16"))
              (const_string "V8SF")
-           (match_test "TARGET_SSE2")
-             (const_string "TI")
+           (not (match_test "TARGET_SSE2"))
+             (const_string "V4SF")
           ]
-          (const_string "V4SF")))])
+          (const_string "<sseinsnmode>")))])
 
 (define_insn "*andnottf3"
   [(set (match_operand:TF 0 "register_operand" "=x,x")

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 07a76587a06e2ee27e62ba9e676f1dff393f9604..61c6c95567a05ecc0f22c8e29d98dd11cae3aff1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-07  Jakub Jelinek  <jakub@redhat.com>
+
+       PR target/50310
+       * gcc.dg/pr50310-1.c: New test.
+
 2011-09-07  Georg-Johann Lay  <avr@gjlay.de>
 
        PR middle-end/48571

diff --git a/gcc/testsuite/gcc.dg/pr50310-1.c b/gcc/testsuite/gcc.dg/pr50310-1.c
new file mode 100644 (file)
index 0000000..e822766
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr50310-1.c
@@ -0,0 +1,18 @@
+/* PR target/50310 */
+/* { dg-do run } */
+/* { dg-options "-O3" } */
+/* { dg-options "-O3 -mavx -mno-avx2" { target avx_runtime } } */
+
+double s1[4], s2[4];
+long long e[4];
+
+int
+main ()
+{
+  int i;
+  asm volatile ("" : : : "memory");
+  for (i = 0; i < 4; i++)
+    e[i] = __builtin_isunordered (s1[i], s2[i]) && s1[i] != s2[i] ? -1 : 0;
+  asm volatile ("" : : : "memory");
+  return 0;
+}