[testsuite] Fixup dg-options in {gcc,g++,gfortran}.dg/vect.exp tests

Testsuites driven by vect.exp rely on check_vect_support_and_set_flags
to set appropriate DEFAULT_VECTFLAGS for a given target (e.g., add
-mfpu=neon for arm-linux-gnueabi).  Unfortunately, these flags are
overwritten by dg-options directive, which can cause tests to fail.

Behavior of dg-options is documented in vect.exp files, but not
all developers look at the .exp file when adding a new testcase.
This caused a few dg-options directives to be used instead of
the more appropriate dg-additional-options.

This patch changes target-independent dg-options into
dg-additional-options.  This patch does not touch target-specific
dg-options and target-specific tests to avoid disturbing the gentle
balance of target-specific vectorization.

This patch also removes a couple of unneeded "dg-do run" directives
to avoid failures on compile-only targets.  Default action is, again,
set by check_vect_support_and_set_flags.

Lastly, I avoided renaming tests that use -O<n> options to O<n>-*
filename format because this support is not consistent between
gcc.dg/vect/, g++.dg/vect/, and gfortran.dg/vect/ testsuites.
It seems dg-additional-options is cleaner.

This patch does the following,
1. do not change target-specific tests, e.g., gcc.dg/vect/costmodel/riscv/*;
2. do not change { dg-options FOO { target { target-*-pattern } } };
3. do not remove { dg-do run { target { target-*-pattern } } };
4. change { dg-options FOO } to { dg-additional-options FOO };
5. remove { dg-do run } in several tests, where it is clearly not needed.

gcc/testsuite/ChangeLog:

	PR testsuite/114307
	* gcc.dg/vect/vect-cond-reduc-in-order-2-signed-zero.c: Remove dg-run.
	* gcc.dg/vect/complex/complex-operations-run.c: Likewise.
	* gcc.dg/vect/pr113576.c: Remove dg-run.  Use dg-additional-options for
	test-specific flags.
	* gcc.dg/vect/gimplefe-40.c: Use dg-additional-options for
	test-specific flags.
	* gcc.dg/vect/gimplefe-41.c: Likewise.
	* gcc.dg/vect/pr101145inf.c: Likewise.
	* gcc.dg/vect/pr101145inf_1.c: Likewise.
	* gcc.dg/vect/pr108316.c: Likewise.
	* gcc.dg/vect/pr109011-1.c: Likewise.
	* gcc.dg/vect/pr109011-2.c: Likewise.
	* gcc.dg/vect/pr109011-3.c: Likewise.
	* gcc.dg/vect/pr109011-4.c: Likewise.
	* gcc.dg/vect/pr109011-5.c: Likewise.
	* gcc.dg/vect/pr111846.c: Likewise.
	* gcc.dg/vect/pr111860-2.c: Likewise.
	* gcc.dg/vect/pr111860-3.c: Likewise.
	* gcc.dg/vect/pr113002.c: Likewise.
	* gcc.dg/vect/pr84711.c: Likewise.
	* gcc.dg/vect/pr85597.c: Likewise.
	* gcc.dg/vect/pr88497-1.c: Likewise.
	* gcc.dg/vect/pr88497-2.c: Likewise.
	* gcc.dg/vect/pr88497-3.c: Likewise.
	* gcc.dg/vect/pr88497-4.c: Likewise.
	* gcc.dg/vect/pr88497-5.c: Likewise.
	* gcc.dg/vect/pr88497-7.c: Likewise.
	* gcc.dg/vect/pr92347.c: Likewise.
	* gcc.dg/vect/pr93069.c: Likewise.
	* gcc.dg/vect/pr97241.c: Likewise.
	* gcc.dg/vect/pr99102.c: Likewise.
	* gcc.dg/vect/vect-early-break_65.c: Likewise.
	* gcc.dg/vect/vect-fold-1.c: Likewise.
	* gcc.dg/vect/vect-ifcvt-19.c: Likewise.
	* gcc.dg/vect/vect-ifcvt-20.c: Likewise.
	* gcc.dg/vect/vect-reduc-epilogue-gaps.c: Likewise.
	* gcc.dg/vect/vect-singleton_1.c: Likewise.
	* g++.dg/vect/pr84556.cc: Likewise.
	* gfortran.dg/vect/fast-math-mgrid-resid.f: Likewise.
	* gfortran.dg/vect/pr77848.f: Likewise.
	* gfortran.dg/vect/pr90913.f90: Likewise.

diff --git a/gcc/testsuite/g++.dg/vect/pr84556.cc b/gcc/testsuite/g++.dg/vect/pr84556.cc
index e2c97e917bed3e7c5e709f61384d75588f522308..6b1c9cec515ab91c07d4e9e7067149680b9c21bd 100644 (file)
--- a/gcc/testsuite/g++.dg/vect/pr84556.cc
+++ b/gcc/testsuite/g++.dg/vect/pr84556.cc
@@ -1,6 +1,6 @@
 // PR c++/84556
 // { dg-do run { target c++11 } }
-// { dg-options "-O2 -fopenmp-simd" }
+// { dg-additional-options "-O2 -fopenmp-simd" }
 // { dg-additional-options "-mavx" { target avx_runtime } }
 
 int

diff --git a/gcc/testsuite/gcc.dg/vect/complex/complex-operations-run.c b/gcc/testsuite/gcc.dg/vect/complex/complex-operations-run.c
index 14ac512a8efa4d9af8cd274d995a8e642ac9f10f..5a68ff02951469a73b7e6f4bb88ddf2989a2e64a 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/complex/complex-operations-run.c
+++ b/gcc/testsuite/gcc.dg/vect/complex/complex-operations-run.c
@@ -1,4 +1,3 @@
-/* { dg-do run } */
 /* { dg-require-effective-target vect_complex_add_double } */
 /* { dg-add-options arm_v8_3a_complex_neon } */
 /* { dg-add-options arm_v8_3a_complex_neon } */

