re PR middle-end/42193 (454.calculix in SPEC CPU 2006 failed to compile at -O3)

	PR tree-optimization/42193
	* tree-vect-stmts.c (vectorizable_operation): Set vectorization factor
	to 1 in case of basic block SLP.
	(vectorizable_load): Likewise.

From-SVN: r154738

gcc/ChangeLog

+2009-11-29  Ira Rosen  <irar@il.ibm.com>
+
+	PR tree-optimization/42193
+	* tree-vect-stmts.c (vectorizable_operation): Set vectorization factor
+	to 1 in case of basic block SLP.
+	(vectorizable_load): Likewise.
+
 2009-11-28  Jan Hubicka  <jh@suse.cz>
 
 	* cgraph.c (same_body_alias_1): Break out of

gcc/testsuite/ChangeLog

+2009-11-29  Ira Rosen  <irar@il.ibm.com>
+
+	PR tree-optimization/42193
+	* gcc.dg/vect/pr42193.c: New test.
+
 2009-11-28  Dodji Seketeli  <dodji@redhat.com>
 
 	PR c++/36408

gcc/testsuite/gcc.dg/vect/pr42193.c

+/* { dg-do compile } */
+/* { dg-require-effective-target vect_long } */
+
+#include <stdarg.h>
+
+unsigned long in[6], out[6];
+
+void foo ()
+{
+  unsigned long a, b, c, d, e, f;
+
+  a = in[0];
+  b = in[1];
+  c = in[2];
+  d = in[3];
+  e = in[4];
+  f = in[5];
+
+  out[0] = 2 * a + 7 * b + 8  * c + 31 * d + 10 * e + 21 * f;
+  out[1] = 3 * a + 6 * b + 12 * c + 13 * d + 15 * e + 28 * f;
+  out[2] = 4 * a + 5 * b + 72  * c + 23 * d + 14 * e + 24 * f;
+  out[3] = 8 * a + 71 * b + 18  * c + 33 * d + 13 * e + 25 * f;
+  out[4] = 12 * a + 16 * b + 19 * c + 41 * d + 22 * e + 26 * f;
+  out[5] = 17 * a + 15 * b + 13  * c + 14 * d + 11 * e + 9 * f;
+}
+
+/* { dg-final { cleanup-tree-dump "vect" } } */
+

gcc/tree-vect-stmts.c

@@ -1934,8 +1934,7 @@ vectorizable_operation (gimple stmt, gimple_stmt_iterator *gsi,
   if (loop_vinfo)
     vf = LOOP_VINFO_VECT_FACTOR (loop_vinfo);
   else
-    /* FORNOW: multiple types are not supported in basic block SLP.  */
-    vf = nunits_in;
+    vf = 1;
 
   /* Multiple types in SLP are handled by creating the appropriate number of
      vectorized stmts for each SLP node. Hence, NCOPIES is always 1 in
@@ -3279,8 +3278,7 @@ vectorizable_load (gimple stmt, gimple_stmt_iterator *gsi, gimple *vec_stmt,
       vf = LOOP_VINFO_VECT_FACTOR (loop_vinfo);
     }
   else
-    /* FORNOW: multiple types are not supported in basic block SLP.  */
-    vf = nunits;
+    vf = 1;
 
   /* Multiple types in SLP are handled by creating the appropriate number of
      vectorized stmts for each SLP node. Hence, NCOPIES is always 1 in