From 7bb5d5f42db0fabd8a6ccdc2cc46526dd5f209d4 Mon Sep 17 00:00:00 2001
From: Uros Bizjak <ubizjak@gmail.com>
Date: Thu, 23 Jun 2016 21:58:37 +0200
Subject: [PATCH] pr33834_2.cc: Use dg-additional-options instead of dg-options
 and remove default vector...

	* g++.dg/vect/pr33834_2.cc: Use dg-additional-options instead of
	dg-options and remove default vector testsuite compile flags.
	* g++.dg/vect/pr33860a.cc: Ditto.
	* g++.dg/vect/pr45470-a.cc: Ditto.
	* g++.dg/vect/pr45470-b.cc: Ditto.
	* g++.dg/vect/pr60896.cc: Ditto.
	* gcc.dg/vect/no-tree-pre-pr45241.c: Ditto.
	* gcc.dg/vect/pr18308.c: Ditto.
	* gcc.dg/vect/pr24049.c: Ditto.
	* gcc.dg/vect/pr33373.c: Ditto.
	* gcc.dg/vect/pr36228.c: Ditto.
	* gcc.dg/vect/pr42395.c: Ditto.
	* gcc.dg/vect/pr42604.c: Ditto.
	* gcc.dg/vect/pr46663.c: Ditto.
	* gcc.dg/vect/pr48765.c: Ditto.
	* gcc.dg/vect/pr49093.c: Ditto.
	* gcc.dg/vect/pr49352.c: Ditto.
	* gcc.dg/vect/pr52298.c: Ditto.
	* gcc.dg/vect/pr52870.c: Ditto.
	* gcc.dg/vect/pr53185.c: Ditto.
	* gcc.dg/vect/pr53773.c: Ditto.
	* gcc.dg/vect/pr56695.c: Ditto.
	* gcc.dg/vect/pr62171.c: Ditto.
	* gcc.dg/vect/pr63530.c: Ditto.
	* gcc.dg/vect/pr68339.c: Ditto.
	* gcc.dg/vect/pr71259.c: Ditto.
	* gcc.dg/vect/vect-82_64.c: Ditto.
	* gcc.dg/vect/vect-83_64.c: Ditto.
	* gcc.dg/vect/vect-debug-pr41926.c: Ditto.
	* gcc.dg/vect/vect-shift-2-big-array.c: Ditto.
	* gcc.dg/vect/vect-shift-2.c: Ditto.
	* gfortran.dg/vect/fast-math-mgrid-resid.f: Ditto.
	* gfortran.dg/vect/pr39318.f90: Ditto.
	* gfortran.dg/vect/pr45714-a.f: Ditto.
	* gfortran.dg/vect/pr45714-b.f: Ditto.
	* gfortran.dg/vect/pr46213.f90: Ditto.

