6 files changed, 39 insertions, 11 deletions
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-57.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-57.c
index b7ef4b43017..a80f6330394 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-57.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-57.c
@@ -1,6 +1,7 @@
 /* { dg-require-effective-target vect_float } */
 
 #include <stdarg.h>
+#include <string.h>
 #include "tree-vect.h"
 
 #define N 256
@@ -20,6 +21,15 @@ void bar (float *pa, float *pb, float *pc)
   return;
 }
 
+__attribute__ ((noinline))
+void foo (float *pb, float *pc)
+{
+  float b[N] = {0,3,6,9,12,15,18,21,24,27,30,33,36,39,42,45,48,51,54,57};
+  float c[N] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19};
+  memcpy (pb, b, sizeof (b));
+  memcpy (pc, c, sizeof (c));
+}
+
 /* Unaligned pointer read accesses with known alignment,
    and an unaligned write access with unknown alignment.
    The loop bound is known and divisible by the vectorization factor.
@@ -33,11 +43,13 @@ __attribute__ ((noinline)) int
 main1 (float *pa)
 {
   int i;
-  float b[N] __attribute__ ((__aligned__(16))) = {0,3,6,9,12,15,18,21,24,27,30,33,36,39,42,45,48,51,54,57};
-  float c[N] __attribute__ ((__aligned__(16))) = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19};
+  float b[N] __attribute__ ((__aligned__(16)));
+  float c[N] __attribute__ ((__aligned__(16)));
   float *pb = b;
   float *pc = c;
 
+  foo (pb, pc);
+
   for (i = 0; i < N/2; i++)
     {
       pa[i] = pb[i+1] * pc[i+1];
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-61.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-61.c
index 39491a882e5..582ca1295f1 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-61.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-61.c
@@ -2,6 +2,7 @@
 /* { dg-require-effective-target vect_float } */
 
 #include <stdarg.h>
+#include <string.h>
 #include "tree-vect.h"
 
 #define N 256
@@ -21,6 +22,15 @@ void bar (float *pa, float *pb, float *pc)
   return;
 }
 
+__attribute__ ((noinline))
+void foo (float *pb, float *pc)
+{
+  float b[N] = {0,3,6,9,12,15,18,21,24,27,30,33,36,39,42,45,48,51,54,57};
+  float c[N] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19};
+  memcpy (pb, b, sizeof (b));
+  memcpy (pc, c, sizeof (c));
+}
+
 /* Unaligned pointer read accesses with known alignment,
    and an unaligned write access with unknown alignment.
    The loop bound is iunknown.
@@ -34,11 +44,13 @@ __attribute__ ((noinline)) int
 main1 (int n , float *pa)
 {
   int i;
-  float b[N] __attribute__ ((__aligned__(16))) = {0,3,6,9,12,15,18,21,24,27,30,33,36,39,42,45,48,51,54,57};
-  float c[N] __attribute__ ((__aligned__(16))) = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19};
+  float b[N] __attribute__ ((__aligned__(16)));
+  float c[N] __attribute__ ((__aligned__(16)));
   float *pb = b;
   float *pc = c;
 
+  foo (pb, pc);
+
   for (i = 0; i < n/2; i++)
     {
       pa[i] = pb[i+1] * pc[i+1];
diff --git a/gcc/testsuite/gcc.dg/vect/vect-54.c b/gcc/testsuite/gcc.dg/vect/vect-54.c
index 6e1aa549a97..a44cdd41811 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-54.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-54.c
@@ -26,13 +26,14 @@ void bar (float *pa, float *pb, float *pc)
    vect-58.c is similar to this one with one difference:
         the loop bound is unknown.  */
 
+float b[N] __attribute__ ((__aligned__(16))) = {0,3,6,9,12,15,18,21,24,27,30,33,36,39,42,45,48,51,54,57};
+float c[N] __attribute__ ((__aligned__(16))) = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19};
+
 __attribute__ ((noinline)) int
 main1 ()
 {
   int i;
   float a[N] __attribute__ ((__aligned__(16)));
-  float b[N] __attribute__ ((__aligned__(16))) = {0,3,6,9,12,15,18,21,24,27,30,33,36,39,42,45,48,51,54,57};
-  float c[N] __attribute__ ((__aligned__(16))) = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19};
   float *pa = a;
   float *pb = b;
   float *pc = c;
diff --git a/gcc/testsuite/gcc.dg/vect/vect-56.c b/gcc/testsuite/gcc.dg/vect/vect-56.c
index 387bd3ab854..624a11287ea 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-56.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-56.c
@@ -30,13 +30,14 @@ void bar (float *pa, float *pb, float *pc)
    vect-57.c is similar to this one with two differences:
         aliasing is a problem, and the write access has unknown alignment.  */
 
+float b[N] __attribute__ ((__aligned__(16))) = {0,3,6,9,12,15,18,21,24,27,30,33,36,39,42,45,48,51,54,57};
+float c[N] __attribute__ ((__aligned__(16))) = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19};
+
 __attribute__ ((noinline)) int
 main1 ()
 {
   int i;
   float a[N] __attribute__ ((__aligned__(16)));
-  float b[N] __attribute__ ((__aligned__(16))) = {0,3,6,9,12,15,18,21,24,27,30,33,36,39,42,45,48,51,54,57};
-  float c[N] __attribute__ ((__aligned__(16))) = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19};
   float *pa = a;
   float *pb = b;
   float *pc = c;
diff --git a/gcc/testsuite/gcc.dg/vect/vect-58.c b/gcc/testsuite/gcc.dg/vect/vect-58.c
index 94cc3efa468..fe58860e000 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-58.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-58.c
@@ -26,11 +26,12 @@ void bar (float *pa, float *pb, float *pc)
    vect-54.c is similar to this one with one difference:
         the loop bound is known.  */
 
+float a[N] __attribute__ ((__aligned__(16)));  float b[N] __attribute__ ((__aligned__(16))) = {0,3,6,9,12,15,18,21,24,27,30,33,36,39,42,45,48,51,54,57};  float c[N] __attribute__ ((__aligned__(16))) = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19};
+
 __attribute__ ((noinline)) int
 main1 (int n)
 {
   int i;
-  float a[N] __attribute__ ((__aligned__(16)));  float b[N] __attribute__ ((__aligned__(16))) = {0,3,6,9,12,15,18,21,24,27,30,33,36,39,42,45,48,51,54,57};  float c[N] __attribute__ ((__aligned__(16))) = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19};
   float *pa = a;
   float *pb = b;
   float *pc = c;
diff --git a/gcc/testsuite/gcc.dg/vect/vect-60.c b/gcc/testsuite/gcc.dg/vect/vect-60.c
index 97e614c0652..efb1d5043c4 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-60.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-60.c
@@ -30,13 +30,14 @@ void bar (float *pa, float *pb, float *pc)
    vect-61.c is similar to this one with two differences:
         aliasing is not a problem, and the write access has unknown alignment.  */
 
+float b[N] __attribute__ ((__aligned__(16))) = {0,3,6,9,12,15,18,21,24,27,30,33,36,39,42,45,48,51,54,57};
+float c[N] __attribute__ ((__aligned__(16))) = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19};
+
 __attribute__ ((noinline)) int
 main1 (int n)
 {
   int i;
   float a[N] __attribute__ ((__aligned__(16)));
-  float b[N] __attribute__ ((__aligned__(16))) = {0,3,6,9,12,15,18,21,24,27,30,33,36,39,42,45,48,51,54,57};
-  float c[N] __attribute__ ((__aligned__(16))) = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19};
   float *pa = a;
   float *pb = b;
   float *pc = c;