diff --git a/gcc/testsuite/gcc.dg/vect/gimplefe-40.c b/gcc/testsuite/gcc.dg/vect/gimplefe-40.c
index 3c5bb4cf6e5161d06cda2042c96f9243aa54c78e..4e37a7980fc9422f4ede69060f84a671326cfe7c 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/gimplefe-40.c
+++ b/gcc/testsuite/gcc.dg/vect/gimplefe-40.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target { int128 && vect_float } } } */
-/* { dg-options "-fgimple -Wno-psabi -w" } */
+/* { dg-additional-options "-fgimple -Wno-psabi -w" } */
 /* { dg-additional-options "-maltivec" { target { powerpc*-*-* && powerpc_altivec_ok } } } */
 
 typedef float v4sf __attribute__((vector_size(16)));

diff --git a/gcc/testsuite/gcc.dg/vect/gimplefe-41.c b/gcc/testsuite/gcc.dg/vect/gimplefe-41.c
index e52a3a559a99dcebba4f8f850df931f78917b1e1..650bb2b5bd5e96f7ec92b6f8e0028caa402882cd 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/gimplefe-41.c
+++ b/gcc/testsuite/gcc.dg/vect/gimplefe-41.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target { vect_double && vect_long_long } } } */
-/* { dg-options "-fgimple -Wno-psabi -w" } */
+/* { dg-additional-options "-fgimple -Wno-psabi -w" } */
 /* { dg-additional-options "-msse2" { target x86_64-*-* i?86-*-* } } */
 
 typedef double __v2df __attribute__ ((__vector_size__ (16)));

diff --git a/gcc/testsuite/gcc.dg/vect/pr101145inf.c b/gcc/testsuite/gcc.dg/vect/pr101145inf.c
index ed49f5670b5b2634101aaaa895cee27c8451bbae..3ad8c1a2dd7b0e061ce2becc32925b574bfab292 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr101145inf.c
+++ b/gcc/testsuite/gcc.dg/vect/pr101145inf.c
@@ -1,5 +1,5 @@
 /* { dg-do run { target *-*-linux* *-*-gnu* *-*-uclinux* } } */
-/* { dg-options "-O3" } */
+/* { dg-additional-options "-O3" } */
 #include <limits.h>
 #include "pr101145inf.inc"
 

diff --git a/gcc/testsuite/gcc.dg/vect/pr101145inf_1.c b/gcc/testsuite/gcc.dg/vect/pr101145inf_1.c
index 4ee3e31c7fe96fd56dba8024fe295e823424c2fa..e3e9dd46d10a0ca0c3a02e75590c93a2ee63b320 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr101145inf_1.c
+++ b/gcc/testsuite/gcc.dg/vect/pr101145inf_1.c
@@ -1,5 +1,5 @@
 /* { dg-do run { target *-*-linux* *-*-gnu* *-*-uclinux* } } */
-/* { dg-options "-O3" } */
+/* { dg-additional-options "-O3" } */
 #include <limits.h>
 #include "pr101145inf.inc"
 

