From 601a5d76ca67442686facfb179aac2064003bb99 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 7 Sep 2011 21:46:14 +0200 Subject: [PATCH] re PR target/50310 (ICE: in gen_vcondv2div2df, at config/i386/sse.md:1435 with -O -ftree-vectorize and __builtin_isunordered()) * config/i386/sse.md (sseinsnmode): Remove 32-byte integer vector duplicates. PR target/50310 * config/i386/sse.md (*andnot3, *3): Fix up "mode" attribute computation. * gcc.dg/pr50310-1.c: New test. From-SVN: r178659 --- gcc/ChangeLog | 9 +++++++++ gcc/config/i386/sse.md | 24 +++++++++++------------- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr50310-1.c | 18 ++++++++++++++++++ 4 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr50310-1.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 550c051d02c..3f79363feaf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2011-09-07 Jakub Jelinek + + * config/i386/sse.md (sseinsnmode): Remove 32-byte integer vector + duplicates. + + PR target/50310 + * config/i386/sse.md (*andnot3, *3): Fix up + "mode" attribute computation. + 2011-09-07 Bernd Schmidt * regrename.c (struct du_head): Make nregs signed. diff --git a/gcc/config/i386/sse.md b/gcc/config/i386/sse.md index 353f4b62a7d..e96fb7d300c 100644 --- 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) > 128") + (cond [(and (not (match_test "TARGET_AVX2")) + (match_test "GET_MODE_SIZE (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 "")))]) (define_expand "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) > 128") + (cond [(and (not (match_test "TARGET_AVX2")) + (match_test "GET_MODE_SIZE (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 "")))]) (define_insn "*andnottf3" [(set (match_operand:TF 0 "register_operand" "=x,x") diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 07a76587a06..61c6c95567a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-09-07 Jakub Jelinek + + PR target/50310 + * gcc.dg/pr50310-1.c: New test. + 2011-09-07 Georg-Johann Lay 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 index 00000000000..e82276677ea --- /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; +} -- 2.30.2