From d7bfc710ab444e1a4e2ebe7e0ba8e39ffc3f8a08 Mon Sep 17 00:00:00 2001
From: Tom de Vries <tom@codesourcery.com>
Date: Mon, 15 Jun 2015 18:10:51 +0000
Subject: [PATCH] Remove dg-options -O2 in libgomp.c

2015-06-15  Tom de Vries  <tom@codesourcery.com>

	* testsuite/libgomp.c/atomic-1.c: Remove dg-options "-O2".  Use
	dg-additional-options for any remaining options.
	* testsuite/libgomp.c/atomic-2.c: Same.
	* testsuite/libgomp.c/atomic-4.c: Same.
	* testsuite/libgomp.c/atomic-5.c: Same.
	* testsuite/libgomp.c/atomic-6.c: Same.
	* testsuite/libgomp.c/autopar-1.c: Same.
	* testsuite/libgomp.c/copyin-1.c: Same.
	* testsuite/libgomp.c/copyin-2.c: Same.
	* testsuite/libgomp.c/copyin-3.c: Same.
	* testsuite/libgomp.c/examples-4/e.53.5.c: Same.
	* testsuite/libgomp.c/nestedfn-5.c: Same.
	* testsuite/libgomp.c/parloops-exit-first-loop-alt-2.c: Same.
	* testsuite/libgomp.c/parloops-exit-first-loop-alt-3.c: Same.
	* testsuite/libgomp.c/parloops-exit-first-loop-alt-4.c: Same.
	* testsuite/libgomp.c/parloops-exit-first-loop-alt.c: Same.
	* testsuite/libgomp.c/pr32362-1.c: Same.
	* testsuite/libgomp.c/pr32362-2.c: Same.
	* testsuite/libgomp.c/pr32362-3.c: Same.
	* testsuite/libgomp.c/pr39591-1.c: Same.
	* testsuite/libgomp.c/pr39591-2.c: Same.
	* testsuite/libgomp.c/pr39591-3.c: Same.
	* testsuite/libgomp.c/pr58392.c: Same.
	* testsuite/libgomp.c/pr58756.c: Same.
	* testsuite/libgomp.c/simd-1.c: Same.
	* testsuite/libgomp.c/simd-10.c: Same.
	* testsuite/libgomp.c/simd-11.c: Same.
	* testsuite/libgomp.c/simd-12.c: Same.
	* testsuite/libgomp.c/simd-13.c: Same.
	* testsuite/libgomp.c/simd-14.c: Same.
	* testsuite/libgomp.c/simd-15.c: Same.
	* testsuite/libgomp.c/simd-2.c: Same.
	* testsuite/libgomp.c/simd-3.c: Same.
	* testsuite/libgomp.c/simd-4.c: Same.
	* testsuite/libgomp.c/simd-5.c: Same.
	* testsuite/libgomp.c/simd-6.c: Same.
	* testsuite/libgomp.c/simd-7.c: Same.
	* testsuite/libgomp.c/simd-8.c: Same.
	* testsuite/libgomp.c/simd-9.c: Same.