diff --git a/gcc/testsuite/gcc.dg/vect/pr108316.c b/gcc/testsuite/gcc.dg/vect/pr108316.c
index 540b7f2aed46a138aacc9d1629ab055dd36b2559..6888ae50d9e7924b7af4a711be74c4215bbfbfd9 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr108316.c
+++ b/gcc/testsuite/gcc.dg/vect/pr108316.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3" } */
+/* { dg-additional-options "-O3" } */
 
 extern _Bool a[];
 

diff --git a/gcc/testsuite/gcc.dg/vect/pr109011-1.c b/gcc/testsuite/gcc.dg/vect/pr109011-1.c
index 98362d6bc407871ab9b0ca57731d28c0c2eb8243..28f1288648b1e23e6995e584d7f485fe248d1227 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr109011-1.c
+++ b/gcc/testsuite/gcc.dg/vect/pr109011-1.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/109011 */
 /* { dg-do compile } */
-/* { dg-options "-O3 -fno-unroll-loops --param=vect-epilogues-nomask=0 -fdump-tree-optimized" } */
+/* { dg-additional-options "-O3 -fno-unroll-loops --param=vect-epilogues-nomask=0 -fdump-tree-optimized" } */
 /* { dg-additional-options "-mavx512cd" { target { { i?86-*-* x86_64-*-* } && avx512cd } } } */
 /* { dg-additional-options "-mavx512vpopcntdq" { target { { i?86-*-* x86_64-*-* } && avx512vpopcntdq } } } */
 /* { dg-additional-options "-mvsx" { target { powerpc_vsx_ok && has_arch_pwr8 } } } */

diff --git a/gcc/testsuite/gcc.dg/vect/pr109011-2.c b/gcc/testsuite/gcc.dg/vect/pr109011-2.c
index a737e3fa03ae6be6e5fbff4735f334c4b91b7fbc..0219019edf18e5b9fd245bb1b883bd44130ac668 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr109011-2.c
+++ b/gcc/testsuite/gcc.dg/vect/pr109011-2.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/109011 */
 /* { dg-do compile } */
-/* { dg-options "-O3 -fno-unroll-loops --param=vect-epilogues-nomask=0 -fdump-tree-optimized" } */
+/* { dg-additional-options "-O3 -fno-unroll-loops --param=vect-epilogues-nomask=0 -fdump-tree-optimized" } */
 /* { dg-additional-options "-mavx512cd -mbmi -mlzcnt -mno-avx512vpopcntdq" { target { { { { i?86-*-* x86_64-*-* } && avx512cd } && lzcnt } && bmi } } } */
 /* { dg-additional-options "-mvsx" { target { powerpc_vsx_ok && has_arch_pwr9 } } } */
 /* { dg-additional-options "-mdejagnu-cpu=power9 -mvsx" { target { powerpc_vsx_ok && { ! has_arch_pwr9 } } } } */

diff --git a/gcc/testsuite/gcc.dg/vect/pr109011-3.c b/gcc/testsuite/gcc.dg/vect/pr109011-3.c
index 21c364dfdfd9a8d151b56c9ae17a841e9b9b8943..eda0d3aa978bdb5391cf9bd4be87cb286594dfe6 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr109011-3.c
+++ b/gcc/testsuite/gcc.dg/vect/pr109011-3.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/109011 */
 /* { dg-do compile } */
-/* { dg-options "-O3 -fno-unroll-loops --param=vect-epilogues-nomask=0 -fdump-tree-optimized" } */
+/* { dg-additional-options "-O3 -fno-unroll-loops --param=vect-epilogues-nomask=0 -fdump-tree-optimized" } */
 /* { dg-additional-options "-mno-avx512cd -mbmi -mlzcnt -mavx512vpopcntdq" { target { { { { i?86-*-* x86_64-*-* } && avx512vpopcntdq } && lzcnt } && bmi } } } */
 /* { dg-additional-options "-mdejagnu-cpu=power8 -mvsx" { target powerpc_vsx_ok } } */
 

diff --git a/gcc/testsuite/gcc.dg/vect/pr109011-4.c b/gcc/testsuite/gcc.dg/vect/pr109011-4.c
index 76af78842248de16f6787da584def5b415dc4f91..da7810d62b5a0d74d69923bf542f6b4c9513cdb9 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr109011-4.c
+++ b/gcc/testsuite/gcc.dg/vect/pr109011-4.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/109011 */
 /* { dg-do compile } */