From-SVN: r237745
---
 gcc/testsuite/ChangeLog                       | 39 +++++++++++++++++++
 gcc/testsuite/g++.dg/vect/pr33834_2.cc        |  2 +-
 gcc/testsuite/g++.dg/vect/pr33860a.cc         |  2 +-
 gcc/testsuite/g++.dg/vect/pr45470-a.cc        |  2 +-
 gcc/testsuite/g++.dg/vect/pr45470-b.cc        |  2 +-
 gcc/testsuite/g++.dg/vect/pr60896.cc          |  2 +-
 .../gcc.dg/vect/no-tree-pre-pr45241.c         |  1 -
 gcc/testsuite/gcc.dg/vect/pr18308.c           |  2 +-
 gcc/testsuite/gcc.dg/vect/pr24049.c           |  2 +-
 gcc/testsuite/gcc.dg/vect/pr33373.c           |  2 +-
 gcc/testsuite/gcc.dg/vect/pr36228.c           |  2 +-
 gcc/testsuite/gcc.dg/vect/pr42395.c           |  2 +-
 gcc/testsuite/gcc.dg/vect/pr42604.c           |  2 +-
 gcc/testsuite/gcc.dg/vect/pr46663.c           |  2 +-
 gcc/testsuite/gcc.dg/vect/pr48765.c           |  2 +-
 gcc/testsuite/gcc.dg/vect/pr49093.c           |  2 +-
 gcc/testsuite/gcc.dg/vect/pr49352.c           |  2 +-
 gcc/testsuite/gcc.dg/vect/pr52298.c           |  5 ++-
 gcc/testsuite/gcc.dg/vect/pr52870.c           |  2 +-
 gcc/testsuite/gcc.dg/vect/pr53185.c           |  3 +-
 gcc/testsuite/gcc.dg/vect/pr53773.c           |  2 +-
 gcc/testsuite/gcc.dg/vect/pr56695.c           |  1 -
 gcc/testsuite/gcc.dg/vect/pr62171.c           |  1 -
 gcc/testsuite/gcc.dg/vect/pr63530.c           |  5 ++-
 gcc/testsuite/gcc.dg/vect/pr68339.c           |  2 +-
 gcc/testsuite/gcc.dg/vect/pr71259.c           |  2 +-
 gcc/testsuite/gcc.dg/vect/vect-82_64.c        |  2 +-
 gcc/testsuite/gcc.dg/vect/vect-83_64.c        |  2 +-
 .../gcc.dg/vect/vect-debug-pr41926.c          |  3 +-
 .../gcc.dg/vect/vect-shift-2-big-array.c      |  2 +-
 gcc/testsuite/gcc.dg/vect/vect-shift-2.c      |  2 +-
 .../gfortran.dg/vect/fast-math-mgrid-resid.f  |  5 +--
 gcc/testsuite/gfortran.dg/vect/pr39318.f90    |  2 +-
 gcc/testsuite/gfortran.dg/vect/pr45714-a.f    |  2 +-
 gcc/testsuite/gfortran.dg/vect/pr45714-b.f    |  2 +-
 gcc/testsuite/gfortran.dg/vect/pr46213.f90    |  2 +-
 36 files changed, 79 insertions(+), 38 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6e813cf372c..24944bd7b66 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,42 @@
+2016-06-23  Uros Bizjak  <ubizjak@gmail.com>
+
+	* g++.dg/vect/pr33834_2.cc: Use dg-additional-options instead of
+	dg-options and remove default vector testsuite compile flags.
+	* g++.dg/vect/pr33860a.cc: Ditto.
+	* g++.dg/vect/pr45470-a.cc: Ditto.
+	* g++.dg/vect/pr45470-b.cc: Ditto.
+	* g++.dg/vect/pr60896.cc: Ditto.
+	* gcc.dg/vect/no-tree-pre-pr45241.c: Ditto.
+	* gcc.dg/vect/pr18308.c: Ditto.
+	* gcc.dg/vect/pr24049.c: Ditto.
+	* gcc.dg/vect/pr33373.c: Ditto.
+	* gcc.dg/vect/pr36228.c: Ditto.
+	* gcc.dg/vect/pr42395.c: Ditto.
+	* gcc.dg/vect/pr42604.c: Ditto.
+	* gcc.dg/vect/pr46663.c: Ditto.
+	* gcc.dg/vect/pr48765.c: Ditto.
+	* gcc.dg/vect/pr49093.c: Ditto.
+	* gcc.dg/vect/pr49352.c: Ditto.
+	* gcc.dg/vect/pr52298.c: Ditto.
+	* gcc.dg/vect/pr52870.c: Ditto.
+	* gcc.dg/vect/pr53185.c: Ditto.
+	* gcc.dg/vect/pr53773.c: Ditto.
+	* gcc.dg/vect/pr56695.c: Ditto.
+	* gcc.dg/vect/pr62171.c: Ditto.
+	* gcc.dg/vect/pr63530.c: Ditto.
+	* gcc.dg/vect/pr68339.c: Ditto.
+	* gcc.dg/vect/pr71259.c: Ditto.
+	* gcc.dg/vect/vect-82_64.c: Ditto.
+	* gcc.dg/vect/vect-83_64.c: Ditto.
+	* gcc.dg/vect/vect-debug-pr41926.c: Ditto.
+	* gcc.dg/vect/vect-shift-2-big-array.c: Ditto.
+	* gcc.dg/vect/vect-shift-2.c: Ditto.
+	* gfortran.dg/vect/fast-math-mgrid-resid.f: Ditto.
+	* gfortran.dg/vect/pr39318.f90: Ditto.
+	* gfortran.dg/vect/pr45714-a.f: Ditto.
+	* gfortran.dg/vect/pr45714-b.f: Ditto.
+	* gfortran.dg/vect/pr46213.f90: Ditto.
+
 2016-06-23  Michael Meissner  <meissner@linux.vnet.ibm.com>
 	    Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
