PR tree-optimization/30843

	* tree-vect-transform.c (vect_transform_loop): Remove strided scalar
	stores only after all the group is vectorized.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@122225 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 829872f945827fa2ae472c6502946b28816992a6..29b23b74a8a1ea226deb407b4ea0e3a0307ccdbc 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-22  Ira Rosen  <irar@il.ibm.com>
+
+       PR tree-optimization/30843
+       * tree-vect-transform.c (vect_transform_loop): Remove strided scalar 
+       stores only after all the group is vectorized.
+
 2007-02-22  Dorit Nuzman  <dorit@il.ibm.com>
 
        PR tree-optimization/30858

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8556c439c86bf4567502ea0adc8810a5f157dbe5..bc8535c7ea632c7efc4b6a4f69be4799dbb7a097 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-22  Dorit Nuzman  <dorit@il.ibm.com>
+            Ira Rosen  <irar@il.ibm.com> 
+
+       PR tree-optimization/30843
+       * gcc.dg/vect/pr30843.c: New test.
+
 2007-02-22  Dorit Nuzman  <dorit@il.ibm.com>
 
         PR tree-optimization/30858

diff --git a/gcc/testsuite/gcc.dg/vect/pr30843.c b/gcc/testsuite/gcc.dg/vect/pr30843.c
new file mode 100644 (file)
index 0000000..616b618
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/vect/pr30843.c
@@ -0,0 +1,25 @@
+/* { dg-do compile } */
+/* { dg-require-effective-target vect_long } */
+
+#include <stdarg.h>
+#include "tree-vect.h"
+
+#define N 16
+
+void dacP98FillRGBMap (unsigned char *pBuffer)
+{
+    unsigned long dw, dw1;
+    unsigned long *pdw = (unsigned long *)(pBuffer);
+
+    for( dw = 256, dw1 = 0; dw; dw--, dw1 += 0x01010101) 
+    {
+       *pdw++ = dw1;
+       *pdw++ = dw1;
+       *pdw++ = dw1;
+       *pdw++ = dw1;
+    }
+}
+
+/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_interleave } } } } */
+/* { dg-final { cleanup-tree-dump "vect" } } */
+

diff --git a/gcc/tree-vect-transform.c b/gcc/tree-vect-transform.c
index 109705d7e14cbefa186d53de77234e41232c5f26..09f1993ac39dd26d59da29e9c6476cd0f1c33c66 100644 (file)
--- a/gcc/tree-vect-transform.c
+++ b/gcc/tree-vect-transform.c
@@ -5059,7 +5059,7 @@ vect_transform_loop (loop_vec_info loop_vinfo)
   struct loop *loop = LOOP_VINFO_LOOP (loop_vinfo);
   basic_block *bbs = LOOP_VINFO_BBS (loop_vinfo);
   int nbbs = loop->num_nodes;
-  block_stmt_iterator si;
+  block_stmt_iterator si, next_si;
   int i;
   tree ratio = NULL;
   int vectorization_factor = LOOP_VINFO_VECT_FACTOR (loop_vinfo);
@@ -5212,12 +5212,14 @@ vect_transform_loop (loop_vec_info loop_vinfo)
 
                  while (next)
                    {
+                     next_si = bsi_for_stmt (next);
                      next_stmt_info = vinfo_for_stmt (next);
                      /* Free the attached stmt_vec_info and remove the stmt.  */
                      ann = stmt_ann (next);
                      tmp = DR_GROUP_NEXT_DR (next_stmt_info);
                      free (next_stmt_info);
                      set_stmt_info (ann, NULL);
+                     bsi_remove (&next_si, true);
                      next = tmp;
                    }
                  bsi_remove (&si, true);
@@ -5233,16 +5235,6 @@ vect_transform_loop (loop_vec_info loop_vinfo)
                  continue;
                }
            }
-         else
-           {
-             if (strided_store)
-               {
-                 /* This is case of skipped interleaved store. We don't free
-                    its stmt_vec_info.  */
-                 bsi_remove (&si, true);
-                 continue;
-               }
-            }
          bsi_next (&si);
        }                       /* stmts in BB */
     }                          /* BBs in loop */