5 files changed, 9 insertions, 4 deletions
diff --git a/gcc/testsuite/gcc.dg/graphite/graphite.exp b/gcc/testsuite/gcc.dg/graphite/graphite.exp
index e6cdf12ed95..2111e384a5a 100644
--- a/gcc/testsuite/gcc.dg/graphite/graphite.exp
+++ b/gcc/testsuite/gcc.dg/graphite/graphite.exp
@@ -49,7 +49,6 @@ set vect_files        [lsort [glob -nocomplain $srcdir/$subdir/vect-*.c ] ]
 set dg-do-what-default compile
 dg-runtest $scop_files        "" "-O2 -fgraphite -fdump-tree-graphite-all"
 dg-runtest $id_files          "" "-O2 -fgraphite-identity -ffast-math"
-dg-runtest $vect_files        "" "-O2 -fgraphite-identity -ftree-vectorize -fno-vect-cost-model -fdump-tree-vect-details"
 
 # Tests to be run.
 set dg-do-what-default run
@@ -57,6 +56,14 @@ dg-runtest $run_id_files      "" "-O2 -fgraphite-identity"
 dg-runtest $interchange_files "" "-O2 -floop-interchange -fno-loop-block -fno-loop-strip-mine -ffast-math -fdump-tree-graphite-all"
 dg-runtest $block_files       "" "-O2 -floop-block -fno-loop-strip-mine -fno-loop-interchange -ffast-math -fdump-tree-graphite-all"
 
+# Vectorizer tests, to be run or compiled, depending on target capabilities.
+global DEFAULT_VECTCFLAGS
+set DEFAULT_VECTCFLAGS "-O2 -fgraphite-identity -ftree-vectorize -fno-vect-cost-model -fdump-tree-vect-details"
+
+if [check_vect_support_and_set_flags] {
+    dg-runtest $vect_files        "" $DEFAULT_VECTCFLAGS
+}
+
 # The default action for the rest of the files is 'compile'.
 set dg-do-what-default compile
 foreach f $scop_files        {lremove wait_to_run_files $f}
diff --git a/gcc/testsuite/gcc.dg/graphite/pr40281.c b/gcc/testsuite/gcc.dg/graphite/pr40281.c
index 437f3434e4b..255546b0cf0 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr40281.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr40281.c
@@ -1,4 +1,3 @@
-/* { dg-do compile } */
 /* { dg-options "-O -fprefetch-loop-arrays -w" } */
 /* { dg-options "-O -fprefetch-loop-arrays -march=i686 -msse -w" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 /* { dg-require-effective-target sse { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/pr41888.c b/gcc/testsuite/gcc.dg/graphite/pr41888.c
index b262af68e92..45df7df287e 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr41888.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr41888.c
@@ -1,4 +1,3 @@
-/* { dg-do compile } */
 /* { dg-options "-g -O2 -ftree-loop-distribution -fgraphite-identity" } */
 
 int
diff --git a/gcc/testsuite/gcc.dg/graphite/pr42729.c b/gcc/testsuite/gcc.dg/graphite/pr42729.c
index 3a0e901a13a..a9f1e2dee3f 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr42729.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr42729.c
@@ -1,4 +1,3 @@
-/* { dg-do compile } */
 /* { dg-options "-O1 -fgraphite-identity -fcompare-debug" } */
 
 int A[10];
diff --git a/gcc/testsuite/gcc.dg/graphite/vect-pr43423.c b/gcc/testsuite/gcc.dg/graphite/vect-pr43423.c
index 5589167fbd3..bd685a651c8 100644
--- a/gcc/testsuite/gcc.dg/graphite/vect-pr43423.c
+++ b/gcc/testsuite/gcc.dg/graphite/vect-pr43423.c
@@ -1,3 +1,4 @@
+/* { dg-do compile } */
 /* { dg-require-effective-target vect_int } */
 
 int a[100], b[100], c[100];