-/* { dg-options "-O3 -fno-unroll-loops --param=vect-epilogues-nomask=0 -fdump-tree-optimized" } */
+/* { dg-additional-options "-O3 -fno-unroll-loops --param=vect-epilogues-nomask=0 -fdump-tree-optimized" } */
 /* { dg-additional-options "-mavx512cd -mbmi -mlzcnt -mno-avx512vpopcntdq" { target { { { { i?86-*-* x86_64-*-* } && avx512cd } && lzcnt } && bmi } } } */
 /* { dg-additional-options "-mvsx" { target { powerpc_vsx_ok && has_arch_pwr9 } } } */
 /* { dg-additional-options "-mdejagnu-cpu=power9 -mvsx" { target { powerpc_vsx_ok && { ! has_arch_pwr9 } } } } */

diff --git a/gcc/testsuite/gcc.dg/vect/pr109011-5.c b/gcc/testsuite/gcc.dg/vect/pr109011-5.c
index 19dbfb3356a64d9eea0ba1c5164e0e3fbef46734..f2119aebcfd41c2e544be57563e78b1b8843b0f8 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr109011-5.c
+++ b/gcc/testsuite/gcc.dg/vect/pr109011-5.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/109011 */
 /* { dg-do compile } */
-/* { dg-options "-O3 -fno-unroll-loops --param=vect-epilogues-nomask=0 -fdump-tree-optimized" } */
+/* { dg-additional-options "-O3 -fno-unroll-loops --param=vect-epilogues-nomask=0 -fdump-tree-optimized" } */
 /* { dg-additional-options "-mno-avx512cd -mbmi -mlzcnt -mavx512vpopcntdq" { target { { { { i?86-*-* x86_64-*-* } && avx512vpopcntdq } && lzcnt } && bmi } } } */
 /* { dg-additional-options "-mdejagnu-cpu=power8 -mvsx" { target powerpc_vsx_ok } } */
 

diff --git a/gcc/testsuite/gcc.dg/vect/pr111846.c b/gcc/testsuite/gcc.dg/vect/pr111846.c
index d283882f2614c4ca98623637576296bba5e33e51..c4d1da6d22b72544dcbc8ffba66cbbd5adac72d7 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr111846.c
+++ b/gcc/testsuite/gcc.dg/vect/pr111846.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -ffast-math" } */
+/* { dg-additional-options "-O3 -ffast-math" } */
 /* { dg-additional-options "-mavx2" { target { x86_64-*-* i?86-*-* } } } */
 
 extern __attribute__((__simd__)) float powf(float, float);

diff --git a/gcc/testsuite/gcc.dg/vect/pr111860-2.c b/gcc/testsuite/gcc.dg/vect/pr111860-2.c
index 07f64ffb5318c9d7817d46802d123cc9a2d65ec9..e205d2c3c9feafcce7025d5480033ce506357082 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr111860-2.c
+++ b/gcc/testsuite/gcc.dg/vect/pr111860-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -fno-tree-sink -ftree-vectorize" } */
+/* { dg-additional-options "-O -fno-tree-sink -ftree-vectorize" } */
 int buffer_ctrl_ctx_0, buffer_ctrl_p1, buffer_ctrl_cmd;
 
 int

diff --git a/gcc/testsuite/gcc.dg/vect/pr111860-3.c b/gcc/testsuite/gcc.dg/vect/pr111860-3.c
index 07f64ffb5318c9d7817d46802d123cc9a2d65ec9..e205d2c3c9feafcce7025d5480033ce506357082 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr111860-3.c
+++ b/gcc/testsuite/gcc.dg/vect/pr111860-3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -fno-tree-sink -ftree-vectorize" } */
+/* { dg-additional-options "-O -fno-tree-sink -ftree-vectorize" } */
 int buffer_ctrl_ctx_0, buffer_ctrl_p1, buffer_ctrl_cmd;
 
 int

diff --git a/gcc/testsuite/gcc.dg/vect/pr113002.c b/gcc/testsuite/gcc.dg/vect/pr113002.c
index 186710f64b4223a1f4a7e1407bcf0150b97bc541..ad6e5835985eb5b6887f642583adbc85f1f172a9 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr113002.c
+++ b/gcc/testsuite/gcc.dg/vect/pr113002.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target int128 } */
-/* { dg-options "-finline-stringops -Os" } */
+/* { dg-additional-options "-finline-stringops -Os" } */
 
 typedef __int128 v64u128 __attribute__((vector_size(64)));
 int c;