From-SVN: r224489
---
 libgomp/ChangeLog                             | 42 +++++++++++++++++++
 libgomp/testsuite/libgomp.c/atomic-1.c        |  2 +-
 libgomp/testsuite/libgomp.c/atomic-2.c        |  2 +-
 libgomp/testsuite/libgomp.c/atomic-4.c        |  1 -
 libgomp/testsuite/libgomp.c/atomic-5.c        |  3 +-
 libgomp/testsuite/libgomp.c/atomic-6.c        |  5 +--
 libgomp/testsuite/libgomp.c/autopar-1.c       |  2 +-
 libgomp/testsuite/libgomp.c/copyin-1.c        |  1 -
 libgomp/testsuite/libgomp.c/copyin-2.c        |  1 -
 libgomp/testsuite/libgomp.c/copyin-3.c        |  1 -
 .../testsuite/libgomp.c/examples-4/e.53.5.c   |  1 -
 libgomp/testsuite/libgomp.c/nestedfn-5.c      |  1 -
 .../parloops-exit-first-loop-alt-2.c          |  2 +-
 .../parloops-exit-first-loop-alt-3.c          |  2 +-
 .../parloops-exit-first-loop-alt-4.c          |  2 +-
 .../libgomp.c/parloops-exit-first-loop-alt.c  |  2 +-
 libgomp/testsuite/libgomp.c/pr32362-1.c       |  1 -
 libgomp/testsuite/libgomp.c/pr32362-2.c       |  1 -
 libgomp/testsuite/libgomp.c/pr32362-3.c       |  1 -
 libgomp/testsuite/libgomp.c/pr39591-1.c       |  1 -
 libgomp/testsuite/libgomp.c/pr39591-2.c       |  1 -
 libgomp/testsuite/libgomp.c/pr39591-3.c       |  1 -
 libgomp/testsuite/libgomp.c/pr58392.c         |  1 -
 libgomp/testsuite/libgomp.c/pr58756.c         |  1 -
 libgomp/testsuite/libgomp.c/simd-1.c          |  1 -
 libgomp/testsuite/libgomp.c/simd-10.c         |  1 -
 libgomp/testsuite/libgomp.c/simd-11.c         |  1 -
 libgomp/testsuite/libgomp.c/simd-12.c         |  1 -
 libgomp/testsuite/libgomp.c/simd-13.c         |  1 -
 libgomp/testsuite/libgomp.c/simd-14.c         |  1 -
 libgomp/testsuite/libgomp.c/simd-15.c         |  1 -
 libgomp/testsuite/libgomp.c/simd-2.c          |  1 -
 libgomp/testsuite/libgomp.c/simd-3.c          |  1 -
 libgomp/testsuite/libgomp.c/simd-4.c          |  1 -
 libgomp/testsuite/libgomp.c/simd-5.c          |  1 -
 libgomp/testsuite/libgomp.c/simd-6.c          |  1 -
 libgomp/testsuite/libgomp.c/simd-7.c          |  1 -
 libgomp/testsuite/libgomp.c/simd-8.c          |  1 -
 libgomp/testsuite/libgomp.c/simd-9.c          |  1 -
 39 files changed, 52 insertions(+), 41 deletions(-)

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index f891feb9628..d7e0d368b6f 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,45 @@
+2015-06-15  Tom de Vries  <tom@codesourcery.com>
+
+	* testsuite/libgomp.c/atomic-1.c: Remove dg-options "-O2".  Use
+	dg-additional-options for any remaining options.
+	* testsuite/libgomp.c/atomic-2.c: Same.
+	* testsuite/libgomp.c/atomic-4.c: Same.
+	* testsuite/libgomp.c/atomic-5.c: Same.
+	* testsuite/libgomp.c/atomic-6.c: Same.
+	* testsuite/libgomp.c/autopar-1.c: Same.
+	* testsuite/libgomp.c/copyin-1.c: Same.
+	* testsuite/libgomp.c/copyin-2.c: Same.
+	* testsuite/libgomp.c/copyin-3.c: Same.
+	* testsuite/libgomp.c/examples-4/e.53.5.c: Same.
+	* testsuite/libgomp.c/nestedfn-5.c: Same.
+	* testsuite/libgomp.c/parloops-exit-first-loop-alt-2.c: Same.
+	* testsuite/libgomp.c/parloops-exit-first-loop-alt-3.c: Same.
+	* testsuite/libgomp.c/parloops-exit-first-loop-alt-4.c: Same.
+	* testsuite/libgomp.c/parloops-exit-first-loop-alt.c: Same.
+	* testsuite/libgomp.c/pr32362-1.c: Same.
+	* testsuite/libgomp.c/pr32362-2.c: Same.
+	* testsuite/libgomp.c/pr32362-3.c: Same.
+	* testsuite/libgomp.c/pr39591-1.c: Same.
+	* testsuite/libgomp.c/pr39591-2.c: Same.
+	* testsuite/libgomp.c/pr39591-3.c: Same.
+	* testsuite/libgomp.c/pr58392.c: Same.
+	* testsuite/libgomp.c/pr58756.c: Same.
+	* testsuite/libgomp.c/simd-1.c: Same.
+	* testsuite/libgomp.c/simd-10.c: Same.
+	* testsuite/libgomp.c/simd-11.c: Same.
+	* testsuite/libgomp.c/simd-12.c: Same.
+	* testsuite/libgomp.c/simd-13.c: Same.
+	* testsuite/libgomp.c/simd-14.c: Same.
+	* testsuite/libgomp.c/simd-15.c: Same.
+	* testsuite/libgomp.c/simd-2.c: Same.
+	* testsuite/libgomp.c/simd-3.c: Same.
+	* testsuite/libgomp.c/simd-4.c: Same.
+	* testsuite/libgomp.c/simd-5.c: Same.
+	* testsuite/libgomp.c/simd-6.c: Same.
+	* testsuite/libgomp.c/simd-7.c: Same.
+	* testsuite/libgomp.c/simd-8.c: Same.
+	* testsuite/libgomp.c/simd-9.c: Same.
+
 2015-06-15  Tom de Vries  <tom@codesourcery.com>
 
 	* testsuite/libgomp.c/pr35625.c: Fix typo.