diff --git a/gcc/testsuite/g++.dg/vect/pr33834_2.cc b/gcc/testsuite/g++.dg/vect/pr33834_2.cc
index ecaf5882060..b9714bbacf9 100644
--- a/gcc/testsuite/g++.dg/vect/pr33834_2.cc
+++ b/gcc/testsuite/g++.dg/vect/pr33834_2.cc
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -ftree-vectorize" } */
+/* { dg-additional-options "-O3" } */
 
 /* Testcase by Martin Michlmayr <tbm@cyrius.com> */
 
diff --git a/gcc/testsuite/g++.dg/vect/pr33860a.cc b/gcc/testsuite/g++.dg/vect/pr33860a.cc
index 0e5164fd667..bbfdeef9c54 100644
--- a/gcc/testsuite/g++.dg/vect/pr33860a.cc
+++ b/gcc/testsuite/g++.dg/vect/pr33860a.cc
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-Wno-psabi" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
+/* { dg-additional-options "-Wno-psabi" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */
 
 /* Testcase by Martin Michlmayr <tbm@cyrius.com> */
 
diff --git a/gcc/testsuite/g++.dg/vect/pr45470-a.cc b/gcc/testsuite/g++.dg/vect/pr45470-a.cc
index 98ce4ca47a8..f92e0debaa8 100644
--- a/gcc/testsuite/g++.dg/vect/pr45470-a.cc
+++ b/gcc/testsuite/g++.dg/vect/pr45470-a.cc
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O1 -ftree-vectorize -fnon-call-exceptions" } */
+/* { dg-additional-options "-O1 -fnon-call-exceptions" } */
 
 struct A
 {
diff --git a/gcc/testsuite/g++.dg/vect/pr45470-b.cc b/gcc/testsuite/g++.dg/vect/pr45470-b.cc
index 3ad66ec0d85..03e7c8ca6dc 100644
--- a/gcc/testsuite/g++.dg/vect/pr45470-b.cc
+++ b/gcc/testsuite/g++.dg/vect/pr45470-b.cc
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O1 -ftree-vectorize -fno-vect-cost-model -fnon-call-exceptions" } */
+/* { dg-additional-options "-O1 -fnon-call-exceptions" } */
 
 template < typename _Tp > struct new_allocator
 {
diff --git a/gcc/testsuite/g++.dg/vect/pr60896.cc b/gcc/testsuite/g++.dg/vect/pr60896.cc
index c6ce68b82a2..b4ff0d37b94 100644
--- a/gcc/testsuite/g++.dg/vect/pr60896.cc
+++ b/gcc/testsuite/g++.dg/vect/pr60896.cc
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3" } */
+/* { dg-additional-options "-O3" } */
 
 struct A
 {
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 54aa89b8e23..6535fd7e598 100644
--- a/gcc/testsuite/gcc.dg/vect/no-tree-pre-pr45241.c
+++ b/gcc/testsuite/gcc.dg/vect/no-tree-pre-pr45241.c
@@ -1,6 +1,5 @@
 /* PR tree-optimization/45241 */
 /* { dg-do compile } */
-/* { dg-options "-ftree-vectorize" } */
 
 int
 foo (short x)
diff --git a/gcc/testsuite/gcc.dg/vect/pr18308.c b/gcc/testsuite/gcc.dg/vect/pr18308.c
index b71f08ede2c..797ab99c8df 100644
--- a/gcc/testsuite/gcc.dg/vect/pr18308.c
+++ b/gcc/testsuite/gcc.dg/vect/pr18308.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -ftree-vectorize -funroll-loops" } */
+/* { dg-additional-options "-O -funroll-loops" } */
 void foo();
 
 void bar(int j)
diff --git a/gcc/testsuite/gcc.dg/vect/pr24049.c b/gcc/testsuite/gcc.dg/vect/pr24049.c
index a7798bd2bd1..9f822fb80e4 100644
--- a/gcc/testsuite/gcc.dg/vect/pr24049.c
+++ b/gcc/testsuite/gcc.dg/vect/pr24049.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O1 -ftree-vectorize --param ggc-min-heapsize=0 --param ggc-min-expand=0" } */
+/* { dg-additional-options "-O1 --param ggc-min-heapsize=0 --param ggc-min-expand=0" } */
 
 void unscrunch (unsigned char *, int *);
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr33373.c b/gcc/testsuite/gcc.dg/vect/pr33373.c
index efba2ab3190..1a10e457c51 100644
--- a/gcc/testsuite/gcc.dg/vect/pr33373.c
+++ b/gcc/testsuite/gcc.dg/vect/pr33373.c
@@ -1,5 +1,5 @@
-/* { dg-options "-Wno-shift-overflow" } */
 /* { dg-do compile } */
+/* { dg-additional-options "-Wno-shift-overflow" } */
 void DOSMEM_FillIsrTable(int*isr) {
     int i;
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr36228.c b/gcc/testsuite/gcc.dg/vect/pr36228.c
index 5f177394c13..92daa13a7e2 100644
--- a/gcc/testsuite/gcc.dg/vect/pr36228.c
+++ b/gcc/testsuite/gcc.dg/vect/pr36228.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O3" } */
 
 #define COLS         8
 #define ROWS         8
diff --git a/gcc/testsuite/gcc.dg/vect/pr42395.c b/gcc/testsuite/gcc.dg/vect/pr42395.c
index 7d0b8324f68..e724d6892cb 100644
--- a/gcc/testsuite/gcc.dg/vect/pr42395.c
+++ b/gcc/testsuite/gcc.dg/vect/pr42395.c
@@ -1,6 +1,6 @@
 /* PR debug/42395 */
 /* { dg-do compile } */
-/* { dg-options "-O3 -ftree-vectorize -g" } */
+/* { dg-additional-options "-O3 -g" } */
 
 void foo(int j, int *A)
 {
diff --git a/gcc/testsuite/gcc.dg/vect/pr42604.c b/gcc/testsuite/gcc.dg/vect/pr42604.c
index 4e05c234593..d19c646282a 100644
--- a/gcc/testsuite/gcc.dg/vect/pr42604.c
+++ b/gcc/testsuite/gcc.dg/vect/pr42604.c
@@ -1,6 +1,6 @@
 /* PR debug/42604 */
 /* { dg-do compile } */
-/* { dg-options "-O3 -ftree-vectorize -g -ffast-math" } */
+/* { dg-additional-options "-O3 -g -ffast-math" } */
 
 unsigned *d;
 unsigned short e;
diff --git a/gcc/testsuite/gcc.dg/vect/pr46663.c b/gcc/testsuite/gcc.dg/vect/pr46663.c
index 15f15a548bc..457ceae6a57 100644
--- a/gcc/testsuite/gcc.dg/vect/pr46663.c
+++ b/gcc/testsuite/gcc.dg/vect/pr46663.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -ftree-vectorize -fdump-tree-vect-details -fexceptions" } */
+/* { dg-additional-options "-O -fexceptions" } */
 
 typedef __attribute__ ((const)) int (*bart) (void);
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr48765.c b/gcc/testsuite/gcc.dg/vect/pr48765.c
index 978dc25ccce..ae364379d07 100644
--- a/gcc/testsuite/gcc.dg/vect/pr48765.c
+++ b/gcc/testsuite/gcc.dg/vect/pr48765.c
@@ -1,6 +1,6 @@
 /* { dg-do compile { target { powerpc*-*-* } } } */
 /* { dg-skip-if "do not override -mcpu" { *-*-* } { "-mcpu=*" } { "-mcpu=power6" } } */
-/* { dg-options "-O3 -mcpu=power6" } */
+/* { dg-additional-options "-O3 -mcpu=power6" } */
 
 enum reg_class
 {
diff --git a/gcc/testsuite/gcc.dg/vect/pr49093.c b/gcc/testsuite/gcc.dg/vect/pr49093.c
index 5a2950600fc..dd1d8cc0477 100644
--- a/gcc/testsuite/gcc.dg/vect/pr49093.c
+++ b/gcc/testsuite/gcc.dg/vect/pr49093.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O1 -ftree-vectorize -fdump-tree-vect-details -fno-tree-fre" } */
+/* { dg-additional-options "-O1 -fno-tree-fre" } */
 
 volatile unsigned char g_324[4] = {0, 1, 0, 1};
 void foo (int);
diff --git a/gcc/testsuite/gcc.dg/vect/pr49352.c b/gcc/testsuite/gcc.dg/vect/pr49352.c
index d8e0bae0462..82233b51945 100644
--- a/gcc/testsuite/gcc.dg/vect/pr49352.c
+++ b/gcc/testsuite/gcc.dg/vect/pr49352.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/49352 */
 /* { dg-do compile } */
-/* { dg-options "-O2 -ftree-vectorize -fcompare-debug" } */
+/* { dg-additional-options "-O2 -fcompare-debug" } */
 /* { dg-xfail-if "" { powerpc-ibm-aix* } { "*" } { "" } } */
 
 int
diff --git a/gcc/testsuite/gcc.dg/vect/pr52298.c b/gcc/testsuite/gcc.dg/vect/pr52298.c
index 453d7c8aa14..e1185e662b4 100644
--- a/gcc/testsuite/gcc.dg/vect/pr52298.c
+++ b/gcc/testsuite/gcc.dg/vect/pr52298.c
@@ -1,4 +1,6 @@
-/* { dg-options "-O1 -ftree-vectorize -fno-tree-pre -fno-tree-loop-im" } */
+/* { dg-additional-options "-O1 -fno-tree-pre -fno-tree-loop-im" } */
+
+#include "tree-vect.h"
 
 extern void abort (void);
 int c[80];
@@ -19,6 +21,7 @@ int
 main ()
 {
   int i;
+  check_vect ();
   for (i = 0; i < 60; i++)
     c[i] = 1;
   for (; i < 64; i++)
diff --git a/gcc/testsuite/gcc.dg/vect/pr52870.c b/gcc/testsuite/gcc.dg/vect/pr52870.c
index 7b185eef6bf..25df6749573 100644
--- a/gcc/testsuite/gcc.dg/vect/pr52870.c
+++ b/gcc/testsuite/gcc.dg/vect/pr52870.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O1 -ftree-vectorize" } */
+/* { dg-additional-options "-O1" } */
 
 void foo (unsigned long int);
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr53185.c b/gcc/testsuite/gcc.dg/vect/pr53185.c
index af1efba8d66..fc73b4d3a5b 100644
--- a/gcc/testsuite/gcc.dg/vect/pr53185.c
+++ b/gcc/testsuite/gcc.dg/vect/pr53185.c
@@ -1,5 +1,6 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -ftree-vectorize" } */
+/* { dg-additional-options "-O3" } */
+
 unsigned short a, e;
 int *b, *d;
 int c;
diff --git a/gcc/testsuite/gcc.dg/vect/pr53773.c b/gcc/testsuite/gcc.dg/vect/pr53773.c
index 2be76d700e6..1bee98b75d9 100644
--- a/gcc/testsuite/gcc.dg/vect/pr53773.c
+++ b/gcc/testsuite/gcc.dg/vect/pr53773.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fdump-tree-optimized" } */
+/* { dg-additional-options "-fdump-tree-optimized" } */
 
 int
 foo (int integral, int decimal, int power_ten)
diff --git a/gcc/testsuite/gcc.dg/vect/pr56695.c b/gcc/testsuite/gcc.dg/vect/pr56695.c
index ee3d829a41b..8307b91611b 100644
--- a/gcc/testsuite/gcc.dg/vect/pr56695.c
+++ b/gcc/testsuite/gcc.dg/vect/pr56695.c
@@ -1,6 +1,5 @@
 /* PR tree-optimization/56695 */
 /* { dg-do compile } */
-/* { dg-options "-O2 -ftree-vectorize" } */
 
 int a, b, i;
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr62171.c b/gcc/testsuite/gcc.dg/vect/pr62171.c
index 18517b3a740..dc96713d1ae 100644
--- a/gcc/testsuite/gcc.dg/vect/pr62171.c
+++ b/gcc/testsuite/gcc.dg/vect/pr62171.c
@@ -1,5 +1,4 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -ftree-vectorize -fdump-tree-vect-details" } */
 /* { dg-require-effective-target vect_double } */
 
 struct omp_data_i
diff --git a/gcc/testsuite/gcc.dg/vect/pr63530.c b/gcc/testsuite/gcc.dg/vect/pr63530.c
index b583b9b3550..2def834ff8e 100644
--- a/gcc/testsuite/gcc.dg/vect/pr63530.c
+++ b/gcc/testsuite/gcc.dg/vect/pr63530.c
@@ -1,10 +1,12 @@
-/* { dg-options "-O2 -ftree-vectorize -funroll-loops --param \"max-completely-peeled-insns=400\"" } */
+/* { dg-additional-options "-funroll-loops --param \"max-completely-peeled-insns=400\"" } */
 
 /* PR tree-optimization/63530 */
 /* On armv7 hardware, following options cause run time failure  */
 /*   -march=armv7-a -mfloat-abi=hard -mfpu=neon -marm -O2 -ftree-vectorize  */
 /*   -funroll-loops --param "max-completely-peeled-insns=400"  */
 
+#include "tree-vect.h"
+
 #include <stdlib.h>
 
 typedef struct {
@@ -26,5 +28,6 @@ int
 main()
 {
   AP p = foo(3);
+  check_vect ();
   return p->map[30] - p->map[20] - p->map[10];
 }
diff --git a/gcc/testsuite/gcc.dg/vect/pr68339.c b/gcc/testsuite/gcc.dg/vect/pr68339.c
index ab0eede62e7..28fa294ada6 100644
--- a/gcc/testsuite/gcc.dg/vect/pr68339.c
+++ b/gcc/testsuite/gcc.dg/vect/pr68339.c
@@ -1,6 +1,6 @@
 /* PR middle-end/68339 */
 /* { dg-do compile } */
-/* { dg-options "--param ggc-min-heapsize=0 --param ggc-min-expand=0 -fopenmp-simd" } */
+/* { dg-additional-options "--param ggc-min-heapsize=0 --param ggc-min-expand=0 -fopenmp-simd" } */
 
 #pragma omp declare simd notinbranch
 int
diff --git a/gcc/testsuite/gcc.dg/vect/pr71259.c b/gcc/testsuite/gcc.dg/vect/pr71259.c
index eefa2433225..89aacd946c5 100644
--- a/gcc/testsuite/gcc.dg/vect/pr71259.c
+++ b/gcc/testsuite/gcc.dg/vect/pr71259.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/71259 */
 /* { dg-do run } */
-/* { dg-options "-O3" } */
+/* { dg-additional-options "-O3" } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
 
 #include "tree-vect.h"
diff --git a/gcc/testsuite/gcc.dg/vect/vect-82_64.c b/gcc/testsuite/gcc.dg/vect/vect-82_64.c
index fc7434a31e4..8dc9d96f7ae 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-82_64.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-82_64.c
@@ -1,6 +1,6 @@
 /* { dg-do run { target { { powerpc*-*-* && lp64 } && powerpc_altivec_ok } } } */
 /* { dg-do compile { target { { powerpc*-*-* && ilp32 } && powerpc_altivec_ok } } } */
-/* { dg-options "-O2 -ftree-vectorize -mpowerpc64 -fdump-tree-vect-details -maltivec" } */
+/* { dg-additional-options "-mpowerpc64 -maltivec" } */
 /* { dg-skip-if "" { powerpc-ibm-aix* } { "*" } { "" } } */
 
 #include <stdarg.h>
diff --git a/gcc/testsuite/gcc.dg/vect/vect-83_64.c b/gcc/testsuite/gcc.dg/vect/vect-83_64.c
index 03f9f7bc3ab..fe985cb84bb 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-83_64.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-83_64.c
@@ -1,6 +1,6 @@
 /* { dg-do run { target { { powerpc*-*-* && lp64 } && powerpc_altivec_ok } } } */
 /* { dg-do compile { target { { powerpc*-*-* && ilp32 } && powerpc_altivec_ok } } } */
-/* { dg-options "-O2 -ftree-vectorize -mpowerpc64 -fdump-tree-vect-details -maltivec" } */
+/* { dg-additional-options "-mpowerpc64 -maltivec" } */
 /* { dg-skip-if "" { powerpc-ibm-aix* } { "*" } { "" } } */
 
 #include <stdarg.h>
diff --git a/gcc/testsuite/gcc.dg/vect/vect-debug-pr41926.c b/gcc/testsuite/gcc.dg/vect/vect-debug-pr41926.c
index a2d36d3b083..b3c553bc2d5 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-debug-pr41926.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-debug-pr41926.c
@@ -1,7 +1,6 @@
 /* PR debug/41926 */
 /* { dg-do compile } */
-/* { dg-options "-O2 -g -ffast-math -funroll-loops -ftree-vectorize -msse2" { target { i?86-*-* x86_64-*-* } } } */
-/* { dg-require-effective-target sse2 { target { i?86-*-* x86_64-*-* } } } */
+/* { dg-additional-options "-g -ffast-math -funroll-loops" } */
 
 void
 foo (double (*__restrict p)[4], double (*__restrict q)[4],
diff --git a/gcc/testsuite/gcc.dg/vect/vect-shift-2-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-shift-2-big-array.c
index 85ff0e041f6..682b319d22d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-shift-2-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-shift-2-big-array.c
@@ -1,4 +1,4 @@
-/* { dg-options "-Wno-shift-overflow" } */
+/* { dg-additional-options "-Wno-shift-overflow" } */
 /* { dg-require-effective-target vect_shift } */
 /* { dg-require-effective-target vect_int } */
 /* Check the standard integer types for left and right shifts to see if the
diff --git a/gcc/testsuite/gcc.dg/vect/vect-shift-2.c b/gcc/testsuite/gcc.dg/vect/vect-shift-2.c
index 6199cd61514..ba8e7c1f7a0 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-shift-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-shift-2.c
@@ -1,4 +1,4 @@
-/* { dg-options "-Wno-shift-overflow" } */
+/* { dg-additional-options "-Wno-shift-overflow" } */
 /* { dg-require-effective-target vect_shift } */
 /* { dg-require-effective-target vect_int } */
 /* Check the standard integer types for left and right shifts to see if the
diff --git a/gcc/testsuite/gfortran.dg/vect/fast-math-mgrid-resid.f b/gcc/testsuite/gfortran.dg/vect/fast-math-mgrid-resid.f
index 09fc24c93b6..fcf475d3bbc 100644
--- a/gcc/testsuite/gfortran.dg/vect/fast-math-mgrid-resid.f
+++ b/gcc/testsuite/gfortran.dg/vect/fast-math-mgrid-resid.f
@@ -1,7 +1,6 @@
-! { dg-do compile { target i?86-*-* x86_64-*-* } }
+! { dg-do compile }
 ! { dg-require-effective-target vect_double }
-! { dg-require-effective-target sse2 }
-! { dg-options "-O3 -ffast-math -msse2 -fpredictive-commoning -ftree-vectorize -fdump-tree-pcom-details" }
+! { dg-options "-O3 -fpredictive-commoning -fdump-tree-pcom-details" }
 
 
 ******* RESID COMPUTES THE RESIDUAL:  R = V - AU
diff --git a/gcc/testsuite/gfortran.dg/vect/pr39318.f90 b/gcc/testsuite/gfortran.dg/vect/pr39318.f90
index 245306c2a74..d4638a4e481 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr39318.f90
+++ b/gcc/testsuite/gfortran.dg/vect/pr39318.f90
@@ -1,5 +1,5 @@
 ! { dg-do compile { target fopenmp } } 
-! { dg-options "-c -fopenmp -fexceptions -O2 -ftree-vectorize" } 
+! { dg-additional-options "-fopenmp -fexceptions" } 
 
       subroutine adw_trajsp (F_u,i0,in,j0,jn)
       implicit none
diff --git a/gcc/testsuite/gfortran.dg/vect/pr45714-a.f b/gcc/testsuite/gfortran.dg/vect/pr45714-a.f
index 58ec2291956..5eb3eba6ed8 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr45714-a.f
+++ b/gcc/testsuite/gfortran.dg/vect/pr45714-a.f
@@ -1,5 +1,5 @@
 ! { dg-do compile { target i?86-*-* x86_64-*-* } }
-! { dg-options "-O3 -march=core2 -mavx -ffast-math -mveclibabi=svml" }
+! { dg-additional-options "-O3 -march=core2 -mavx -ffast-math -mveclibabi=svml" }
 
       integer index(18),i,j,k,l,ipiv(18),info,ichange,neq,lda,ldb,
      &  nrhs,iplas
diff --git a/gcc/testsuite/gfortran.dg/vect/pr45714-b.f b/gcc/testsuite/gfortran.dg/vect/pr45714-b.f
index b042707b2dd..0d00c6fd666 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr45714-b.f
+++ b/gcc/testsuite/gfortran.dg/vect/pr45714-b.f
@@ -1,5 +1,5 @@
 ! { dg-do compile { target powerpc*-*-* } }
-! { dg-options "-O3 -mcpu=power7 -ffast-math -mveclibabi=mass" }
+! { dg-additional-options "-O3 -mcpu=power7 -ffast-math -mveclibabi=mass" }
 
       integer index(18),i,j,k,l,ipiv(18),info,ichange,neq,lda,ldb,
      &  nrhs,iplas
diff --git a/gcc/testsuite/gfortran.dg/vect/pr46213.f90 b/gcc/testsuite/gfortran.dg/vect/pr46213.f90
index 73f0a7870bf..cfe33a7c0fd 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr46213.f90
+++ b/gcc/testsuite/gfortran.dg/vect/pr46213.f90
@@ -1,5 +1,5 @@
 ! { dg-do compile }
-! { dg-options "-O -fno-tree-loop-ivcanon -ftree-vectorize -fno-tree-ccp -fno-tree-ch -finline-small-functions" }
+! { dg-additional-options "-O -fno-tree-loop-ivcanon -fno-tree-ccp -fno-tree-ch -finline-small-functions" }
 
 module foo
   INTEGER, PARAMETER :: ONE = 1
-- 
2.30.2