diff --git a/gcc/testsuite/gcc.dg/vect/pr113576.c b/gcc/testsuite/gcc.dg/vect/pr113576.c
index b6edde6f8e2ce139354388c66c1f94ac34f657c2..ba171b7c1f2ca2700e6756c680ed5cdfad62a333 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr113576.c
+++ b/gcc/testsuite/gcc.dg/vect/pr113576.c
@@ -1,5 +1,4 @@
-/* { dg-do run } */
-/* { dg-options "-O3" } */
+/* { dg-additional-options "-O3" } */
 /* { dg-additional-options "-march=skylake-avx512" { target avx512f } } */
 
 #include "tree-vect.h"

diff --git a/gcc/testsuite/gcc.dg/vect/pr84711.c b/gcc/testsuite/gcc.dg/vect/pr84711.c
index 12e9f60114a55d9f3fa39d5b6d09c06d17664136..350f9010be7a4647c3107bc28b1d29f2f9d92456 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr84711.c
+++ b/gcc/testsuite/gcc.dg/vect/pr84711.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target vect_int } */
-/* { dg-options "-O2 -Wno-psabi" } */
+/* { dg-additional-options "-O2 -Wno-psabi" } */
 /* { dg-additional-options "-msse" { target i?86-*-* x86_64-*-* } } */
 
 typedef int v4si

diff --git a/gcc/testsuite/gcc.dg/vect/pr85597.c b/gcc/testsuite/gcc.dg/vect/pr85597.c
index cf615f9c4645244c51e2194e6a5483e6d43139ef..71cc3615d636f3786c9e35c7dbbda2c9dad7cbeb 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr85597.c
+++ b/gcc/testsuite/gcc.dg/vect/pr85597.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3" } */
+/* { dg-additional-options "-O3" } */
 /* { dg-additional-options "-mfma" { target { x86_64-*-* i?86-*-* } } } */
 
 extern double fma (double, double, double);

diff --git a/gcc/testsuite/gcc.dg/vect/pr88497-1.c b/gcc/testsuite/gcc.dg/vect/pr88497-1.c
index 885ec7094282195b884adf8cc630bd64de62a45e..8f9a14af1d347a45bc5031fee54025054ddb62fd 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr88497-1.c
+++ b/gcc/testsuite/gcc.dg/vect/pr88497-1.c
@@ -1,7 +1,7 @@
 /* { dg-require-effective-target vect_double } */
 /* { dg-require-effective-target vsx_hw { target { powerpc*-*-* } } } */
 /* { dg-require-effective-target sse2_runtime { target { i?86-*-* x86_64-*-* } } } */
-/* { dg-options "-O2 -ffast-math -fdump-tree-reassoc1" } */
+/* { dg-additional-options "-O2 -ffast-math -fdump-tree-reassoc1" } */
 /* { dg-additional-options "-mvsx" { target { powerpc*-*-* } } } */
 /* { dg-additional-options "-msse2" { target { i?86-*-* x86_64-*-* } } } */
 

diff --git a/gcc/testsuite/gcc.dg/vect/pr88497-2.c b/gcc/testsuite/gcc.dg/vect/pr88497-2.c
index 8da5920903c5adb47e449cbbf78c22bfed309cf8..34528ce9aa407ed79add2b6b2e726574d14619a4 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr88497-2.c
+++ b/gcc/testsuite/gcc.dg/vect/pr88497-2.c
@@ -2,7 +2,7 @@
 /* { dg-require-effective-target vect_float } */
 /* { dg-require-effective-target powerpc_altivec_ok { target { powerpc*-*-* } } } */
 /* { dg-require-effective-target sse2 { target { i?86-*-* x86_64-*-* } } } */
-/* { dg-options "-O2 -ffast-math -fdump-tree-reassoc1" } */
+/* { dg-additional-options "-O2 -ffast-math -fdump-tree-reassoc1" } */
 /* { dg-additional-options "-maltivec" { target { powerpc*-*-* } } } */
 /* { dg-additional-options "-msse2" { target { i?86-*-* x86_64-*-* } } } */
 

diff --git a/gcc/testsuite/gcc.dg/vect/pr88497-3.c b/gcc/testsuite/gcc.dg/vect/pr88497-3.c
index 449f282e85cdf6d7139c9ee4b796c552380c653c..1489dbcc59abf4255ed992a180c29100ce46fb29 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr88497-3.c
+++ b/gcc/testsuite/gcc.dg/vect/pr88497-3.c
@@ -2,7 +2,7 @@
 /* { dg-require-effective-target vect_int } */
 /* { dg-require-effective-target powerpc_altivec_ok { target { powerpc*-*-* } } } */
 /* { dg-require-effective-target sse2 { target { i?86-*-* x86_64-*-* } } } */