diff --git a/libgomp/testsuite/libgomp.c/atomic-1.c b/libgomp/testsuite/libgomp.c/atomic-1.c
index 4725b7de251..1cecd09b4ff 100644
--- a/libgomp/testsuite/libgomp.c/atomic-1.c
+++ b/libgomp/testsuite/libgomp.c/atomic-1.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -march=pentium" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
+/* { dg-additional-options "-march=pentium" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
 
 #ifdef __i386__
 #include "cpuid.h"
diff --git a/libgomp/testsuite/libgomp.c/atomic-2.c b/libgomp/testsuite/libgomp.c/atomic-2.c
index c8779483b81..8a66da089b8 100644
--- a/libgomp/testsuite/libgomp.c/atomic-2.c
+++ b/libgomp/testsuite/libgomp.c/atomic-2.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -mcx16" { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
+/* { dg-additional-options "-mcx16" { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
 
 #ifdef __x86_64__
 #include "cpuid.h"
diff --git a/libgomp/testsuite/libgomp.c/atomic-4.c b/libgomp/testsuite/libgomp.c/atomic-4.c
index 10f8197b0b6..7157243e933 100644
--- a/libgomp/testsuite/libgomp.c/atomic-4.c
+++ b/libgomp/testsuite/libgomp.c/atomic-4.c
@@ -1,5 +1,4 @@
 /* PR middle-end/35611 */
-/* { dg-options "-O2" } */
 
 extern void abort (void);
 
diff --git a/libgomp/testsuite/libgomp.c/atomic-5.c b/libgomp/testsuite/libgomp.c/atomic-5.c
index 168f68dd6a7..e2235ebdb47 100644
--- a/libgomp/testsuite/libgomp.c/atomic-5.c
+++ b/libgomp/testsuite/libgomp.c/atomic-5.c
@@ -1,6 +1,5 @@
 /* PR middle-end/36106 */
-/* { dg-options "-O2" } */
-/* { dg-options "-O2 -mcx16" { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
+/* { dg-additional-options "-mcx16" { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
 
 #ifdef __x86_64__
 # include "cpuid.h"
diff --git a/libgomp/testsuite/libgomp.c/atomic-6.c b/libgomp/testsuite/libgomp.c/atomic-6.c
index f8ab75e6a88..8f4849e59f8 100644
--- a/libgomp/testsuite/libgomp.c/atomic-6.c
+++ b/libgomp/testsuite/libgomp.c/atomic-6.c
@@ -1,7 +1,6 @@
 /* PR middle-end/36106 */
-/* { dg-options "-O2" } */
-/* { dg-options "-O2 -mieee" { target alpha*-*-* } } */
-/* { dg-options "-O2 -march=i586" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
+/* { dg-additional-options "-mieee" { target alpha*-*-* } } */
+/* { dg-additional-options "-march=i586" { target { { i?86-*-* x86_64-*-* } && ia32 } } } */
 
 #ifdef __i386__
 # include "cpuid.h"
diff --git a/libgomp/testsuite/libgomp.c/autopar-1.c b/libgomp/testsuite/libgomp.c/autopar-1.c
index e56549b4845..718dda0d6e1 100644
--- a/libgomp/testsuite/libgomp.c/autopar-1.c
+++ b/libgomp/testsuite/libgomp.c/autopar-1.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-ftree-parallelize-loops=4 -O2 -ffast-math" } */
+/* { dg-additional-options "-ftree-parallelize-loops=4 -ffast-math" } */
 
 extern void abort (void);
 
diff --git a/libgomp/testsuite/libgomp.c/copyin-1.c b/libgomp/testsuite/libgomp.c/copyin-1.c
index 49c546004c8..90e08c7db12 100644
--- a/libgomp/testsuite/libgomp.c/copyin-1.c
+++ b/libgomp/testsuite/libgomp.c/copyin-1.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-require-effective-target tls_runtime } */
 
 #include <omp.h>
