[hsa testsuite] Suppress hsa warnings in compiler gomp tests

2016-03-07  Martin Jambor  <mjambor@suse.cz>

	* c-c++-common/gomp/clauses-1.c: Remove dg-options.
	* c-c++-common/gomp/if-1.c: Likewise.
	* c-c++-common/gomp/pr61486-2.c: Likewise.
	* c-c++-common/gomp/target-teams-1.c: Moved dg-options except -fopenmp
	to dg-additional-options.
	* g++.dg/gomp/gomp.exp: Pass -Wno-hsa to all tests.
	* g++/gomp/target-teams-1.c: Likewise.
	* gcc.dg/gomp/gomp.exp: Likewise.
	* gcc.dg/gomp/pr68128-2.c: Moved dg-options except -fopenmp to
	dg-additional-options.
	* gfortran.dg/gomp/gomp.exp: Likewise.
	* gfortran.dg/gomp/target1.f90: Remove dg-options.
	* gfortran.dg/gomp/target2.f90: Moved dg-options except -fopenmp to
	dg-additional-options.
	* gfortran.dg/gomp/target3.f90: Remove dg-options.

From-SVN: r234044

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index faeff187e7dd9439e19a586724c677dbcbba028b..0dfe344bc807e09fe287ea674da93fee91df2bef 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,21 @@
+2016-03-07  Martin Jambor  <mjambor@suse.cz>
+
+       * c-c++-common/gomp/clauses-1.c: Remove dg-options.
+       * c-c++-common/gomp/if-1.c: Likewise.
+       * c-c++-common/gomp/pr61486-2.c: Likewise.
+       * c-c++-common/gomp/target-teams-1.c: Moved dg-options except -fopenmp
+       to dg-additional-options.
+       * g++.dg/gomp/gomp.exp: Pass -Wno-hsa to all tests.
+       * g++/gomp/target-teams-1.c: Likewise.
+       * gcc.dg/gomp/gomp.exp: Likewise.
+       * gcc.dg/gomp/pr68128-2.c: Moved dg-options except -fopenmp to
+       dg-additional-options.
+       * gfortran.dg/gomp/gomp.exp: Likewise.
+       * gfortran.dg/gomp/target1.f90: Remove dg-options.
+       * gfortran.dg/gomp/target2.f90: Moved dg-options except -fopenmp to
+       dg-additional-options.
+       * gfortran.dg/gomp/target3.f90: Remove dg-options.
+
 2016-03-07  Martin Jambor  <mjambor@suse.cz>
 
        * lib/target-supports.exp (check_effective_target_offload_hsa): New.

diff --git a/gcc/testsuite/c-c++-common/gomp/clauses-1.c b/gcc/testsuite/c-c++-common/gomp/clauses-1.c
index 2d1c352a3f29aec16dbf1371b79c79b2d1660d3a..91aed3960f6c49826f055432c5ae0a9c131c0e4c 100644 (file)
--- a/gcc/testsuite/c-c++-common/gomp/clauses-1.c
+++ b/gcc/testsuite/c-c++-common/gomp/clauses-1.c
@@ -1,5 +1,4 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp" } */
 /* { dg-additional-options "-std=c99" { target c } } */
 
 int t;

diff --git a/gcc/testsuite/c-c++-common/gomp/if-1.c b/gcc/testsuite/c-c++-common/gomp/if-1.c
index 4ba708c50c3adb5871eb95f06e99acc1d40fbb3b..3a9b53870c6e7d8d028a0472656d31e2d9b25f07 100644 (file)
--- a/gcc/testsuite/c-c++-common/gomp/if-1.c
+++ b/gcc/testsuite/c-c++-common/gomp/if-1.c
@@ -1,5 +1,4 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp" } */
 
 void
 foo (int a, int b, int *p, int *q)

diff --git a/gcc/testsuite/c-c++-common/gomp/pr61486-2.c b/gcc/testsuite/c-c++-common/gomp/pr61486-2.c
index db97143e913e3490e86057d7a23e37e125b72f31..4a680235fa1ea46fef8089b1ea2e897544c6834f 100644 (file)
--- a/gcc/testsuite/c-c++-common/gomp/pr61486-2.c
+++ b/gcc/testsuite/c-c++-common/gomp/pr61486-2.c
@@ -1,6 +1,5 @@
 /* PR middle-end/61486 */
 /* { dg-do compile } */
-/* { dg-options "-fopenmp" } */
 /* { dg-require-effective-target alloca } */
 
 #pragma omp declare target

diff --git a/gcc/testsuite/c-c++-common/gomp/target-teams-1.c b/gcc/testsuite/c-c++-common/gomp/target-teams-1.c
index 0a707c2e49abe416b21c7cd6465ab806df244a8d..51b8d488562ae061e51deade9e455b15bfb34011 100644 (file)
--- a/gcc/testsuite/c-c++-common/gomp/target-teams-1.c
+++ b/gcc/testsuite/c-c++-common/gomp/target-teams-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -fdump-tree-gimple" } */
+/* { dg-additional-options "-fdump-tree-gimple" } */
 
 int v = 6;
 void bar (int);