-/* { dg-options "-O2 -ffast-math -fdump-tree-reassoc1" } */
+/* { dg-additional-options "-O2 -ffast-math -fdump-tree-reassoc1" } */
 /* { dg-additional-options "-maltivec" { target { powerpc*-*-* } } } */
 /* { dg-additional-options "-msse2" { target { i?86-*-* x86_64-*-* } } } */
 

diff --git a/gcc/testsuite/gcc.dg/vect/pr88497-4.c b/gcc/testsuite/gcc.dg/vect/pr88497-4.c
index f7b6c91c911d00d712f161a217c04ba8eebb4822..e7b20509cbbfc355817818872219df7097f97965 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr88497-4.c
+++ b/gcc/testsuite/gcc.dg/vect/pr88497-4.c
@@ -2,7 +2,7 @@
 /* { dg-require-effective-target vect_int } */
 /* { dg-require-effective-target powerpc_altivec_ok { target { powerpc*-*-* } } } */
 /* { dg-require-effective-target sse2 { target { i?86-*-* x86_64-*-* } } } */
-/* { dg-options "-O2 -ffast-math -fdump-tree-reassoc1" } */
+/* { dg-additional-options "-O2 -ffast-math -fdump-tree-reassoc1" } */
 /* { dg-additional-options "-maltivec" { target { powerpc*-*-* } } } */
 /* { dg-additional-options "-msse2" { target { i?86-*-* x86_64-*-* } } } */
 

diff --git a/gcc/testsuite/gcc.dg/vect/pr88497-5.c b/gcc/testsuite/gcc.dg/vect/pr88497-5.c
index cbd12241c7600c03685ce4c1c4ae7192f8047690..c3e34c2296269c9d7962988f2fa1e1331b519f6d 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr88497-5.c
+++ b/gcc/testsuite/gcc.dg/vect/pr88497-5.c
@@ -2,7 +2,7 @@
 /* { dg-require-effective-target vect_int } */
 /* { dg-require-effective-target powerpc_altivec_ok { target { powerpc*-*-* } } } */
 /* { dg-require-effective-target sse2 { target { i?86-*-* x86_64-*-* } } } */
-/* { dg-options "-O2 -ffast-math -fdump-tree-reassoc1" } */
+/* { dg-additional-options "-O2 -ffast-math -fdump-tree-reassoc1" } */
 /* { dg-additional-options "-maltivec" { target { powerpc*-*-* } } } */
 /* { dg-additional-options "-msse2" { target { i?86-*-* x86_64-*-* } } } */
 

diff --git a/gcc/testsuite/gcc.dg/vect/pr88497-7.c b/gcc/testsuite/gcc.dg/vect/pr88497-7.c
index d20ed71284e2b635518cb0cd20d0d078c6ebafed..e94907b3426567cf9a14114135fdc57d8d644cff 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr88497-7.c
+++ b/gcc/testsuite/gcc.dg/vect/pr88497-7.c
@@ -1,5 +1,5 @@
 /* { dg-require-effective-target avx512f_runtime } */
-/* { dg-options "-O2 -mavx512f -ffast-math -fdump-tree-reassoc1" } */
+/* { dg-additional-options "-O2 -mavx512f -ffast-math -fdump-tree-reassoc1" } */
 
 /* To test reassoc can undistribute vector bit_field_ref on multiple
    vector machine modes, bypass those modes with only one candidate.

diff --git a/gcc/testsuite/gcc.dg/vect/pr92347.c b/gcc/testsuite/gcc.dg/vect/pr92347.c
index f75b2596a2608cbe9e45113de42846673b386d8e..13d16551b5ceb68328d3a771f1c7175fd7be4a88 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr92347.c
+++ b/gcc/testsuite/gcc.dg/vect/pr92347.c
@@ -1,6 +1,6 @@
 /* Copied from PR 92347.  */
 /* { dg-do compile } */
-/* { dg-options "-O1 -fopenmp-simd" } */
+/* { dg-additional-options "-O1 -fopenmp-simd" } */
 /* { dg-additional-options "-mavx" { target { i?86-*-* x86_64-*-* } } } */
 
 int by;