diff --git a/libgomp/testsuite/libgomp.c/copyin-2.c b/libgomp/testsuite/libgomp.c/copyin-2.c
index ae2451ef1d8..a7b05973482 100644
--- a/libgomp/testsuite/libgomp.c/copyin-2.c
+++ b/libgomp/testsuite/libgomp.c/copyin-2.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-require-effective-target tls_runtime } */
 
 #include <omp.h>
diff --git a/libgomp/testsuite/libgomp.c/copyin-3.c b/libgomp/testsuite/libgomp.c/copyin-3.c
index 86b0d691f3a..0a176c4a54e 100644
--- a/libgomp/testsuite/libgomp.c/copyin-3.c
+++ b/libgomp/testsuite/libgomp.c/copyin-3.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-require-effective-target tls_runtime } */
 
 #include <omp.h>
diff --git a/libgomp/testsuite/libgomp.c/examples-4/e.53.5.c b/libgomp/testsuite/libgomp.c/examples-4/e.53.5.c
index 2b16dbed6b2..b550f1ff540 100644
--- a/libgomp/testsuite/libgomp.c/examples-4/e.53.5.c
+++ b/libgomp/testsuite/libgomp.c/examples-4/e.53.5.c
@@ -1,5 +1,4 @@
 /* { dg-do run { target vect_simd_clones } } */
-/* { dg-options "-O2" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
 
diff --git a/libgomp/testsuite/libgomp.c/nestedfn-5.c b/libgomp/testsuite/libgomp.c/nestedfn-5.c
index 6072b1fe369..651ce7cf576 100644
--- a/libgomp/testsuite/libgomp.c/nestedfn-5.c
+++ b/libgomp/testsuite/libgomp.c/nestedfn-5.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 
 extern void abort (void);
 
diff --git a/libgomp/testsuite/libgomp.c/parloops-exit-first-loop-alt-2.c b/libgomp/testsuite/libgomp.c/parloops-exit-first-loop-alt-2.c
index f20cc990e71..a3ec7fe8ad0 100644
--- a/libgomp/testsuite/libgomp.c/parloops-exit-first-loop-alt-2.c
+++ b/libgomp/testsuite/libgomp.c/parloops-exit-first-loop-alt-2.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -ftree-parallelize-loops=2" } */
+/* { dg-additional-options "-ftree-parallelize-loops=2" } */
 
 /* Constant bound, vector addition.  */
 
diff --git a/libgomp/testsuite/libgomp.c/parloops-exit-first-loop-alt-3.c b/libgomp/testsuite/libgomp.c/parloops-exit-first-loop-alt-3.c
index d55589e6df3..43b9194d2b1 100644
--- a/libgomp/testsuite/libgomp.c/parloops-exit-first-loop-alt-3.c
+++ b/libgomp/testsuite/libgomp.c/parloops-exit-first-loop-alt-3.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -ftree-parallelize-loops=2" } */
+/* { dg-additional-options "-ftree-parallelize-loops=2" } */
 
 /* Variable bound, reduction.  */
 
diff --git a/libgomp/testsuite/libgomp.c/parloops-exit-first-loop-alt-4.c b/libgomp/testsuite/libgomp.c/parloops-exit-first-loop-alt-4.c
index 1beae3eb11c..8599a89a2f0 100644
--- a/libgomp/testsuite/libgomp.c/parloops-exit-first-loop-alt-4.c
+++ b/libgomp/testsuite/libgomp.c/parloops-exit-first-loop-alt-4.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -ftree-parallelize-loops=2" } */
+/* { dg-additional-options "-ftree-parallelize-loops=2" } */
 
 /* Constant bound, reduction.  */
 
diff --git a/libgomp/testsuite/libgomp.c/parloops-exit-first-loop-alt.c b/libgomp/testsuite/libgomp.c/parloops-exit-first-loop-alt.c
index f5fd3155e4d..1c32ea33f7b 100644
--- a/libgomp/testsuite/libgomp.c/parloops-exit-first-loop-alt.c
+++ b/libgomp/testsuite/libgomp.c/parloops-exit-first-loop-alt.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-O2 -ftree-parallelize-loops=2" } */
+/* { dg-additional-options "-ftree-parallelize-loops=2" } */
 
 /* Variable bound, vector addition.  */
 
diff --git a/libgomp/testsuite/libgomp.c/pr32362-1.c b/libgomp/testsuite/libgomp.c/pr32362-1.c
index 3c62d4bdb26..55807e33a49 100644
--- a/libgomp/testsuite/libgomp.c/pr32362-1.c
+++ b/libgomp/testsuite/libgomp.c/pr32362-1.c
@@ -1,6 +1,5 @@
 /* PR middle-end/32362 */
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 
 #include <omp.h>
 #include <stdlib.h>
