aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Biener <rguenther@suse.de>2018-05-28 10:28:38 +0000
committerRichard Biener <rguenth@gcc.gnu.org>2018-05-28 10:28:38 +0000
commitb29502e735e6eafd451a27422e5c8fe211ad0716 (patch)
treefa06038a88553bcf945a76d5e1658dd8fd2401f1
parent533aa46a8685713d8d8a987de016c5bcbff9c209 (diff)
downloadgcc-b29502e735e6eafd451a27422e5c8fe211ad0716.zip
gcc-b29502e735e6eafd451a27422e5c8fe211ad0716.tar.gz
gcc-b29502e735e6eafd451a27422e5c8fe211ad0716.tar.bz2
re PR tree-optimization/85934 (ICE: verify_gimple failed (error: type mismatch in vector pack expression))
2018-05-28 Richard Biener <rguenther@suse.de> PR tree-optimization/85934 * tree-vect-generic.c (expand_vector_operations_1): Hoist vector boolean check before scalar optimization. * gcc.target/i386/pr85934.c: New testcase. From-SVN: r260847
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.target/i386/pr85934.c20
-rw-r--r--gcc/tree-vect-generic.c12
3 files changed, 31 insertions, 6 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b9c30ae..e3766bc 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-28 Richard Biener <rguenther@suse.de>
+
+ PR tree-optimization/85934
+ * gcc.target/i386/pr85934.c: New testcase.
+
2018-05-28 Eric Botcazou <ebotcazou@adacore.com>
* gnat.dg/renaming12.adb, gnat.dg/renaming12.ads: New testcase.
diff --git a/gcc/testsuite/gcc.target/i386/pr85934.c b/gcc/testsuite/gcc.target/i386/pr85934.c
new file mode 100644
index 0000000..ac10cfb
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr85934.c
@@ -0,0 +1,20 @@
+/* { dg-do compile } */
+/* { dg-options "-O -ftree-loop-vectorize -mavx512vbmi" } */
+
+int uf;
+
+int
+l7 (int wk, int sv)
+{
+ while (sv < 1)
+ {
+ int me;
+
+ for (me = 0; me < 64; ++me)
+ wk += !!((unsigned char) sv) && (!!uf == !!me);
+
+ ++sv;
+ }
+
+ return wk;
+}
diff --git a/gcc/tree-vect-generic.c b/gcc/tree-vect-generic.c
index 3dcbdeb..2ade60b 100644
--- a/gcc/tree-vect-generic.c
+++ b/gcc/tree-vect-generic.c
@@ -1612,6 +1612,12 @@ expand_vector_operations_1 (gimple_stmt_iterator *gsi)
if (!VECTOR_TYPE_P (type)
|| !VECTOR_TYPE_P (TREE_TYPE (rhs1)))
return;
+
+ /* A scalar operation pretending to be a vector one. */
+ if (VECTOR_BOOLEAN_TYPE_P (type)
+ && !VECTOR_MODE_P (TYPE_MODE (type))
+ && TYPE_MODE (type) != BLKmode)
+ return;
/* If the vector operation is operating on all same vector elements
implement it with a scalar operation and a splat if the target
@@ -1638,12 +1644,6 @@ expand_vector_operations_1 (gimple_stmt_iterator *gsi)
return;
}
}
-
- /* A scalar operation pretending to be a vector one. */
- if (VECTOR_BOOLEAN_TYPE_P (type)
- && !VECTOR_MODE_P (TYPE_MODE (type))
- && TYPE_MODE (type) != BLKmode)
- return;
if (CONVERT_EXPR_CODE_P (code)
|| code == FLOAT_EXPR