diff --git a/gcc/testsuite/gcc.dg/vect/pr93069.c b/gcc/testsuite/gcc.dg/vect/pr93069.c
index 45c740dbe9e7bc0c6c626f7b5f870e81738f2b0b..a46fa437aa94f493eabb08a20dc2d80f9f2a7b86 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr93069.c
+++ b/gcc/testsuite/gcc.dg/vect/pr93069.c
@@ -1,6 +1,6 @@
 /* PR target/93069 */
 /* { dg-do assemble { target vect_simd_clones } } */
-/* { dg-options "-O2 -fopenmp-simd" } */
+/* { dg-additional-options "-O2 -fopenmp-simd" } */
 
 #pragma omp declare simd
 int

diff --git a/gcc/testsuite/gcc.dg/vect/pr97241.c b/gcc/testsuite/gcc.dg/vect/pr97241.c
index d4be8f6094006c359fb1b696fb56a9bd08616546..f9b3d6d8337c87d409dd39380d03bd0bb4252bcd 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr97241.c
+++ b/gcc/testsuite/gcc.dg/vect/pr97241.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 --param max-loop-header-insns=2" } */
+/* { dg-additional-options "-O3 --param max-loop-header-insns=2" } */
 
 short int *ev;
 int l4;

diff --git a/gcc/testsuite/gcc.dg/vect/pr99102.c b/gcc/testsuite/gcc.dg/vect/pr99102.c
index 0d030d15c86d86353ca8d524ce689d3c850a3ec7..071741f5e48a5220a9805dc78b24cd1dc545de2b 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/pr99102.c
+++ b/gcc/testsuite/gcc.dg/vect/pr99102.c
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -ftree-vectorize -fno-vect-cost-model -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -ftree-vectorize -fno-vect-cost-model -fdump-tree-vect-details" } */
 /* { dg-additional-options "-msve-vector-bits=256" { target aarch64_sve256_hw } } */
 long a[44];
 short d, e = -7;

diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-in-order-2-signed-zero.c b/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-in-order-2-signed-zero.c
index 7b46e7d8a2a605480b9617c0851010b30c7ad57f..155ce477103e00b99943de1ac052ca1f5c388b80 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-in-order-2-signed-zero.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-in-order-2-signed-zero.c
@@ -1,5 +1,4 @@
 /* Make sure a -0 stays -0 when we perform a conditional reduction.  */
-/* { dg-do run } */
 /* { dg-require-effective-target vect_double } */
 /* { dg-add-options ieee } */
 /* { dg-additional-options "-std=gnu99 -fno-fast-math" } */

diff --git a/gcc/testsuite/gcc.dg/vect/vect-early-break_65.c b/gcc/testsuite/gcc.dg/vect/vect-early-break_65.c
index 23a8341b529d8edef38b12f110a9ae7ce51edf09..fa87999dcd4ce1002cccaf08373d24716f531bcb 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/vect-early-break_65.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-early-break_65.c
@@ -2,7 +2,7 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target vect_early_break } */
 /* { dg-require-effective-target vect_int } */
-/* { dg-options "-Ofast -fno-vect-cost-model -fdump-tree-vect-details" } */
+/* { dg-additional-options "-Ofast -fno-vect-cost-model -fdump-tree-vect-details" } */
 
 enum a { b };
 

diff --git a/gcc/testsuite/gcc.dg/vect/vect-fold-1.c b/gcc/testsuite/gcc.dg/vect/vect-fold-1.c
index 2bd21a47a0ba5a11233dcf885169da4e449960c1..cc1349e7d787ee14b5b0949dd428c23fbdea4154 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/vect-fold-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-fold-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-ccp1" } */
+/* { dg-additional-options "-O2 -fdump-tree-ccp1" } */
 
 typedef unsigned char v4qi __attribute__ ((vector_size (4)));
 

diff --git a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-19.c b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-19.c
index b10147298d304dcb2b9ff8d932ff7a2fd777acc0..27cc5427f8896f1933d1eb01cc6202b51011256b 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-19.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-19.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fgimple -Ofast -fdump-tree-ifcvt-raw" } */
+/* { dg-additional-options "-fgimple -Ofast -fdump-tree-ifcvt-raw" } */
 
 void __GIMPLE (ssa,guessed_local(10737414), startwith ("fix_loops"))
 foo (int * f, int d, int e)