diff --git a/libgomp/testsuite/libgomp.c/pr32362-2.c b/libgomp/testsuite/libgomp.c/pr32362-2.c
index 43f36e0e98b..d4ce0918ef5 100644
--- a/libgomp/testsuite/libgomp.c/pr32362-2.c
+++ b/libgomp/testsuite/libgomp.c/pr32362-2.c
@@ -1,6 +1,5 @@
 /* PR middle-end/32362 */
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 
 #include <omp.h>
 #include <stdlib.h>
diff --git a/libgomp/testsuite/libgomp.c/pr32362-3.c b/libgomp/testsuite/libgomp.c/pr32362-3.c
index 09a88f52a3b..11a0a0a81dd 100644
--- a/libgomp/testsuite/libgomp.c/pr32362-3.c
+++ b/libgomp/testsuite/libgomp.c/pr32362-3.c
@@ -1,6 +1,5 @@
 /* PR middle-end/32362 */
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 
 #include <omp.h>
 #include <stdlib.h>
diff --git a/libgomp/testsuite/libgomp.c/pr39591-1.c b/libgomp/testsuite/libgomp.c/pr39591-1.c
index dfd8d9e8aca..df326f85424 100644
--- a/libgomp/testsuite/libgomp.c/pr39591-1.c
+++ b/libgomp/testsuite/libgomp.c/pr39591-1.c
@@ -1,6 +1,5 @@
 /* PR other/39591 */
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 
 extern void abort (void);
 
diff --git a/libgomp/testsuite/libgomp.c/pr39591-2.c b/libgomp/testsuite/libgomp.c/pr39591-2.c
index b5f8f9cc7b2..37428296e53 100644
--- a/libgomp/testsuite/libgomp.c/pr39591-2.c
+++ b/libgomp/testsuite/libgomp.c/pr39591-2.c
@@ -1,6 +1,5 @@
 /* PR other/39591 */
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 
 extern void abort (void);
 
diff --git a/libgomp/testsuite/libgomp.c/pr39591-3.c b/libgomp/testsuite/libgomp.c/pr39591-3.c
index a9aeea7c83a..f09a3890f0d 100644
--- a/libgomp/testsuite/libgomp.c/pr39591-3.c
+++ b/libgomp/testsuite/libgomp.c/pr39591-3.c
@@ -1,6 +1,5 @@
 /* PR other/39591 */
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 
 extern void abort (void);
 
diff --git a/libgomp/testsuite/libgomp.c/pr58392.c b/libgomp/testsuite/libgomp.c/pr58392.c
index 6ca97adc2d3..21ad2bf0bdb 100644
--- a/libgomp/testsuite/libgomp.c/pr58392.c
+++ b/libgomp/testsuite/libgomp.c/pr58392.c
@@ -1,6 +1,5 @@
 /* PR tree-optimization/58392 */
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
 
diff --git a/libgomp/testsuite/libgomp.c/pr58756.c b/libgomp/testsuite/libgomp.c/pr58756.c
index d35ea792e8d..34877accd3a 100644
--- a/libgomp/testsuite/libgomp.c/pr58756.c
+++ b/libgomp/testsuite/libgomp.c/pr58756.c
@@ -1,6 +1,5 @@
 /* PR libgomp/58756 */
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
 
diff --git a/libgomp/testsuite/libgomp.c/simd-1.c b/libgomp/testsuite/libgomp.c/simd-1.c
index 352b3b7ddd4..68a409786a9 100644
--- a/libgomp/testsuite/libgomp.c/simd-1.c
+++ b/libgomp/testsuite/libgomp.c/simd-1.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
 
diff --git a/libgomp/testsuite/libgomp.c/simd-10.c b/libgomp/testsuite/libgomp.c/simd-10.c
index 70cd9f0156d..3352e504e11 100644
--- a/libgomp/testsuite/libgomp.c/simd-10.c
+++ b/libgomp/testsuite/libgomp.c/simd-10.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
 
diff --git a/libgomp/testsuite/libgomp.c/simd-11.c b/libgomp/testsuite/libgomp.c/simd-11.c
index b09f0dde8ed..618a8b3ca04 100644
--- a/libgomp/testsuite/libgomp.c/simd-11.c
+++ b/libgomp/testsuite/libgomp.c/simd-11.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
 