diff --git a/gcc/testsuite/g++.dg/gomp/gomp.exp b/gcc/testsuite/g++.dg/gomp/gomp.exp
index 7365389cbca9a1e5c609a2e5a7bd77bb99df7cf3..d26596c8c041abdc09f656fb333c34c929f5499d 100644 (file)
--- a/gcc/testsuite/g++.dg/gomp/gomp.exp
+++ b/gcc/testsuite/g++.dg/gomp/gomp.exp
@@ -29,7 +29,7 @@ dg-init
 # Main loop.
 g++-dg-runtest [lsort [concat \
        [find $srcdir/$subdir *.C] \
-       [find $srcdir/c-c++-common/gomp *.c]]] "" "-fopenmp"
+       [find $srcdir/c-c++-common/gomp *.c]]] "" "-fopenmp -Wno-hsa"
 
 # All done.
 dg-finish

diff --git a/gcc/testsuite/g++.dg/gomp/target-teams-1.C b/gcc/testsuite/g++.dg/gomp/target-teams-1.C
index 0a97de0ec30e9c836341156eeeab3c3ddd2bf415..f78a608dc490526777d5bab2ff27e7d5809615bf 100644 (file)
--- a/gcc/testsuite/g++.dg/gomp/target-teams-1.C
+++ b/gcc/testsuite/g++.dg/gomp/target-teams-1.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-fopenmp -fdump-tree-gimple" }
+// { dg-additional-options "-fdump-tree-gimple" }
 
 int v = 6;
 void bar (int);

diff --git a/gcc/testsuite/gcc.dg/gomp/gomp.exp b/gcc/testsuite/gcc.dg/gomp/gomp.exp
index 78623fc61c5d1c603fba18bef1b33270eec40977..b6b5932c9f427b1f0ac0b8af328b33fb8c691b64 100644 (file)
--- a/gcc/testsuite/gcc.dg/gomp/gomp.exp
+++ b/gcc/testsuite/gcc.dg/gomp/gomp.exp
@@ -31,7 +31,7 @@ dg-init
 # Main loop.
 dg-runtest [lsort [concat \
        [find $srcdir/$subdir *.c] \
-       [find $srcdir/c-c++-common/gomp *.c]]] "" "-fopenmp"
+       [find $srcdir/c-c++-common/gomp *.c]]] "" "-fopenmp -Wno-hsa"
 
 # All done.
 dg-finish

diff --git a/gcc/testsuite/gcc.dg/gomp/pr68128-2.c b/gcc/testsuite/gcc.dg/gomp/pr68128-2.c
index 58a07e9efdd12e1443159779372a20a22fa9346f..9720add11a93bd8831b7e557f77b46c7022c8d21 100644 (file)
--- a/gcc/testsuite/gcc.dg/gomp/pr68128-2.c
+++ b/gcc/testsuite/gcc.dg/gomp/pr68128-2.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/68128 */
 /* { dg-do compile } */
-/* { dg-options "-O2 -fopenmp -fdump-tree-omplower" } */
+/* { dg-additional-options "-O2 -fdump-tree-omplower" } */
 
 extern int omp_get_thread_num (void);
 extern int omp_get_ancestor_thread_num (int);

diff --git a/gcc/testsuite/gfortran.dg/gomp/gomp.exp b/gcc/testsuite/gfortran.dg/gomp/gomp.exp
index 625361b90226a3d32fbe508717d7986fd96e23fd..1cd2e36cac09c244453c05ab9188d0a6e3f5c29f 100644 (file)
--- a/gcc/testsuite/gfortran.dg/gomp/gomp.exp
+++ b/gcc/testsuite/gfortran.dg/gomp/gomp.exp
@@ -30,7 +30,7 @@ dg-init
 
 # Main loop.
 gfortran-dg-runtest [lsort \
-       [find $srcdir/$subdir *.\[fF\]{,90,95,03,08} ] ] "" "-fopenmp"
+       [find $srcdir/$subdir *.\[fF\]{,90,95,03,08} ] ] "" "-fopenmp -Wno-hsa"
 
 # All done.
 dg-finish

diff --git a/gcc/testsuite/gfortran.dg/gomp/target1.f90 b/gcc/testsuite/gfortran.dg/gomp/target1.f90
index 14db4970bdcb6834aac79dc5b171d587c98dcb16..1e771763cdaf28abb8ca73bc95cb3c865348277a 100644 (file)
--- a/gcc/testsuite/gfortran.dg/gomp/target1.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/target1.f90
@@ -1,5 +1,4 @@
 ! { dg-do compile }
-! { dg-options "-fopenmp" }
 
 module target1
   interface

diff --git a/gcc/testsuite/gfortran.dg/gomp/target2.f90 b/gcc/testsuite/gfortran.dg/gomp/target2.f90
index 7521331fcb1a8ad3face021e531f42ccb8e08db6..dfe0ec3aefac2efa12f0734c1ba82dbaef05320f 100644 (file)
--- a/gcc/testsuite/gfortran.dg/gomp/target2.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/target2.f90
@@ -1,5 +1,5 @@
 ! { dg-do compile }
-! { dg-options "-fopenmp -ffree-line-length-160" }
+! { dg-additional-options "-ffree-line-length-160" }
 
 subroutine foo (n, s, t, u, v, w)
   integer :: n, i, s, t, u, v, w

diff --git a/gcc/testsuite/gfortran.dg/gomp/target3.f90 b/gcc/testsuite/gfortran.dg/gomp/target3.f90
index 7ba42a040374b3c73f3a3e0020ce0e26c4083432..d968e54453d521416e9d0eef7ab5983cb0f4e9b1 100644 (file)
--- a/gcc/testsuite/gfortran.dg/gomp/target3.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/target3.f90
@@ -1,5 +1,4 @@
 ! { dg-do compile }
-! { dg-options "-fopenmp" }
 
 subroutine foo (r)
   integer :: i, r