diff --git a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-20.c b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-20.c
index 96c5f5a929387ada82d934f67a481ac33edf8e9a..0a4a8087d2c96879cbccb882dc5fd4f099d20c9b 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-20.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-20.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fgimple -fopenmp-simd -Ofast -fdump-tree-ifcvt-raw" } */
+/* { dg-additional-options "-fgimple -fopenmp-simd -Ofast -fdump-tree-ifcvt-raw" } */
 
 void foo (int * restrict p, int * restrict q, int * restrict r, int * restrict s, int * restrict t, int * restrict u)
 {

diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-epilogue-gaps.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-epilogue-gaps.c
index dc5704f5607fc94fd02036e5db4a9bd37ce5169b..5e7bfd5d81d95c678f4a475870879fc8d7cdc6a1 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-epilogue-gaps.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-epilogue-gaps.c
@@ -1,4 +1,4 @@
-/* { dg-options "-O3 -fno-vect-cost-model" } */
+/* { dg-additional-options "-O3 -fno-vect-cost-model" } */
 struct {
     float real;
     float img;

diff --git a/gcc/testsuite/gcc.dg/vect/vect-singleton_1.c b/gcc/testsuite/gcc.dg/vect/vect-singleton_1.c
index 6c2ff49cdab358245bfc3f5994724bb878c68d61..bd243f805b7c5da75a95ffdb7be3aabb6ca9853f 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/vect-singleton_1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-singleton_1.c
@@ -1,7 +1,7 @@
 /* PR target/59843 ICE on function taking/returning vector of one float64_t.  */
 
 /* { dg-do compile } */
-/* { dg-options "-Warray-bounds -O2 -fno-inline -std=c99" } */
+/* { dg-additional-options "-Warray-bounds -O2 -fno-inline -std=c99" } */
 
 #define TEST(BASETYPE, VECTYPE, SUFFIX)                                             \
   typedef BASETYPE VECTYPE                                                  \

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 97b88821731041846b304b91918d78143fa1e1f1..2e5487482963ecf698407eedf03c72fdde5e4cb6 100644 (file)
--- a/gcc/testsuite/gfortran.dg/vect/fast-math-mgrid-resid.f
+++ b/gcc/testsuite/gfortran.dg/vect/fast-math-mgrid-resid.f
@@ -1,6 +1,6 @@
 ! { dg-do compile }
 ! { dg-require-effective-target vect_double }
-! { dg-options "-O3 --param vect-max-peeling-for-alignment=0 -fpredictive-commoning -fdump-tree-pcom-details -std=legacy" }
+! { dg-additional-options "-O3 --param vect-max-peeling-for-alignment=0 -fpredictive-commoning -fdump-tree-pcom-details -std=legacy" }
 ! { dg-additional-options "-mprefer-avx128" { target { i?86-*-* x86_64-*-* } } }
 ! { dg-additional-options "-mlsx" { target { loongarch*-*-* } } }
 ! { dg-additional-options "-mzarch" { target { s390*-*-* } } }

diff --git a/gcc/testsuite/gfortran.dg/vect/pr77848.f b/gcc/testsuite/gfortran.dg/vect/pr77848.f
index 4752205f5d2b3f2ae71107d12737b6d29bac83cb..2a5e5bfea542b9d6539c5513b8a68c28692e308c 100644 (file)
--- a/gcc/testsuite/gfortran.dg/vect/pr77848.f
+++ b/gcc/testsuite/gfortran.dg/vect/pr77848.f
@@ -1,6 +1,6 @@
 ! PR 77848: Verify versioning is on when vectorization fails
 ! { dg-do compile }
-! { dg-options "-O3 -ffast-math -fdump-tree-ifcvt -fdump-tree-vect-details" }
+! { dg-additional-options "-O3 -ffast-math -fdump-tree-ifcvt -fdump-tree-vect-details" }
 ! { dg-additional-options "-mzarch" { target { s390*-*-* } } }
 
       subroutine sub(x,a,n,m)

diff --git a/gcc/testsuite/gfortran.dg/vect/pr90913.f90 b/gcc/testsuite/gfortran.dg/vect/pr90913.f90
index d0f225159ccc67feb707bf0568fe7a006c1e0dd1..1529cee3757facd0be26059471517679d45993f1 100644 (file)
--- a/gcc/testsuite/gfortran.dg/vect/pr90913.f90
+++ b/gcc/testsuite/gfortran.dg/vect/pr90913.f90
@@ -1,5 +1,5 @@
 ! { dg-do compile }
-! { dg-options "-O3 -ffast-math" }
+! { dg-additional-options "-O3 -ffast-math" }
 ! { dg-additional-options "-mavx -mveclibabi=svml" { target i?86-*-* x86_64-*-* } }
 subroutine foo (a, b, c, d, e, f, g, h, k, l)
   implicit none