This makes use of dg-additional-options for the remainder of tests
that were still getting those by filename based rules. This moves
all those under the vect option iteration and slightly simplifies
globbing by moving some files. I've kept the the veclower test glob.
IMO remaining simplification either needs mass renaming of files or/and moving
them into subdirectories. Possibly some regex or TCL expert can
figure out how to filter bb-slp-*.c and vec-scal-*.c from everything
else that's now catched by 17 inclusive regexp.
Tested on x86_64-unknown-linux-gnu.
OK for trunk now? I'm trying to get -march=x86-64-v3 clean and
enable that as extra option iteration as followup.
Thanks,
Richard.
* gcc.dg/vect/vect.exp: Remove remaining filename based
testcase options in favor of dg-additional-options.
* gcc.dg/vect/O-pr46167.c: Use dg-additional-options.
* gcc.dg/vect/O1-pr33854.c: Likewise.
* gcc.dg/vect/O1-pr41008.c: Likewise.
* gcc.dg/vect/Os-vect-95.c: Likewise.
* gcc.dg/vect/ggc-pr37574.c: Likewise.
* gcc.dg/vect/no-fre-pre-pr50208.c: Likewise.
* gcc.dg/vect/no-tree-dom-vect-bug.c: Likewise.
* gcc.dg/vect/no-tree-fre-pr50039.c: Likewise.
* gcc.dg/vect/no-tree-pre-pr45241.c: Likewise.
* gcc.dg/vect/no-tree-pre-slp-29.c: Likewise.
* gcc.dg/vect/no-tree-reassoc-bb-slp-12.c: Likewise.
* gcc.dg/vect/no-tree-sra-bb-slp-pr50730.c: Likewise.
* gcc.dg/vect/unswitch-loops-pr26969.c: Likewise.
* gcc.dg/vect/O3-pr36098.c: Likewise.
* gcc.dg/vect/O3-pr39675-2.c: Likewise.
* gcc.dg/vect/O3-pr41881.c: Likewise.
* gcc.dg/vect/O3-pr45971.c: Likewise.
* gcc.dg/vect/O3-pr46077.c: Likewise.
* gcc.dg/vect/O3-pr49087.c: Likewise.
* gcc.dg/vect/O3-pr70130.c: Likewise.
* gcc.dg/vect/O3-pr85794.c: Likewise.
* gcc.dg/vect/O3-pr87546.c: Likewise.
* gcc.dg/vect/O3-slp-reduc-10.c: Likewise.
* gcc.dg/vect/O3-vect-pr32243.c: Likewise.
* gcc.dg/vect/O3-vect-pr34223.c: Likewise.
* gcc.dg/vect/O3-vect-pr61917.c: Likewise.
* gcc.dg/vect/aligned-section-anchors-nest-1.c: Likewise.
* gcc.dg/vect/aligned-section-anchors-vect-70.c: Likewise.
* gcc.dg/vect/aligned-section-anchors-vect-71.c: Likewise.
* gcc.dg/vect/aligned-section-anchors-vect-72.c: Likewise.
* gcc.dg/vect/no-scevccp-noreassoc-outer-1.c: Likewise.
* gcc.dg/vect/no-scevccp-noreassoc-outer-2.c: Likewise.
* gcc.dg/vect/no-scevccp-noreassoc-outer-3.c: Likewise.
* gcc.dg/vect/no-scevccp-noreassoc-outer-4.c: Likewise.
* gcc.dg/vect/no-scevccp-noreassoc-outer-5.c: Likewise.
* gcc.dg/vect/no-scevccp-noreassoc-slp-reduc-7.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-1.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-10.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-10a.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-10b.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-11.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-12.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-13.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-14.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-15.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-16.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-17.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-18.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-19.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-2.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-20.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-21.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-22.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-3.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-4.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-5.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-6-global.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-6.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-7.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-8.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-9.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-9a.c: Likewise.
* gcc.dg/vect/no-scevccp-outer-9b.c: Likewise.
* gcc.dg/vect/no-scevccp-pr49199.c: Likewise.
* gcc.dg/vect/no-scevccp-pr86725-1.c: Likewise.
* gcc.dg/vect/no-scevccp-pr86725-2.c: Likewise.
* gcc.dg/vect/no-scevccp-pr86725-3.c: Likewise.
* gcc.dg/vect/no-scevccp-pr86725-4.c: Likewise.
* gcc.dg/vect/no-scevccp-pr86725-5.c: Likewise.
* gcc.dg/vect/no-scevccp-slp-30.c: Likewise.
* gcc.dg/vect/no-scevccp-slp-31.c: Likewise.
* gcc.dg/vect/no-scevccp-vect-iv-1.c: Likewise.
* gcc.dg/vect/no-scevccp-vect-iv-2.c: Likewise.
* gcc.dg/vect/no-scevccp-vect-iv-3.c: Likewise.
* gcc.dg/vect/no-section-anchors-vect-31.c: Likewise.
* gcc.dg/vect/no-section-anchors-vect-34.c: Likewise.
* gcc.dg/vect/no-section-anchors-vect-36.c: Likewise.
* gcc.dg/vect/no-section-anchors-vect-64.c: Likewise.
* gcc.dg/vect/no-section-anchors-vect-65.c: Likewise.
* gcc.dg/vect/no-section-anchors-vect-66.c: Likewise.
* gcc.dg/vect/no-section-anchors-vect-68.c: Likewise.
* gcc.dg/vect/no-section-anchors-vect-69.c: Likewise.
* gcc.dg/vect/no-section-anchors-vect-outer-4h.c: Likewise.
* gcc.dg/vect/no-trapping-math-1.c: Likewise.
* gcc.dg/vect/no-trapping-math-2.c: Likewise.
* gcc.dg/vect/no-trapping-math-vect-111.c: Likewise.
* gcc.dg/vect/no-trapping-math-vect-ifcvt-11.c: Likewise.
* gcc.dg/vect/no-trapping-math-vect-ifcvt-12.c: Likewise.
* gcc.dg/vect/no-trapping-math-vect-ifcvt-13.c: Likewise.
* gcc.dg/vect/no-trapping-math-vect-ifcvt-14.c: Likewise.
* gcc.dg/vect/no-trapping-math-vect-ifcvt-15.c: Likewise.
* gcc.dg/vect/section-anchors-pr27770.c: Likewise.
* gcc.dg/vect/section-anchors-vect-69.c: Likewise.
* gcc.dg/vect/no-tree-reassoc-bb-slp-12.c: Rename to ...
* gcc.dg/vect/bb-slp-12.c: ... this.
* gcc.dg/vect/fast-math-bb-slp-call-1.c: Rename to ...
* gcc.dg/vect/bb-slp-call-1.c: ... this.
* gcc.dg/vect/fast-math-bb-slp-call-2.c: Rename to ...
* gcc.dg/vect/bb-slp-call-2.c: ... this.
* gcc.dg/vect/fast-math-bb-slp-call-3.c: Rename to ...
* gcc.dg/vect/bb-slp-call-3.c: ... this.
* gcc.dg/vect/no-tree-sra-bb-slp-pr50730.c: Rename to ...
* gcc.dg/vect/bb-slp-pr50730.c: ... this.
---
gcc/testsuite/gcc.dg/vect/O-pr46167.c | 1 +
gcc/testsuite/gcc.dg/vect/O1-pr33854.c | 1 +
gcc/testsuite/gcc.dg/vect/O1-pr41008.c | 1 +
gcc/testsuite/gcc.dg/vect/O3-pr36098.c | 1 +
gcc/testsuite/gcc.dg/vect/O3-pr39675-2.c | 1 +
gcc/testsuite/gcc.dg/vect/O3-pr41881.c | 1 +
gcc/testsuite/gcc.dg/vect/O3-pr45971.c | 1 +
gcc/testsuite/gcc.dg/vect/O3-pr46077.c | 1 +
gcc/testsuite/gcc.dg/vect/O3-pr49087.c | 1 +
gcc/testsuite/gcc.dg/vect/O3-pr70130.c | 1 +
gcc/testsuite/gcc.dg/vect/O3-pr85794.c | 1 +
gcc/testsuite/gcc.dg/vect/O3-pr87546.c | 2 +
gcc/testsuite/gcc.dg/vect/O3-slp-reduc-10.c | 1 +
gcc/testsuite/gcc.dg/vect/O3-vect-pr32243.c | 1 +
gcc/testsuite/gcc.dg/vect/O3-vect-pr34223.c | 1 +
gcc/testsuite/gcc.dg/vect/O3-vect-pr61917.c | 1 +
gcc/testsuite/gcc.dg/vect/Os-vect-95.c | 1 +
.../vect/aligned-section-anchors-nest-1.c | 1 +
.../vect/aligned-section-anchors-vect-70.c | 1 +
.../vect/aligned-section-anchors-vect-71.c | 1 +
.../vect/aligned-section-anchors-vect-72.c | 1 +
...o-tree-reassoc-bb-slp-12.c => bb-slp-12.c} | 1 +
...t-math-bb-slp-call-1.c => bb-slp-call-1.c} | 0
...t-math-bb-slp-call-2.c => bb-slp-call-2.c} | 0
...t-math-bb-slp-call-3.c => bb-slp-call-3.c} | 0
...-sra-bb-slp-pr50730.c => bb-slp-pr50730.c} | 1 +
gcc/testsuite/gcc.dg/vect/ggc-pr37574.c | 1 +
.../gcc.dg/vect/no-fre-pre-pr50208.c | 1 +
.../vect/no-scevccp-noreassoc-outer-1.c | 1 +
.../vect/no-scevccp-noreassoc-outer-2.c | 1 +
.../vect/no-scevccp-noreassoc-outer-3.c | 1 +
.../vect/no-scevccp-noreassoc-outer-4.c | 1 +
.../vect/no-scevccp-noreassoc-outer-5.c | 1 +
.../vect/no-scevccp-noreassoc-slp-reduc-7.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-1.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-10.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-10a.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-10b.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-11.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-12.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-13.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-14.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-15.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-16.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-17.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-18.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-19.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-2.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-20.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-21.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-22.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-3.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-4.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-5.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-6-global.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-6.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-7.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-8.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-9.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-9a.c | 1 +
.../gcc.dg/vect/no-scevccp-outer-9b.c | 1 +
.../gcc.dg/vect/no-scevccp-pr49199.c | 1 +
.../gcc.dg/vect/no-scevccp-pr86725-1.c | 1 +
.../gcc.dg/vect/no-scevccp-pr86725-2.c | 1 +
.../gcc.dg/vect/no-scevccp-pr86725-3.c | 1 +
.../gcc.dg/vect/no-scevccp-pr86725-4.c | 1 +
.../gcc.dg/vect/no-scevccp-pr86725-5.c | 1 +
gcc/testsuite/gcc.dg/vect/no-scevccp-slp-30.c | 1 +
gcc/testsuite/gcc.dg/vect/no-scevccp-slp-31.c | 1 +
.../gcc.dg/vect/no-scevccp-vect-iv-1.c | 1 +
.../gcc.dg/vect/no-scevccp-vect-iv-2.c | 1 +
.../gcc.dg/vect/no-scevccp-vect-iv-3.c | 1 +
.../gcc.dg/vect/no-section-anchors-vect-31.c | 1 +
.../gcc.dg/vect/no-section-anchors-vect-34.c | 1 +
.../gcc.dg/vect/no-section-anchors-vect-36.c | 1 +
.../gcc.dg/vect/no-section-anchors-vect-64.c | 1 +
.../gcc.dg/vect/no-section-anchors-vect-65.c | 1 +
.../gcc.dg/vect/no-section-anchors-vect-66.c | 1 +
.../gcc.dg/vect/no-section-anchors-vect-68.c | 1 +
.../gcc.dg/vect/no-section-anchors-vect-69.c | 1 +
.../vect/no-section-anchors-vect-outer-4h.c | 1 +
.../gcc.dg/vect/no-trapping-math-1.c | 2 +
.../gcc.dg/vect/no-trapping-math-2.c | 1 +
.../gcc.dg/vect/no-trapping-math-vect-111.c | 1 +
.../vect/no-trapping-math-vect-ifcvt-11.c | 1 +
.../vect/no-trapping-math-vect-ifcvt-12.c | 1 +
.../vect/no-trapping-math-vect-ifcvt-13.c | 1 +
.../vect/no-trapping-math-vect-ifcvt-14.c | 1 +
.../vect/no-trapping-math-vect-ifcvt-15.c | 1 +
.../gcc.dg/vect/no-tree-dom-vect-bug.c | 1 +
.../gcc.dg/vect/no-tree-fre-pr50039.c | 1 +
.../gcc.dg/vect/no-tree-pre-pr45241.c | 1 +
.../gcc.dg/vect/no-tree-pre-slp-29.c | 1 +
.../gcc.dg/vect/section-anchors-pr27770.c | 1 +
.../gcc.dg/vect/section-anchors-vect-69.c | 1 +
.../gcc.dg/vect/unswitch-loops-pr26969.c | 1 +
gcc/testsuite/gcc.dg/vect/vect.exp | 208 +++---------------
97 files changed, 121 insertions(+), 182 deletions(-)
rename gcc/testsuite/gcc.dg/vect/{no-tree-reassoc-bb-slp-12.c => bb-slp-12.c}
(95%)
rename gcc/testsuite/gcc.dg/vect/{fast-math-bb-slp-call-1.c =>
bb-slp-call-1.c} (100%)
rename gcc/testsuite/gcc.dg/vect/{fast-math-bb-slp-call-2.c =>
bb-slp-call-2.c} (100%)
rename gcc/testsuite/gcc.dg/vect/{fast-math-bb-slp-call-3.c =>
bb-slp-call-3.c} (100%)
rename gcc/testsuite/gcc.dg/vect/{no-tree-sra-bb-slp-pr50730.c =>
bb-slp-pr50730.c} (86%)
diff --git a/gcc/testsuite/gcc.dg/vect/O-pr46167.c
b/gcc/testsuite/gcc.dg/vect/O-pr46167.c
index fc6e8a3fcb6..7f0d398e65d 100644
--- a/gcc/testsuite/gcc.dg/vect/O-pr46167.c
+++ b/gcc/testsuite/gcc.dg/vect/O-pr46167.c
@@ -1,4 +1,5 @@
/* { dg-do compile } */
+/* { dg-additional-options "-O" } */
int foo (char c, int i)
{
diff --git a/gcc/testsuite/gcc.dg/vect/O1-pr33854.c
b/gcc/testsuite/gcc.dg/vect/O1-pr33854.c
index 2c4613efb94..e0816ff2bbe 100644
--- a/gcc/testsuite/gcc.dg/vect/O1-pr33854.c
+++ b/gcc/testsuite/gcc.dg/vect/O1-pr33854.c
@@ -1,5 +1,6 @@
/* Testcase by Martin Michlmayr <[email protected]> */
/* { dg-do compile } */
+/* { dg-additional-options "-O1" } */
extern void *malloc (__SIZE_TYPE__ __size);
typedef struct VMatrix_ VMatrix;
diff --git a/gcc/testsuite/gcc.dg/vect/O1-pr41008.c
b/gcc/testsuite/gcc.dg/vect/O1-pr41008.c
index 17579a34b95..f0f9b4419dc 100644
--- a/gcc/testsuite/gcc.dg/vect/O1-pr41008.c
+++ b/gcc/testsuite/gcc.dg/vect/O1-pr41008.c
@@ -1,4 +1,5 @@
/* { dg-do compile } */
+/* { dg-additional-options "-O1" } */
double heating[2][2];
diff --git a/gcc/testsuite/gcc.dg/vect/O3-pr36098.c
b/gcc/testsuite/gcc.dg/vect/O3-pr36098.c
index 8e41717082c..a0fe602d452 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-pr36098.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-pr36098.c
@@ -1,5 +1,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-O3 -fno-ipa-cp-clone" } */
typedef struct {
int iatom[3];
diff --git a/gcc/testsuite/gcc.dg/vect/O3-pr39675-2.c
b/gcc/testsuite/gcc.dg/vect/O3-pr39675-2.c
index ddaac56cc0b..6e099570340 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-pr39675-2.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-pr39675-2.c
@@ -1,5 +1,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-O3 -fno-ipa-cp-clone" } */
#define N 128
diff --git a/gcc/testsuite/gcc.dg/vect/O3-pr41881.c
b/gcc/testsuite/gcc.dg/vect/O3-pr41881.c
index 98511f6cd0c..6fae8fc3979 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-pr41881.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-pr41881.c
@@ -1,4 +1,5 @@
/* { dg-do compile } */
+/* { dg-additional-options "-O3 -fno-ipa-cp-clone" } */
#define TYPE int
diff --git a/gcc/testsuite/gcc.dg/vect/O3-pr45971.c
b/gcc/testsuite/gcc.dg/vect/O3-pr45971.c
index 5d4a581f247..b16008b8f10 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-pr45971.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-pr45971.c
@@ -1,5 +1,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-O3 -fno-ipa-cp-clone" } */
void
foo (int *x, int *y)
diff --git a/gcc/testsuite/gcc.dg/vect/O3-pr46077.c
b/gcc/testsuite/gcc.dg/vect/O3-pr46077.c
index 1a42db20c22..341cc57781a 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-pr46077.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-pr46077.c
@@ -1,5 +1,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-O3 -fno-ipa-cp-clone" } */
void intf_pcmPlayEffect(int *src, int *dst, int size) {
int i;
diff --git a/gcc/testsuite/gcc.dg/vect/O3-pr49087.c
b/gcc/testsuite/gcc.dg/vect/O3-pr49087.c
index bc862f229df..e8e9de10c04 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-pr49087.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-pr49087.c
@@ -1,4 +1,5 @@
/* { dg-do compile } */
+/* { dg-additional-options "-O3 -fno-ipa-cp-clone" } */
static char func2() { }
diff --git a/gcc/testsuite/gcc.dg/vect/O3-pr70130.c
b/gcc/testsuite/gcc.dg/vect/O3-pr70130.c
index 378ec5118aa..4784832af99 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-pr70130.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-pr70130.c
@@ -1,5 +1,6 @@
/* { dg-require-effective-target vsx_hw { target powerpc*-*-* } } */
/* { dg-additional-options "-mdejagnu-cpu=power7 -mvsx" { target powerpc*-*-*
} } */
+/* { dg-additional-options "-O3 -fno-ipa-cp-clone" } */
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/O3-pr85794.c
b/gcc/testsuite/gcc.dg/vect/O3-pr85794.c
index 0def0fa0855..01c2324d5ee 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-pr85794.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-pr85794.c
@@ -1,4 +1,5 @@
/* { dg-do compile } */
+/* { dg-additional-options "-O3 -fno-ipa-cp-clone" } */
int a, b, *c, d;
int *f[6];
diff --git a/gcc/testsuite/gcc.dg/vect/O3-pr87546.c
b/gcc/testsuite/gcc.dg/vect/O3-pr87546.c
index 0d3b71474c5..9f1aa171467 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-pr87546.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-pr87546.c
@@ -1,3 +1,5 @@
+/* { dg-additional-options "-O3 -fno-ipa-cp-clone" } */
+
#include "tree-vect.h"
int a;
diff --git a/gcc/testsuite/gcc.dg/vect/O3-slp-reduc-10.c
b/gcc/testsuite/gcc.dg/vect/O3-slp-reduc-10.c
index 42a59f4a155..ecd4dd7f4aa 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-slp-reduc-10.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-slp-reduc-10.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-O3 -fno-ipa-cp-clone" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/O3-vect-pr32243.c
b/gcc/testsuite/gcc.dg/vect/O3-vect-pr32243.c
index 68a7e5ddf98..77492113c08 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-vect-pr32243.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-vect-pr32243.c
@@ -1,4 +1,5 @@
/* { dg-do compile } */
+/* { dg-additional-options "-O3 -fno-ipa-cp-clone" } */
typedef struct __GLcontextRec GLcontext;
diff --git a/gcc/testsuite/gcc.dg/vect/O3-vect-pr34223.c
b/gcc/testsuite/gcc.dg/vect/O3-vect-pr34223.c
index 7d13f1c2e17..9472d3d81ff 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-vect-pr34223.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-vect-pr34223.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-O3 -fno-ipa-cp-clone" } */
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/O3-vect-pr61917.c
b/gcc/testsuite/gcc.dg/vect/O3-vect-pr61917.c
index 75bd17106e3..82d93eb1035 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-vect-pr61917.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-vect-pr61917.c
@@ -1,4 +1,5 @@
/* { dg-do compile } */
+/* { dg-additional-options "-O3 -fno-ipa-cp-clone" } */
int a, b, c, d;
diff --git a/gcc/testsuite/gcc.dg/vect/Os-vect-95.c
b/gcc/testsuite/gcc.dg/vect/Os-vect-95.c
index 8039be89feb..294a642172c 100644
--- a/gcc/testsuite/gcc.dg/vect/Os-vect-95.c
+++ b/gcc/testsuite/gcc.dg/vect/Os-vect-95.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_float } */
+/* { dg-additional-options "-Os" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-nest-1.c
b/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-nest-1.c
index 24b2fa86da2..401a258a5a3 100644
--- a/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-nest-1.c
+++ b/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-nest-1.c
@@ -1,6 +1,7 @@
/* { dg-do compile } */
/* { dg-require-effective-target section_anchors } */
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fsection-anchors
-fdump-ipa-increase_alignment-details" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-vect-70.c
b/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-vect-70.c
index 7010a52b58d..9093b9ba85d 100644
--- a/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-vect-70.c
+++ b/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-vect-70.c
@@ -1,6 +1,7 @@
/* { dg-do compile } */
/* { dg-require-effective-target section_anchors } */
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fsection-anchors
-fdump-ipa-increase_alignment-details" } */
#define N 32
diff --git a/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-vect-71.c
b/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-vect-71.c
index 7cbd1dcf304..f23a8556180 100644
--- a/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-vect-71.c
+++ b/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-vect-71.c
@@ -1,6 +1,7 @@
/* { dg-do compile } */
/* { dg-require-effective-target section_anchors } */
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fsection-anchors
-fdump-ipa-increase_alignment-details" } */
/* Should not increase alignment of the struct because
sizeof (A.e) < sizeof(corresponding vector type). */
diff --git a/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-vect-72.c
b/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-vect-72.c
index 873fabe9f52..4dddfc3b671 100644
--- a/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-vect-72.c
+++ b/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-vect-72.c
@@ -1,6 +1,7 @@
/* { dg-do compile } */
/* { dg-require-effective-target section_anchors } */
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fsection-anchors
-fdump-ipa-increase_alignment-details" } */
#define N 32
diff --git a/gcc/testsuite/gcc.dg/vect/no-tree-reassoc-bb-slp-12.c
b/gcc/testsuite/gcc.dg/vect/bb-slp-12.c
similarity index 95%
rename from gcc/testsuite/gcc.dg/vect/no-tree-reassoc-bb-slp-12.c
rename to gcc/testsuite/gcc.dg/vect/bb-slp-12.c
index 2202362f3ae..88f7c47c51d 100644
--- a/gcc/testsuite/gcc.dg/vect/no-tree-reassoc-bb-slp-12.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-12.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-reassoc" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-1.c
b/gcc/testsuite/gcc.dg/vect/bb-slp-call-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-1.c
rename to gcc/testsuite/gcc.dg/vect/bb-slp-call-1.c
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-2.c
b/gcc/testsuite/gcc.dg/vect/bb-slp-call-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-2.c
rename to gcc/testsuite/gcc.dg/vect/bb-slp-call-2.c
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-3.c
b/gcc/testsuite/gcc.dg/vect/bb-slp-call-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-3.c
rename to gcc/testsuite/gcc.dg/vect/bb-slp-call-3.c
diff --git a/gcc/testsuite/gcc.dg/vect/no-tree-sra-bb-slp-pr50730.c
b/gcc/testsuite/gcc.dg/vect/bb-slp-pr50730.c
similarity index 86%
rename from gcc/testsuite/gcc.dg/vect/no-tree-sra-bb-slp-pr50730.c
rename to gcc/testsuite/gcc.dg/vect/bb-slp-pr50730.c
index e837418a87b..9bbf573ba2a 100644
--- a/gcc/testsuite/gcc.dg/vect/no-tree-sra-bb-slp-pr50730.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-pr50730.c
@@ -1,5 +1,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target vect_float } */
+/* { dg-additional-options "-fno-tree-sra" } */
typedef __complex__ float Value;
typedef struct {
diff --git a/gcc/testsuite/gcc.dg/vect/ggc-pr37574.c
b/gcc/testsuite/gcc.dg/vect/ggc-pr37574.c
index 9ea09745481..dd9faca718e 100644
--- a/gcc/testsuite/gcc.dg/vect/ggc-pr37574.c
+++ b/gcc/testsuite/gcc.dg/vect/ggc-pr37574.c
@@ -1,4 +1,5 @@
/* { dg-do compile } */
+/* { dg-additional-options "--param ggc-min-expand=0 --param
ggc-min-heapsize=0" } */
#include <stdarg.h>
diff --git a/gcc/testsuite/gcc.dg/vect/no-fre-pre-pr50208.c
b/gcc/testsuite/gcc.dg/vect/no-fre-pre-pr50208.c
index 996e5860ee0..709872ed939 100644
--- a/gcc/testsuite/gcc.dg/vect/no-fre-pre-pr50208.c
+++ b/gcc/testsuite/gcc.dg/vect/no-fre-pre-pr50208.c
@@ -1,4 +1,5 @@
/* { dg-do compile } */
+/* { dg-additional-options "-fno-tree-fre -fno-tree-pre" } */
char c;
int a, b;
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-1.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-1.c
index aeaf8146b1a..538c2933442 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-1.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-1.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop -fno-tree-reassoc" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-2.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-2.c
index 635df4573c7..67f04fdfa4f 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-2.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-2.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop -fno-tree-reassoc" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-3.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-3.c
index 494ff0b6f8f..a1686f4c4ef 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-3.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-3.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop -fno-tree-reassoc" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-4.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-4.c
index 384ea07676d..5ea876fe21a 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-4.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-4.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop -fno-tree-reassoc" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-5.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-5.c
index ba766a3f157..ae639186c71 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-5.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-5.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop -fno-tree-reassoc" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-slp-reduc-7.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-slp-reduc-7.c
index 022d49f1175..f0f97502149 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-slp-reduc-7.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-slp-reduc-7.c
@@ -1,5 +1,6 @@
/* Disabling epilogues until we find a better way to deal with scans. */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
+/* { dg-additional-options "-fno-tree-scev-cprop -fno-tree-reassoc" } */
/* { dg-require-effective-target vect_int } */
#include <stdarg.h>
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-1.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-1.c
index 0834fd3d86c..7843e4f8970 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-1.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-1.c
@@ -1,4 +1,5 @@
/* { dg-do compile } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#define N 40
signed short image[N][N];
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10.c
index d2eee349a42..05658bf6dfc 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10a.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10a.c
index cf7d605f23b..d5ee23a0af3 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10a.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10a.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10b.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10b.c
index cfb837dced8..e731863f891 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10b.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10b.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-11.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-11.c
index d650a9d1cdc..cae2b046d4c 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-11.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-11.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-12.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-12.c
index b94256d48db..385baabb6b0 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-12.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-12.c
@@ -1,5 +1,6 @@
/* { dg-require-effective-target vect_int } */
/* { dg-require-effective-target vect_pack_trunc } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-13.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-13.c
index c5e373f8210..56d42f45972 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-13.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-13.c
@@ -1,5 +1,6 @@
/* { dg-require-effective-target vect_int } */
/* { dg-additional-options "--param max-completely-peel-times=1" } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-14.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-14.c
index 411cc8fea4d..00d8f32dfd0 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-14.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-14.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-15.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-15.c
index 13aac4a9398..1d6027737f1 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-15.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-15.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-16.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-16.c
index c7c2fa8a504..9b1234c67d6 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-16.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-16.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-17.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-17.c
index ba904a6c03e..e2f8431058d 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-17.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-17.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-18.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-18.c
index 464fcb1fc31..94f4b2741c5 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-18.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-18.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-19.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-19.c
index 5cd4049d08c..a12effc925d 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-19.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-19.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-2.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-2.c
index 0f7fda6e50d..155ceb0fb5e 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-2.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-2.c
@@ -1,5 +1,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#define N 40
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-20.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-20.c
index a9ef1c04c70..6d61944ede4 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-20.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-20.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-21.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-21.c
index 72e53c2bfb0..291dbabb8d7 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-21.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-21.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-22.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-22.c
index b41b2c322b9..1863e913a4d 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-22.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-22.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-3.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-3.c
index 91e57a5963a..24c5c8b1a95 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-3.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-3.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-4.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-4.c
index a6c29956f3b..32084ff64d7 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-4.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-4.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-5.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-5.c
index f01fcfb5c34..30ed8cace3a 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-5.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-5.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-6-global.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-6-global.c
index cf529efa31d..4c9105e042a 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-6-global.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-6-global.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-6.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-6.c
index 9c1e251f6a7..b534167e30c 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-6.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-6.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-7.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-7.c
index e796e6ba216..8aaeb1f8563 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-7.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-7.c
@@ -1,5 +1,6 @@
/* { dg-require-effective-target vect_int } */
/* { dg-additional-options "--param max-completely-peel-times=1" } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-8.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-8.c
index 0ed589b47e6..c326d9f507b 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-8.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-8.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9.c
index 62fa559e6ce..9591ec670ed 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9a.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9a.c
index 96ffb4ce7b4..fbb6aa6e7dd 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9a.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9a.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9b.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9b.c
index d76752c0dba..e10503abf2d 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9b.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9b.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-pr49199.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr49199.c
index 1cb455bc564..07c7747c59e 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-pr49199.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr49199.c
@@ -1,5 +1,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
int const_bar (void) __attribute__ ((__const__));
int pure_bar (void) __attribute__ ((__pure__));
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-1.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-1.c
index 3bc63a6552b..0920c3ec620 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-1.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-1.c
@@ -1,5 +1,6 @@
/* { dg-do compile } */
/* { dg-additional-options "-O -w" } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
int foo;
int
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-2.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-2.c
index 66185a9483b..91a3c1811d3 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-2.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-2.c
@@ -1,5 +1,6 @@
/* { dg-do compile } */
/* { dg-additional-options "-O -w" } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
int
nr (int xe)
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-3.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-3.c
index 590c744be0c..809cc622a34 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-3.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-3.c
@@ -1,5 +1,6 @@
/* { dg-do compile } */
/* { dg-additional-options "-O -w" } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
int foo;
int
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-4.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-4.c
index 6ada0a10cb3..5dd5a54b6cd 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-4.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-4.c
@@ -1,5 +1,6 @@
/* { dg-do compile } */
/* { dg-additional-options "-O -w" } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
int
nr (unsigned int xe, unsigned int qqn)
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-5.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-5.c
index 6e7c9d8a77b..7ed4fb7f658 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-5.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr86725-5.c
@@ -1,5 +1,6 @@
/* { dg-do compile } */
/* { dg-additional-options "-O -w" } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
unsigned int foo;
int
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-slp-30.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-slp-30.c
index 534bee4a166..6de056b968f 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-slp-30.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-slp-30.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-slp-31.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-slp-31.c
index f6ac5f60298..fde1029c060 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-slp-31.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-slp-31.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-1.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-1.c
index b78af245a39..933b718ed8b 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-1.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-1.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-2.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-2.c
index 57ebd5c92a4..f7b38ac5489 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-2.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-2.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-3.c
b/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-3.c
index f268d4a5131..eccbae3c5ed 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-3.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-3.c
@@ -1,5 +1,6 @@
/* Disabling epilogues until we find a better way to deal with scans. */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
+/* { dg-additional-options "-fno-tree-scev-cprop" } */
/* { dg-do compile } */
/* { dg-require-effective-target vect_int } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-31.c
b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-31.c
index a1311504d2f..2bcad2b8a13 100644
--- a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-31.c
+++ b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-31.c
@@ -2,6 +2,7 @@
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
/* { dg-require-effective-target vect_int } */
/* { dg-add-options bind_pic_locally } */
+/* { dg-additional-options "-fno-section-anchors" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-34.c
b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-34.c
index 604d4b1bc67..d91bf2dde60 100644
--- a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-34.c
+++ b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-34.c
@@ -1,5 +1,6 @@
/* { dg-require-effective-target vect_int } */
/* { dg-add-options bind_pic_locally } */
+/* { dg-additional-options "-fno-section-anchors" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-36.c
b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-36.c
index 3eada6057dd..65c71c5b678 100644
--- a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-36.c
+++ b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-36.c
@@ -1,5 +1,6 @@
/* { dg-require-effective-target vect_int } */
/* { dg-add-options bind_pic_locally } */
+/* { dg-additional-options "-fno-section-anchors" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-64.c
b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-64.c
index 19fbe331b57..57d1a9d94fd 100644
--- a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-64.c
+++ b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-64.c
@@ -1,5 +1,6 @@
/* Disabling epilogues until we find a better way to deal with scans. */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
+/* { dg-additional-options "-fno-section-anchors" } */
/* { dg-require-effective-target vect_int } */
/* { dg-add-options bind_pic_locally } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-65.c
b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-65.c
index d51ef31aeac..a491d0e03ec 100644
--- a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-65.c
+++ b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-65.c
@@ -1,5 +1,6 @@
/* { dg-require-effective-target vect_int } */
/* { dg-add-options bind_pic_locally } */
+/* { dg-additional-options "-fno-section-anchors" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-66.c
b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-66.c
index e3d4d6ac576..2ebf0902861 100644
--- a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-66.c
+++ b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-66.c
@@ -1,5 +1,6 @@
/* Disabling epilogues until we find a better way to deal with scans. */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
+/* { dg-additional-options "-fno-section-anchors" } */
/* { dg-require-effective-target vect_int } */
#include <stdarg.h>
diff --git a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-68.c
b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-68.c
index 36b79c2907c..2a6fe079aee 100644
--- a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-68.c
+++ b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-68.c
@@ -1,5 +1,6 @@
/* Disabling epilogues until we find a better way to deal with scans. */
/* { dg-additional-options "--param vect-epilogues-nomask=0" } */
+/* { dg-additional-options "-fno-section-anchors" } */
/* { dg-require-effective-target vect_int } */
/* { dg-skip-if "AArch64 tiny code model does not support programs larger than
1MiB" {aarch64_tiny} } */
/* { dg-add-options bind_pic_locally } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-69.c
b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-69.c
index 0861d488e13..96510ca4180 100644
--- a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-69.c
+++ b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-69.c
@@ -1,6 +1,7 @@
/* { dg-require-effective-target vect_int } */
/* { dg-add-options bind_pic_locally } */
/* { dg-additional-options "--param vect-max-peeling-for-alignment=0" } */
+/* { dg-additional-options "-fno-section-anchors" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-outer-4h.c
b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-outer-4h.c
index f79b74d1570..e95dd53947b 100644
--- a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-outer-4h.c
+++ b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-outer-4h.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-section-anchors" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-trapping-math-1.c
b/gcc/testsuite/gcc.dg/vect/no-trapping-math-1.c
index d682387038e..1d9bfdedbef 100644
--- a/gcc/testsuite/gcc.dg/vect/no-trapping-math-1.c
+++ b/gcc/testsuite/gcc.dg/vect/no-trapping-math-1.c
@@ -1,6 +1,8 @@
/* Test for pr30485. */
/* { dg-do compile } */
/* { dg-require-effective-target vect_condition } */
+/* { dg-additional-options "-fno-trapping-math" } */
+
void
foo (float a[32], float b[2][32])
{
diff --git a/gcc/testsuite/gcc.dg/vect/no-trapping-math-2.c
b/gcc/testsuite/gcc.dg/vect/no-trapping-math-2.c
index 8358b6e5432..ac5f7c99e10 100644
--- a/gcc/testsuite/gcc.dg/vect/no-trapping-math-2.c
+++ b/gcc/testsuite/gcc.dg/vect/no-trapping-math-2.c
@@ -1,5 +1,6 @@
/* Test for pr30485. */
/* { dg-require-effective-target vect_float } */
+/* { dg-additional-options "-fno-trapping-math" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-111.c
b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-111.c
index ae5d23fab86..ee54c64650f 100644
--- a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-111.c
+++ b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-111.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_float } */
+/* { dg-additional-options "-fno-trapping-math" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-11.c
b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-11.c
index 4aaff3430a4..a7f2f93a614 100644
--- a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-11.c
+++ b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-11.c
@@ -1,5 +1,6 @@
/* { dg-require-effective-target vect_condition } */
/* { dg-require-effective-target vect_float } */
+/* { dg-additional-options "-fno-trapping-math" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-12.c
b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-12.c
index c644523a004..ecbf96ab082 100644
--- a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-12.c
+++ b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-12.c
@@ -1,5 +1,6 @@
/* { dg-require-effective-target vect_condition } */
/* { dg-require-effective-target vect_float } */
+/* { dg-additional-options "-fno-trapping-math" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-13.c
b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-13.c
index 5902f61f954..1894b8dd84c 100644
--- a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-13.c
+++ b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-13.c
@@ -1,5 +1,6 @@
/* { dg-require-effective-target vect_condition } */
/* { dg-require-effective-target vect_float } */
+/* { dg-additional-options "-fno-trapping-math" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-14.c
b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-14.c
index 5902f61f954..1894b8dd84c 100644
--- a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-14.c
+++ b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-14.c
@@ -1,5 +1,6 @@
/* { dg-require-effective-target vect_condition } */
/* { dg-require-effective-target vect_float } */
+/* { dg-additional-options "-fno-trapping-math" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-15.c
b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-15.c
index 7f436a69e99..aa3e0c1ce80 100644
--- a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-15.c
+++ b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-15.c
@@ -1,5 +1,6 @@
/* { dg-require-effective-target vect_condition } */
/* { dg-require-effective-target vect_float } */
+/* { dg-additional-options "-fno-trapping-math" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-tree-dom-vect-bug.c
b/gcc/testsuite/gcc.dg/vect/no-tree-dom-vect-bug.c
index d31157713bf..2568dd879a9 100644
--- a/gcc/testsuite/gcc.dg/vect/no-tree-dom-vect-bug.c
+++ b/gcc/testsuite/gcc.dg/vect/no-tree-dom-vect-bug.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-dominator-opts" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/no-tree-fre-pr50039.c
b/gcc/testsuite/gcc.dg/vect/no-tree-fre-pr50039.c
index a1824ccb011..ca9b3c7f0ad 100644
--- a/gcc/testsuite/gcc.dg/vect/no-tree-fre-pr50039.c
+++ b/gcc/testsuite/gcc.dg/vect/no-tree-fre-pr50039.c
@@ -1,4 +1,5 @@
/* { dg-do compile } */
+/* { dg-additional-options "-fno-tree-fre" } */
extern unsigned char g_5;
extern int g_31, g_76;
diff --git a/gcc/testsuite/gcc.dg/vect/no-tree-pre-pr45241.c
b/gcc/testsuite/gcc.dg/vect/no-tree-pre-pr45241.c
index 6535fd7e598..23510d322c9 100644
--- a/gcc/testsuite/gcc.dg/vect/no-tree-pre-pr45241.c
+++ b/gcc/testsuite/gcc.dg/vect/no-tree-pre-pr45241.c
@@ -1,5 +1,6 @@
/* PR tree-optimization/45241 */
/* { dg-do compile } */
+/* { dg-additional-options "-fno-tree-pre" } */
int
foo (short x)
diff --git a/gcc/testsuite/gcc.dg/vect/no-tree-pre-slp-29.c
b/gcc/testsuite/gcc.dg/vect/no-tree-pre-slp-29.c
index 8491d5f0070..9c847f048e9 100644
--- a/gcc/testsuite/gcc.dg/vect/no-tree-pre-slp-29.c
+++ b/gcc/testsuite/gcc.dg/vect/no-tree-pre-slp-29.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-fno-tree-pre" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/section-anchors-pr27770.c
b/gcc/testsuite/gcc.dg/vect/section-anchors-pr27770.c
index 1154b40d485..d74f87a3c72 100644
--- a/gcc/testsuite/gcc.dg/vect/section-anchors-pr27770.c
+++ b/gcc/testsuite/gcc.dg/vect/section-anchors-pr27770.c
@@ -1,4 +1,5 @@
/* { dg-require-effective-target section_anchors } */
+/* { dg-additional-options "-fsection-anchors" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/section-anchors-vect-69.c
b/gcc/testsuite/gcc.dg/vect/section-anchors-vect-69.c
index dbf65605e91..5aa5888743a 100644
--- a/gcc/testsuite/gcc.dg/vect/section-anchors-vect-69.c
+++ b/gcc/testsuite/gcc.dg/vect/section-anchors-vect-69.c
@@ -1,5 +1,6 @@
/* { dg-require-effective-target section_anchors } */
/* { dg-additional-options "--param vect-max-peeling-for-alignment=0" } */
+/* { dg-additional-options "-fsection-anchors" } */
#include <stdarg.h>
#include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/unswitch-loops-pr26969.c
b/gcc/testsuite/gcc.dg/vect/unswitch-loops-pr26969.c
index 71538c4b188..6e69c296086 100644
--- a/gcc/testsuite/gcc.dg/vect/unswitch-loops-pr26969.c
+++ b/gcc/testsuite/gcc.dg/vect/unswitch-loops-pr26969.c
@@ -1,5 +1,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target vect_int } */
+/* { dg-additional-options "-funswitch-loops" } */
void
ruby_re_compile_fastmap (char *fastmap, int options)
diff --git a/gcc/testsuite/gcc.dg/vect/vect.exp
b/gcc/testsuite/gcc.dg/vect/vect.exp
index edc0ce5bef9..025c3360c0d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect.exp
+++ b/gcc/testsuite/gcc.dg/vect/vect.exp
@@ -54,23 +54,8 @@ clearcap-init
global VEC_FLAGS
set VEC_FLAGS $DEFAULT_VECTCFLAGS
-global O1_VECTCFLAGS
-set O1_VECTCFLAGS $DEFAULT_VECTCFLAGS
-lappend O1_VECTCFLAGS "-O1"
-lappend O1_VECTCFLAGS "-fdump-tree-vect-details"
-
-global O_VECTCFLAGS
-set O_VECTCFLAGS $DEFAULT_VECTCFLAGS
-lappend O_VECTCFLAGS "-O"
-lappend O_VECTCFLAGS "-fdump-tree-vect-details"
-
lappend DEFAULT_VECTCFLAGS "-O2"
-# Tests that should be run without generating dump info
-et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/nodump-*.\[cS\]]] \
- "" $DEFAULT_VECTCFLAGS
-
# "-O -fdump-tree-veclower2"
lappend VEC_FLAGS "-O" "-fdump-tree-veclower2"
et-dg-runtest dg-runtest [lsort [glob -nocomplain \
@@ -101,13 +86,7 @@ foreach flags $VECT_ADDITIONAL_FLAGS {
[glob -nocomplain $srcdir/$subdir/slp-*.\[cS\]]] \
$flags $DEFAULT_VECTCFLAGS
et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/no-fast-math-*.\[cS\]]] \
- $flags $DEFAULT_VECTCFLAGS
- et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/no-math-errno-*.\[cS\]]] \
- $flags $DEFAULT_VECTCFLAGS
- et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/no-vfa-*.\[cS\]]] \
+ [glob -nocomplain $srcdir/$subdir/no-*.\[cS\]]] \
$flags $DEFAULT_VECTCFLAGS
et-dg-runtest dg-runtest [lsort \
[glob -nocomplain $srcdir/$subdir/fast-math-\[ipsvc\]*.\[cS\]]] \
@@ -118,173 +97,38 @@ foreach flags $VECT_ADDITIONAL_FLAGS {
et-dg-runtest dg-runtest [lsort \
[glob -nocomplain $srcdir/$subdir/trapv-*.\[cS\]]] \
$flags $DEFAULT_VECTCFLAGS
-
et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/fast-math-bb-slp-*.\[cS\]]] \
- $flags $VECT_SLP_CFLAGS
- et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/bb-slp*.\[cS\]]] \
- $flags $VECT_SLP_CFLAGS
-}
-
-#### Tests with special options
-global SAVED_DEFAULT_VECTCFLAGS
-set SAVED_DEFAULT_VECTCFLAGS $DEFAULT_VECTCFLAGS
-set SAVED_VECT_SLP_CFLAGS $VECT_SLP_CFLAGS
-
-# -fno-tree-dce tests
-set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
-lappend DEFAULT_VECTCFLAGS "-fno-tree-dce"
-et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/no-tree-dce-*.\[cS\]]] \
- "" $DEFAULT_VECTCFLAGS
-
-# -fsection-anchors tests
-set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
-lappend DEFAULT_VECTCFLAGS "-fsection-anchors"
-et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/section-anchors-*.\[cS\]]] \
- "" $DEFAULT_VECTCFLAGS
-
-# alignment-sensitive -fsection-anchors tests
-set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
-lappend DEFAULT_VECTCFLAGS "-fsection-anchors" \
- "-fdump-ipa-increase_alignment-details"
-et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/aligned-section-anchors-*.\[cS\]]] \
- "" $DEFAULT_VECTCFLAGS
-
-# -fno-section-anchors tests
-set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
-lappend DEFAULT_VECTCFLAGS "-fno-section-anchors"
-et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/no-section-anchors-*.\[cS\]]] \
- "" $DEFAULT_VECTCFLAGS
-
-# -funswitch-loops tests
-set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
-lappend DEFAULT_VECTCFLAGS "-funswitch-loops"
-et-dg-runtest dg-runtest [lsort \
[glob -nocomplain $srcdir/$subdir/unswitch-loops-*.\[cS\]]] \
- "" $DEFAULT_VECTCFLAGS
-
-# -fno-trapping-math tests
-set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
-lappend DEFAULT_VECTCFLAGS "-fno-trapping-math"
-et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/no-trapping-math-*.\[cS\]]] \
- "" $DEFAULT_VECTCFLAGS
-
-# -fno-tree-scev-cprop
-set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
-lappend DEFAULT_VECTCFLAGS "-fno-tree-scev-cprop"
-et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/no-scevccp-vect-*.\[cS\]]] \
- "" $DEFAULT_VECTCFLAGS
-
-# -fno-tree-scev-cprop
-set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
-lappend DEFAULT_VECTCFLAGS "-fno-tree-scev-cprop"
-et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/no-scevccp-pr*.\[cS\]]] \
- "" $DEFAULT_VECTCFLAGS
-
-# -fno-tree-scev-cprop
-set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
-lappend DEFAULT_VECTCFLAGS "-fno-tree-scev-cprop"
-et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/no-scevccp-outer-*.\[cS\]]] \
- "" $DEFAULT_VECTCFLAGS
-
-# -fno-tree-scev-cprop -fno-tree-reassoc
-set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
-lappend DEFAULT_VECTCFLAGS "-fno-tree-scev-cprop" "-fno-tree-reassoc"
-et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/no-scevccp-noreassoc-*.\[cS\]]] \
- "" $DEFAULT_VECTCFLAGS
-
-# -fno-tree-scev-cprop
-set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
-lappend DEFAULT_VECTCFLAGS "-fno-tree-scev-cprop"
-et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/no-scevccp-slp-*.\[cS\]]] \
- "" $DEFAULT_VECTCFLAGS
-
-# -fno-tree-dominator-opts
-set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
-lappend DEFAULT_VECTCFLAGS "-fno-tree-dominator-opts"
-et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/no-tree-dom-*.\[cS\]]] \
- "" $DEFAULT_VECTCFLAGS
-
-# -fno-tree-pre
-set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
-lappend DEFAULT_VECTCFLAGS "-fno-tree-pre"
-et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/no-tree-pre-*.\[cS\]]] \
- "" $DEFAULT_VECTCFLAGS
-
-# With -Os
-set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
-lappend DEFAULT_VECTCFLAGS "-Os"
-et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/Os-vect-*.\[cS\]]] \
- "" $DEFAULT_VECTCFLAGS
-
-# With --param ggc-min-expand=0 --param ggc-min-heapsize=0
-set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
-lappend DEFAULT_VECTCFLAGS "--param" "ggc-min-expand=0" "--param"
"ggc-min-heapsize=0"
-et-dg-runtest dg-runtest [lsort \
+ $flags $DEFAULT_VECTCFLAGS
+ et-dg-runtest dg-runtest [lsort \
[glob -nocomplain $srcdir/$subdir/ggc-*.\[cS\]]] \
- "" $DEFAULT_VECTCFLAGS
-
-# With -O3.
-# Don't allow IPA cloning, because it throws our counts out of whack.
-set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
-lappend DEFAULT_VECTCFLAGS "-O3" "-fno-ipa-cp-clone"
-
-et-dg-runtest dg-runtest [lsort \
+ $flags $DEFAULT_VECTCFLAGS
+ et-dg-runtest dg-runtest [lsort \
+ [glob -nocomplain $srcdir/$subdir/Os-vect-*.\[cS\]]] \
+ $flags $DEFAULT_VECTCFLAGS
+ et-dg-runtest dg-runtest [lsort \
[glob -nocomplain $srcdir/$subdir/O3-*.\[cS\]]] \
- "" $DEFAULT_VECTCFLAGS
-
-# With -O1
-et-dg-runtest dg-runtest [lsort \
+ $flags $DEFAULT_VECTCFLAGS
+ et-dg-runtest dg-runtest [lsort \
[glob -nocomplain $srcdir/$subdir/O1-*.\[cS\]]] \
- "" $O1_VECTCFLAGS
-
-# With -O
-et-dg-runtest dg-runtest [lsort \
+ $flags $DEFAULT_VECTCFLAGS
+ et-dg-runtest dg-runtest [lsort \
[glob -nocomplain $srcdir/$subdir/O-*.\[cS\]]] \
- "" $O_VECTCFLAGS
-
-# -fno-tree-reassoc
-set VECT_SLP_CFLAGS $SAVED_VECT_SLP_CFLAGS
-lappend VECT_SLP_CFLAGS "-fno-tree-reassoc"
-et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/no-tree-reassoc-bb-slp-*.\[cS\]]] \
- "" $VECT_SLP_CFLAGS
-
-# -fno-tree-fre
-set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
-lappend DEFAULT_VECTCFLAGS "-fno-tree-fre"
-et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/no-tree-fre-*.\[cS\]]] \
- "" $DEFAULT_VECTCFLAGS
-
-# -fno-tree-fre -fno-tree-pre
-set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
-lappend DEFAULT_VECTCFLAGS "-fno-tree-fre" "-fno-tree-pre"
-et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/no-fre-pre*.\[cS\]]] \
- "" $DEFAULT_VECTCFLAGS
-
-# -fno-tree-sra
-set VECT_SLP_CFLAGS $SAVED_VECT_SLP_CFLAGS
-lappend VECT_SLP_CFLAGS "-fno-tree-sra"
-et-dg-runtest dg-runtest [lsort \
- [glob -nocomplain $srcdir/$subdir/no-tree-sra-bb-slp-*.\[cS\]]] \
- "" $VECT_SLP_CFLAGS
+ $flags $DEFAULT_VECTCFLAGS
+ et-dg-runtest dg-runtest [lsort \
+ [glob -nocomplain $srcdir/$subdir/section-anchors-*.\[cS\]]] \
+ $flags $DEFAULT_VECTCFLAGS
+ et-dg-runtest dg-runtest [lsort \
+ [glob -nocomplain $srcdir/$subdir/aligned-section-anchors-*.\[cS\]]] \
+ $flags $DEFAULT_VECTCFLAGS
+ et-dg-runtest dg-runtest [lsort \
+ [glob -nocomplain $srcdir/$subdir/nodump-*.\[cS\]]] \
+ $flags $DEFAULT_VECTCFLAGS
+ et-dg-runtest dg-runtest [lsort \
+ [glob -nocomplain $srcdir/$subdir/bb-slp*.\[cS\]]] \
+ $flags $VECT_SLP_CFLAGS
+}
# Clean up.
set dg-do-what-default ${save-dg-do-what-default}
--
2.51.0