diff --git a/libgomp/testsuite/libgomp.c/simd-12.c b/libgomp/testsuite/libgomp.c/simd-12.c
index 6685111a06e..8f15daf82ce 100644
--- a/libgomp/testsuite/libgomp.c/simd-12.c
+++ b/libgomp/testsuite/libgomp.c/simd-12.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
 
diff --git a/libgomp/testsuite/libgomp.c/simd-13.c b/libgomp/testsuite/libgomp.c/simd-13.c
index 7c817b793db..df35d621835 100644
--- a/libgomp/testsuite/libgomp.c/simd-13.c
+++ b/libgomp/testsuite/libgomp.c/simd-13.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
 
diff --git a/libgomp/testsuite/libgomp.c/simd-14.c b/libgomp/testsuite/libgomp.c/simd-14.c
index 50e8d5e9011..28bdc99d11b 100644
--- a/libgomp/testsuite/libgomp.c/simd-14.c
+++ b/libgomp/testsuite/libgomp.c/simd-14.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
 
diff --git a/libgomp/testsuite/libgomp.c/simd-15.c b/libgomp/testsuite/libgomp.c/simd-15.c
index e474b81fa44..e75538d06e5 100644
--- a/libgomp/testsuite/libgomp.c/simd-15.c
+++ b/libgomp/testsuite/libgomp.c/simd-15.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
 
diff --git a/libgomp/testsuite/libgomp.c/simd-2.c b/libgomp/testsuite/libgomp.c/simd-2.c
index b485fcb6f6f..0e3f17bae0b 100644
--- a/libgomp/testsuite/libgomp.c/simd-2.c
+++ b/libgomp/testsuite/libgomp.c/simd-2.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
 
diff --git a/libgomp/testsuite/libgomp.c/simd-3.c b/libgomp/testsuite/libgomp.c/simd-3.c
index 34a38830143..7140f89ce70 100644
--- a/libgomp/testsuite/libgomp.c/simd-3.c
+++ b/libgomp/testsuite/libgomp.c/simd-3.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
 
diff --git a/libgomp/testsuite/libgomp.c/simd-4.c b/libgomp/testsuite/libgomp.c/simd-4.c
index fd87c7e1fa7..7850cb7f371 100644
--- a/libgomp/testsuite/libgomp.c/simd-4.c
+++ b/libgomp/testsuite/libgomp.c/simd-4.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
 
diff --git a/libgomp/testsuite/libgomp.c/simd-5.c b/libgomp/testsuite/libgomp.c/simd-5.c
index 0b6d41e6356..1205da3b93c 100644
--- a/libgomp/testsuite/libgomp.c/simd-5.c
+++ b/libgomp/testsuite/libgomp.c/simd-5.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
 
diff --git a/libgomp/testsuite/libgomp.c/simd-6.c b/libgomp/testsuite/libgomp.c/simd-6.c
index 896f34784f2..6daa33ee312 100644
--- a/libgomp/testsuite/libgomp.c/simd-6.c
+++ b/libgomp/testsuite/libgomp.c/simd-6.c
@@ -1,6 +1,5 @@
 /* PR libgomp/58482 */
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
 
diff --git a/libgomp/testsuite/libgomp.c/simd-7.c b/libgomp/testsuite/libgomp.c/simd-7.c
index ab04fee82d7..8239af950e8 100644
--- a/libgomp/testsuite/libgomp.c/simd-7.c
+++ b/libgomp/testsuite/libgomp.c/simd-7.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
 
diff --git a/libgomp/testsuite/libgomp.c/simd-8.c b/libgomp/testsuite/libgomp.c/simd-8.c
index 13f40d58362..dab3805f5a4 100644
--- a/libgomp/testsuite/libgomp.c/simd-8.c
+++ b/libgomp/testsuite/libgomp.c/simd-8.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */
 
diff --git a/libgomp/testsuite/libgomp.c/simd-9.c b/libgomp/testsuite/libgomp.c/simd-9.c
index b64dd252229..a7c48cbc308 100644
--- a/libgomp/testsuite/libgomp.c/simd-9.c
+++ b/libgomp/testsuite/libgomp.c/simd-9.c
@@ -1,5 +1,4 @@
 /* { dg-do run } */
-/* { dg-options "-O2" } */
 /* { dg-additional-options "-msse2" { target sse2_runtime } } */
 /* { dg-additional-options "-mavx" { target avx_runtime } } */