diff --git a/gcc/ChangeLog b/gcc/ChangeLog index aedf2aef8e8..05712c054fe 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2009-11-29 Ira Rosen + + 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 * cgraph.c (same_body_alias_1): Break out of diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cad8b2bd2ce..1db21253dd0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-11-29 Ira Rosen + + PR tree-optimization/42193 + * gcc.dg/vect/pr42193.c: New test. + 2009-11-28 Dodji Seketeli PR c++/36408 diff --git a/gcc/testsuite/gcc.dg/vect/pr42193.c b/gcc/testsuite/gcc.dg/vect/pr42193.c new file mode 100644 index 00000000000..01609c982e1 --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/pr42193.c @@ -0,0 +1,28 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target vect_long } */ + +#include + +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" } } */ + diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c index 92f21982e3e..7ce91cadb34 100644 --- a/gcc/tree-vect-stmts.c +++ b/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