re PR tree-optimization/87657 (SLP ICE in libgfortran matmul_i2_vanilla)

2018-10-19  Richard Biener  <rguenther@suse.de>

	PR target/87657
	* config/i386/i386.c (ix86_builtin_vectorization_cost): Use
	TYPE_VECTOR_SUBPARTS and avoid relying on vector mode.

	* gcc.target/i386/pr87657.c: New testcase.

From-SVN: r265316

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 50f8d785911381475610720b4c285836eeb6338b..082ef49dcb03a61c6a9842b39fd07c759e02a505 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-10-19  Richard Biener  <rguenther@suse.de>
+
+       PR target/87657
+       * config/i386/i386.c (ix86_builtin_vectorization_cost): Use
+       TYPE_VECTOR_SUBPARTS and avoid relying on vector mode.
+
 2018-10-19  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR target/72782

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index e47603eb5ff6144af01f60c1eaf59fffc77e82c6..963c7fcbb34443c606c3c7b08be63f053c362892 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -45173,9 +45173,8 @@ ix86_builtin_vectorization_cost (enum vect_cost_for_stmt type_of_cost,
 
       case vec_construct:
        {
-         gcc_assert (VECTOR_MODE_P (mode));
          /* N element inserts into SSE vectors.  */
-         int cost = GET_MODE_NUNITS (mode) * ix86_cost->sse_op;
+         int cost = TYPE_VECTOR_SUBPARTS (vectype) * ix86_cost->sse_op;
          /* One vinserti128 for combining two SSE vectors for AVX256.  */
          if (GET_MODE_BITSIZE (mode) == 256)
            cost += ix86_vec_cost (mode, ix86_cost->addss);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5f216f054257ed831a6cc6806f31227a6c390ad7..4fd3f91c860f25f39771b85cfca67c3129397a66 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-10-19  Richard Biener  <rguenther@suse.de>
+
+       PR target/87657
+       * gcc.target/i386/pr87657.c: New testcase.
+
 2018-10-19  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR target/72782

diff --git a/gcc/testsuite/gcc.target/i386/pr87657.c b/gcc/testsuite/gcc.target/i386/pr87657.c
new file mode 100644 (file)
index 0000000..14ba6b4
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr87657.c
@@ -0,0 +1,22 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -ftree-slp-vectorize -fno-vect-cost-model -mno-sse" } */
+
+int x;
+
+void foo (short a, short b)
+{
+  ((short *)&x)[0] = a;
+  ((short *)&x)[1] = b;
+}
+
+#if __SIZEOF_LONG__ == 8
+long y;
+
+void bar (short a, short b)
+{
+  ((short *)&y)[0] = a;
+  ((short *)&y)[1] = b;
+  ((short *)&y)[2] = a;
+  ((short *)&y)[3] = b;
+}
+#endif