| Message ID | 20160226155957.GJ3094@virgil.suse.cz |
|---|---|
| State | New |
| Headers | show |
On Fri, Feb 26, 2016 at 04:59:57PM +0100, Martin Jambor wrote: > just like with the compiler gomp testsuite, we need to add -Wno-hsa to > options when compiling libgomp testcases in order not to have "excess > errors" failures when HSA is enabled. There are quite many of such > testcases on the trunk because I have disabled the dynamic parallelism > way of executing stuff. Hopefully we'll be able to revert many of the > hunks below when we get that working. > > The patch has been tested both with and without HSA enabled. OK for > trunk? I don't like this very much. Couldn't you instead add -Wno-hsa next to -fopenmp in *.exp, and just where you want to explicitly check the hsa warnings, enable it manually in dg-options or dg-additional-options (it would need to be guarded with hsa being enabled etc. anyway). Jakub
diff --git a/libgomp/testsuite/libgomp.c++/examples-4/target_data-5.C b/libgomp/testsuite/libgomp.c++/examples-4/target_data-5.C index 4298e23..da18a80 100644 --- a/libgomp/testsuite/libgomp.c++/examples-4/target_data-5.C +++ b/libgomp/testsuite/libgomp.c++/examples-4/target_data-5.C @@ -1,4 +1,5 @@ // { dg-do run } +// { dg-additional-options "-Wno-hsa" } #include <omp.h> diff --git a/libgomp/testsuite/libgomp.c++/for-11.C b/libgomp/testsuite/libgomp.c++/for-11.C index 0244e4d..534ff6f 100644 --- a/libgomp/testsuite/libgomp.c++/for-11.C +++ b/libgomp/testsuite/libgomp.c++/for-11.C @@ -1,3 +1,5 @@ +// { dg-additional-options "-Wno-hsa" } + extern "C" void abort (); #define M(x, y, z) O(x, y, z) diff --git a/libgomp/testsuite/libgomp.c++/for-13.C b/libgomp/testsuite/libgomp.c++/for-13.C index ac1601a..7c8e66e 100644 --- a/libgomp/testsuite/libgomp.c++/for-13.C +++ b/libgomp/testsuite/libgomp.c++/for-13.C @@ -1,3 +1,5 @@ +// { dg-additional-options "-Wno-hsa" } + extern "C" void abort (); #define M(x, y, z) O(x, y, z) diff --git a/libgomp/testsuite/libgomp.c++/for-14.C b/libgomp/testsuite/libgomp.c++/for-14.C index 7738473..af73854 100644 --- a/libgomp/testsuite/libgomp.c++/for-14.C +++ b/libgomp/testsuite/libgomp.c++/for-14.C @@ -1,3 +1,5 @@ +// { dg-additional-options "-Wno-hsa" } + extern "C" void abort (); #define M(x, y, z) O(x, y, z) diff --git a/libgomp/testsuite/libgomp.c++/pr66199-2.C b/libgomp/testsuite/libgomp.c++/pr66199-2.C index 1dbccb6..799990e 100644 --- a/libgomp/testsuite/libgomp.c++/pr66199-2.C +++ b/libgomp/testsuite/libgomp.c++/pr66199-2.C @@ -1,4 +1,5 @@ // PR middle-end/66199 // { dg-do run } +// { dg-additional-options "-Wno-hsa" } #include "../libgomp.c/pr66199-2.c" diff --git a/libgomp/testsuite/libgomp.c++/pr66199-4.C b/libgomp/testsuite/libgomp.c++/pr66199-4.C index bc71a6d..b468fe1 100644 --- a/libgomp/testsuite/libgomp.c++/pr66199-4.C +++ b/libgomp/testsuite/libgomp.c++/pr66199-4.C @@ -1,4 +1,5 @@ // PR middle-end/66199 // { dg-do run } +// { dg-additional-options "-Wno-hsa" } #include "../libgomp.c/pr66199-4.c" diff --git a/libgomp/testsuite/libgomp.c++/pr66199-5.C b/libgomp/testsuite/libgomp.c++/pr66199-5.C index c7549e8..5aafa20 100644 --- a/libgomp/testsuite/libgomp.c++/pr66199-5.C +++ b/libgomp/testsuite/libgomp.c++/pr66199-5.C @@ -1,4 +1,5 @@ // PR middle-end/66199 // { dg-do run } +// { dg-additional-options "-Wno-hsa" } #include "../libgomp.c/pr66199-5.c" diff --git a/libgomp/testsuite/libgomp.c++/pr66199-6.C b/libgomp/testsuite/libgomp.c++/pr66199-6.C index 46adbd7..536b656 100644 --- a/libgomp/testsuite/libgomp.c++/pr66199-6.C +++ b/libgomp/testsuite/libgomp.c++/pr66199-6.C @@ -1,4 +1,5 @@ // PR middle-end/66199 // { dg-do run } +// { dg-additional-options "-Wno-hsa" } #include "../libgomp.c/pr66199-6.c" diff --git a/libgomp/testsuite/libgomp.c++/pr66199-7.C b/libgomp/testsuite/libgomp.c++/pr66199-7.C index b03d284..0d33a53 100644 --- a/libgomp/testsuite/libgomp.c++/pr66199-7.C +++ b/libgomp/testsuite/libgomp.c++/pr66199-7.C @@ -1,4 +1,5 @@ // PR middle-end/66199 // { dg-do run } +// { dg-additional-options "-Wno-hsa" } #include "../libgomp.c/pr66199-7.c" diff --git a/libgomp/testsuite/libgomp.c++/pr66199-8.C b/libgomp/testsuite/libgomp.c++/pr66199-8.C index b998ef6..c2db6ae 100644 --- a/libgomp/testsuite/libgomp.c++/pr66199-8.C +++ b/libgomp/testsuite/libgomp.c++/pr66199-8.C @@ -1,4 +1,5 @@ // PR middle-end/66199 // { dg-do run } +// { dg-additional-options "-Wno-hsa" } #include "../libgomp.c/pr66199-8.c" diff --git a/libgomp/testsuite/libgomp.c++/target-1.C b/libgomp/testsuite/libgomp.c++/target-1.C index 3cf01d9..7cab5f1 100644 --- a/libgomp/testsuite/libgomp.c++/target-1.C +++ b/libgomp/testsuite/libgomp.c++/target-1.C @@ -1 +1,3 @@ +// { dg-additional-options "-Wno-hsa" } + #include "../libgomp.c/target-1.c" diff --git a/libgomp/testsuite/libgomp.c++/target-2.C b/libgomp/testsuite/libgomp.c++/target-2.C index 1eab7f2..342a24f 100644 --- a/libgomp/testsuite/libgomp.c++/target-2.C +++ b/libgomp/testsuite/libgomp.c++/target-2.C @@ -1,4 +1,5 @@ // { dg-additional-sources "target-2-aux.cc" } +// { dg-additional-options "-Wno-hsa" } extern "C" void abort (void); diff --git a/libgomp/testsuite/libgomp.c++/target-3.C b/libgomp/testsuite/libgomp.c++/target-3.C index 2e4586f..9ea077a 100644 --- a/libgomp/testsuite/libgomp.c++/target-3.C +++ b/libgomp/testsuite/libgomp.c++/target-3.C @@ -1 +1,3 @@ +// { dg-additional-options "-Wno-hsa" } + #include "../libgomp.c/target-2.c" diff --git a/libgomp/testsuite/libgomp.c++/target-8.C b/libgomp/testsuite/libgomp.c++/target-8.C index d886b47..e43b973 100644 --- a/libgomp/testsuite/libgomp.c++/target-8.C +++ b/libgomp/testsuite/libgomp.c++/target-8.C @@ -1,3 +1,5 @@ +// { dg-additional-options "-Wno-hsa" } + extern "C" void abort (); struct S { int a; }; #ifdef __SIZEOF_INT128__ diff --git a/libgomp/testsuite/libgomp.c/examples-4/async_target-1.c b/libgomp/testsuite/libgomp.c/examples-4/async_target-1.c index b2e1f1f..9076128 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/async_target-1.c +++ b/libgomp/testsuite/libgomp.c/examples-4/async_target-1.c @@ -1,6 +1,6 @@ /* { dg-do run } */ -/* { dg-additional-options "-DCHUNKSZ=5000" { target { ! run_expensive_tests } } } */ -/* { dg-additional-options "-DCHUNKSZ=1000" { target run_expensive_tests } } */ +/* { dg-additional-options "-DCHUNKSZ=5000 -Wno-hsa" { target { ! run_expensive_tests } } } */ +/* { dg-additional-options "-DCHUNKSZ=1000 -Wno-hsa" { target run_expensive_tests } } */ #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/examples-4/declare_target-3.c b/libgomp/testsuite/libgomp.c/examples-4/declare_target-3.c index 8025335..2b906b0 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/declare_target-3.c +++ b/libgomp/testsuite/libgomp.c/examples-4/declare_target-3.c @@ -1,4 +1,6 @@ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ + #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/examples-4/declare_target-4.c b/libgomp/testsuite/libgomp.c/examples-4/declare_target-4.c index f241436..22a82af 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/declare_target-4.c +++ b/libgomp/testsuite/libgomp.c/examples-4/declare_target-4.c @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-additional-options "-DTESTITERS=20" { target { ! run_expensive_tests } } } */ +/* { dg-additional-options "-DTESTITERS=20 -Wno-hsa" { target { ! run_expensive_tests } } } */ #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/examples-4/declare_target-5.c b/libgomp/testsuite/libgomp.c/examples-4/declare_target-5.c index 33d6137..99bcb55 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/declare_target-5.c +++ b/libgomp/testsuite/libgomp.c/examples-4/declare_target-5.c @@ -1,4 +1,5 @@ /* { dg-do run { target vect_simd_clones } } */ +/* { dg-additional-options "-Wno-hsa" } */ /* { dg-additional-options "-msse2" { target sse2_runtime } } */ /* { dg-additional-options "-mavx" { target avx_runtime } } */ diff --git a/libgomp/testsuite/libgomp.c/examples-4/target-1.c b/libgomp/testsuite/libgomp.c/examples-4/target-1.c index 45adbe0..7ae3284 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/target-1.c +++ b/libgomp/testsuite/libgomp.c/examples-4/target-1.c @@ -1,4 +1,5 @@ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/examples-4/target-2.c b/libgomp/testsuite/libgomp.c/examples-4/target-2.c index 55d667a..c677d7e6 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/target-2.c +++ b/libgomp/testsuite/libgomp.c/examples-4/target-2.c @@ -1,4 +1,5 @@ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/examples-4/target-3.c b/libgomp/testsuite/libgomp.c/examples-4/target-3.c index 8d5125f..62d6d94 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/target-3.c +++ b/libgomp/testsuite/libgomp.c/examples-4/target-3.c @@ -1,4 +1,5 @@ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/examples-4/target-4.c b/libgomp/testsuite/libgomp.c/examples-4/target-4.c index 545f02a..711cda7 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/target-4.c +++ b/libgomp/testsuite/libgomp.c/examples-4/target-4.c @@ -1,4 +1,5 @@ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/examples-4/target_data-1.c b/libgomp/testsuite/libgomp.c/examples-4/target_data-1.c index 6b0331b..773ffab 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/target_data-1.c +++ b/libgomp/testsuite/libgomp.c/examples-4/target_data-1.c @@ -1,4 +1,5 @@ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/examples-4/target_data-2.c b/libgomp/testsuite/libgomp.c/examples-4/target_data-2.c index ee8f150..b5f408b 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/target_data-2.c +++ b/libgomp/testsuite/libgomp.c/examples-4/target_data-2.c @@ -1,4 +1,5 @@ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/examples-4/target_data-3.c b/libgomp/testsuite/libgomp.c/examples-4/target_data-3.c index 46b6740..a5b539d 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/target_data-3.c +++ b/libgomp/testsuite/libgomp.c/examples-4/target_data-3.c @@ -1,4 +1,5 @@ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/examples-4/target_data-4.c b/libgomp/testsuite/libgomp.c/examples-4/target_data-4.c index d2948ae..340793a 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/target_data-4.c +++ b/libgomp/testsuite/libgomp.c/examples-4/target_data-4.c @@ -1,4 +1,5 @@ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/examples-4/target_update-1.c b/libgomp/testsuite/libgomp.c/examples-4/target_update-1.c index 727d475..771d1c7 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/target_update-1.c +++ b/libgomp/testsuite/libgomp.c/examples-4/target_update-1.c @@ -1,4 +1,5 @@ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/examples-4/target_update-2.c b/libgomp/testsuite/libgomp.c/examples-4/target_update-2.c index 51262bb..b73fd1b 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/target_update-2.c +++ b/libgomp/testsuite/libgomp.c/examples-4/target_update-2.c @@ -1,4 +1,5 @@ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/examples-4/teams-2.c b/libgomp/testsuite/libgomp.c/examples-4/teams-2.c index 7d0a60e..a23fee4 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/teams-2.c +++ b/libgomp/testsuite/libgomp.c/examples-4/teams-2.c @@ -1,4 +1,5 @@ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/examples-4/teams-3.c b/libgomp/testsuite/libgomp.c/examples-4/teams-3.c index 092d386..8fe62c5 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/teams-3.c +++ b/libgomp/testsuite/libgomp.c/examples-4/teams-3.c @@ -1,4 +1,5 @@ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/examples-4/teams-4.c b/libgomp/testsuite/libgomp.c/examples-4/teams-4.c index d0c586c..035c30b 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/teams-4.c +++ b/libgomp/testsuite/libgomp.c/examples-4/teams-4.c @@ -1,4 +1,5 @@ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/examples-4/teams-6.c b/libgomp/testsuite/libgomp.c/examples-4/teams-6.c index 388582b..5286d37 100644 --- a/libgomp/testsuite/libgomp.c/examples-4/teams-6.c +++ b/libgomp/testsuite/libgomp.c/examples-4/teams-6.c @@ -1,4 +1,5 @@ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/for-3.c b/libgomp/testsuite/libgomp.c/for-3.c index f4cd115..c70ef1a 100644 --- a/libgomp/testsuite/libgomp.c/for-3.c +++ b/libgomp/testsuite/libgomp.c/for-3.c @@ -1,4 +1,4 @@ -/* { dg-additional-options "-std=gnu99" } */ +/* { dg-additional-options "-std=gnu99 -Wno-hsa" } */ extern void abort (); diff --git a/libgomp/testsuite/libgomp.c/for-5.c b/libgomp/testsuite/libgomp.c/for-5.c index 84e636a..2ccf47c 100644 --- a/libgomp/testsuite/libgomp.c/for-5.c +++ b/libgomp/testsuite/libgomp.c/for-5.c @@ -1,4 +1,4 @@ -/* { dg-additional-options "-std=gnu99" } */ +/* { dg-additional-options "-std=gnu99 -Wno-hsa" } */ extern void abort (); diff --git a/libgomp/testsuite/libgomp.c/for-6.c b/libgomp/testsuite/libgomp.c/for-6.c index 7f3c65e..a55ce2e 100644 --- a/libgomp/testsuite/libgomp.c/for-6.c +++ b/libgomp/testsuite/libgomp.c/for-6.c @@ -1,4 +1,4 @@ -/* { dg-additional-options "-std=gnu99" } */ +/* { dg-additional-options "-std=gnu99 -Wno-hsa" } */ extern void abort (); diff --git a/libgomp/testsuite/libgomp.c/pr66199-2.c b/libgomp/testsuite/libgomp.c/pr66199-2.c index 2fc9eec..413872d 100644 --- a/libgomp/testsuite/libgomp.c/pr66199-2.c +++ b/libgomp/testsuite/libgomp.c/pr66199-2.c @@ -1,5 +1,6 @@ /* PR middle-end/66199 */ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #pragma omp declare target int u[1024], v[1024], w[1024]; diff --git a/libgomp/testsuite/libgomp.c/pr66199-4.c b/libgomp/testsuite/libgomp.c/pr66199-4.c index a9b1bb8..319f916 100644 --- a/libgomp/testsuite/libgomp.c/pr66199-4.c +++ b/libgomp/testsuite/libgomp.c/pr66199-4.c @@ -1,6 +1,6 @@ /* PR middle-end/66199 */ /* { dg-do run } */ -/* { dg-options "-O2 -fopenmp" } */ +/* { dg-options "-O2 -fopenmp -Wno-hsa" } */ #pragma omp declare target int u[1024], v[1024], w[1024]; diff --git a/libgomp/testsuite/libgomp.c/pr66199-5.c b/libgomp/testsuite/libgomp.c/pr66199-5.c index 7ade43c..47acfbd 100644 --- a/libgomp/testsuite/libgomp.c/pr66199-5.c +++ b/libgomp/testsuite/libgomp.c/pr66199-5.c @@ -1,5 +1,6 @@ /* PR middle-end/66199 */ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #pragma omp declare target int u[1024], v[1024], w[1024]; diff --git a/libgomp/testsuite/libgomp.c/pr66199-6.c b/libgomp/testsuite/libgomp.c/pr66199-6.c index 6790f7d..ddddf11 100644 --- a/libgomp/testsuite/libgomp.c/pr66199-6.c +++ b/libgomp/testsuite/libgomp.c/pr66199-6.c @@ -1,6 +1,6 @@ /* PR middle-end/66199 */ /* { dg-do run } */ -/* { dg-options "-O2 -fopenmp" } */ +/* { dg-options "-O2 -fopenmp -Wno-hsa" } */ #pragma omp declare target int u[1024], v[1024], w[1024]; diff --git a/libgomp/testsuite/libgomp.c/pr66199-7.c b/libgomp/testsuite/libgomp.c/pr66199-7.c index 752367e..1ccccb0 100644 --- a/libgomp/testsuite/libgomp.c/pr66199-7.c +++ b/libgomp/testsuite/libgomp.c/pr66199-7.c @@ -1,5 +1,6 @@ /* PR middle-end/66199 */ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #pragma omp declare target int u[1024], v[1024], w[1024]; diff --git a/libgomp/testsuite/libgomp.c/pr66199-8.c b/libgomp/testsuite/libgomp.c/pr66199-8.c index 102af06..a6a32be 100644 --- a/libgomp/testsuite/libgomp.c/pr66199-8.c +++ b/libgomp/testsuite/libgomp.c/pr66199-8.c @@ -1,5 +1,6 @@ /* PR middle-end/66199 */ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #pragma omp declare target int u[1024], v[1024], w[1024]; diff --git a/libgomp/testsuite/libgomp.c/pr66714.c b/libgomp/testsuite/libgomp.c/pr66714.c index c9af4a9..6f0ca72 100644 --- a/libgomp/testsuite/libgomp.c/pr66714.c +++ b/libgomp/testsuite/libgomp.c/pr66714.c @@ -1,7 +1,7 @@ /* { dg-do "compile" } */ /* { dg-additional-options "--param ggc-min-expand=0" } */ /* { dg-additional-options "--param ggc-min-heapsize=0" } */ -/* { dg-additional-options "-g" } */ +/* { dg-additional-options "-g -Wno-hsa" } */ /* Minimized from on target-2.c. */ diff --git a/libgomp/testsuite/libgomp.c/target-1.c b/libgomp/testsuite/libgomp.c/target-1.c index c7abb00..533def6 100644 --- a/libgomp/testsuite/libgomp.c/target-1.c +++ b/libgomp/testsuite/libgomp.c/target-1.c @@ -1,3 +1,5 @@ +/* { dg-additional-options "-Wno-hsa" } */ + extern #ifdef __cplusplus "C" diff --git a/libgomp/testsuite/libgomp.c/target-16.c b/libgomp/testsuite/libgomp.c/target-16.c index 7b0919b..19fcffb 100644 --- a/libgomp/testsuite/libgomp.c/target-16.c +++ b/libgomp/testsuite/libgomp.c/target-16.c @@ -1,3 +1,5 @@ +/* { dg-additional-options "-Wno-hsa" } */ + extern void abort (void); void diff --git a/libgomp/testsuite/libgomp.c/target-2.c b/libgomp/testsuite/libgomp.c/target-2.c index 0ba766c..be8d877 100644 --- a/libgomp/testsuite/libgomp.c/target-2.c +++ b/libgomp/testsuite/libgomp.c/target-2.c @@ -1,3 +1,5 @@ +/* { dg-additional-options "-Wno-hsa" } */ + extern #ifdef __cplusplus "C" diff --git a/libgomp/testsuite/libgomp.c/target-31.c b/libgomp/testsuite/libgomp.c/target-31.c index 8e63d28..8131ddc 100644 --- a/libgomp/testsuite/libgomp.c/target-31.c +++ b/libgomp/testsuite/libgomp.c/target-31.c @@ -1,3 +1,5 @@ +/* { dg-additional-options "-Wno-hsa" } */ + #include <omp.h> #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/target-32.c b/libgomp/testsuite/libgomp.c/target-32.c index 233877b..0c9b972 100644 --- a/libgomp/testsuite/libgomp.c/target-32.c +++ b/libgomp/testsuite/libgomp.c/target-32.c @@ -1,3 +1,5 @@ +/* { dg-additional-options "-Wno-hsa" } */ + #include <stdlib.h> #include <unistd.h> diff --git a/libgomp/testsuite/libgomp.c/target-35.c b/libgomp/testsuite/libgomp.c/target-35.c index 6da8b2b..3818fa2 100644 --- a/libgomp/testsuite/libgomp.c/target-35.c +++ b/libgomp/testsuite/libgomp.c/target-35.c @@ -1,3 +1,5 @@ +/* { dg-additional-options "-Wno-hsa" } */ + #include <omp.h> #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/target-5.c b/libgomp/testsuite/libgomp.c/target-5.c index 4367443..4601c0c 100644 --- a/libgomp/testsuite/libgomp.c/target-5.c +++ b/libgomp/testsuite/libgomp.c/target-5.c @@ -1,3 +1,5 @@ +/* { dg-additional-options "-Wno-hsa" } */ + #include <omp.h> #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/target-6.c b/libgomp/testsuite/libgomp.c/target-6.c index ea35aa4..e3aa696 100644 --- a/libgomp/testsuite/libgomp.c/target-6.c +++ b/libgomp/testsuite/libgomp.c/target-6.c @@ -1,3 +1,5 @@ +/* { dg-additional-options "-Wno-hsa" } */ + #include <omp.h> #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/target-critical-1.c b/libgomp/testsuite/libgomp.c/target-critical-1.c index 84ad558..6ce75c1 100644 --- a/libgomp/testsuite/libgomp.c/target-critical-1.c +++ b/libgomp/testsuite/libgomp.c/target-critical-1.c @@ -1,4 +1,5 @@ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #include <omp.h> #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/target-teams-1.c b/libgomp/testsuite/libgomp.c/target-teams-1.c index 8f591e0..b824eac 100644 --- a/libgomp/testsuite/libgomp.c/target-teams-1.c +++ b/libgomp/testsuite/libgomp.c/target-teams-1.c @@ -1,4 +1,5 @@ /* { dg-do run } */ +/* { dg-additional-options "-Wno-hsa" } */ #include <omp.h> #include <stdlib.h> diff --git a/libgomp/testsuite/libgomp.c/thread-limit-2.c b/libgomp/testsuite/libgomp.c/thread-limit-2.c index 1a97fb6..8b4c79c 100644 --- a/libgomp/testsuite/libgomp.c/thread-limit-2.c +++ b/libgomp/testsuite/libgomp.c/thread-limit-2.c @@ -1,5 +1,6 @@ /* { dg-do run } */ /* { dg-set-target-env-var OMP_THREAD_LIMIT "9" } */ +/* { dg-additional-options "-Wno-hsa" } */ #include <stdlib.h> #include <unistd.h> diff --git a/libgomp/testsuite/libgomp.c/thread-limit-3.c b/libgomp/testsuite/libgomp.c/thread-limit-3.c index af9bd78..74a36e7 100644 --- a/libgomp/testsuite/libgomp.c/thread-limit-3.c +++ b/libgomp/testsuite/libgomp.c/thread-limit-3.c @@ -1,3 +1,5 @@ +/* { dg-additional-options "-Wno-hsa" } */ + #include <stdlib.h> #include <omp.h> diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/async_target-1.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/async_target-1.f90 index c3849de..263d570 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/async_target-1.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/async_target-1.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } module e_55_1_mod integer, parameter :: N = 100000, CHUNKSZ = 10000 diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/async_target-2.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/async_target-2.f90 index b12b0ea..f5eb05a 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/async_target-2.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/async_target-2.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } ! { dg-require-effective-target offload_device } subroutine init (v1, v2, N) diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-2.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-2.f90 index 5bc900c..97aee81 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-2.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-2.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } program e_53_2 !$omp declare target (fib) diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-3.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-3.f90 index fffbb7f..bc68176 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-3.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-3.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } module e_53_3_mod !$omp declare target (N, p, v1, v2) diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-4.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-4.f90 index 41d251a..9c5332a 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-4.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-4.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } module e_53_4_mod !$omp declare target (N, Q) diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-5.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-5.f90 index 06eae0a..874c818 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-5.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/declare_target-5.f90 @@ -1,5 +1,5 @@ ! { dg-do run { target vect_simd_clones } } -! { dg-options "-O2" } +! { dg-options "-O2 -Wno-hsa" } ! { dg-additional-options "-msse2" { target sse2_runtime } } ! { dg-additional-options "-mavx" { target avx_runtime } } diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target-1.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target-1.f90 index 76e9068..cdca19f 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/target-1.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/target-1.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } module e_50_1_mod contains diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target-2.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target-2.f90 index af469f4..df793c2 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/target-2.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/target-2.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } module e_50_2_mod contains diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target-3.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target-3.f90 index 9754704..7e23565 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/target-3.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/target-3.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } module e_50_3_mod contains diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target-4.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target-4.f90 index f94794e..f066e11 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/target-4.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/target-4.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } module e_50_4_mod contains diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-1.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-1.f90 index 98e5c0b..960b83d 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-1.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-1.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } module e_51_1_mod contains diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-2.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-2.f90 index 360cded..ee8f25a 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-2.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-2.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } module e_51_2_mod contains diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-3.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-3.f90 index a3d9c18..3afd5b7 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-3.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-3.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } module e_51_3_mod contains diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-4.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-4.f90 index e9de6ae..285acd1 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-4.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-4.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } module e_51_4_mod contains diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-5.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-5.f90 index 01a41ad..6c075c5 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/target_data-5.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/target_data-5.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } module e_51_5_mod contains diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target_update-1.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target_update-1.f90 index e23c0bb..40cf425 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/target_update-1.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/target_update-1.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } module e_52_1_mod contains diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/target_update-2.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/target_update-2.f90 index 3735e53..b7ed423 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/target_update-2.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/target_update-2.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } module e_52_2_mod contains diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/teams-2.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/teams-2.f90 index 6a83018..7a292af 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/teams-2.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/teams-2.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } function dotprod_ref (B, C, N) result (sum) implicit none diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/teams-3.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/teams-3.f90 index 9de77af..54b805a 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/teams-3.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/teams-3.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } function dotprod_ref (B, C, N) result (sum) implicit none diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/teams-4.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/teams-4.f90 index 8d4eb55..93a03fa 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/teams-4.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/teams-4.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } function dotprod_ref (B, C, N) result (sum) implicit none diff --git a/libgomp/testsuite/libgomp.fortran/examples-4/teams-6.f90 b/libgomp/testsuite/libgomp.fortran/examples-4/teams-6.f90 index f791188..2ba15d9 100644 --- a/libgomp/testsuite/libgomp.fortran/examples-4/teams-6.f90 +++ b/libgomp/testsuite/libgomp.fortran/examples-4/teams-6.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } module e_54_6_mod contains diff --git a/libgomp/testsuite/libgomp.fortran/nestedfn5.f90 b/libgomp/testsuite/libgomp.fortran/nestedfn5.f90 index f67bd47..105f6c7 100644 --- a/libgomp/testsuite/libgomp.fortran/nestedfn5.f90 +++ b/libgomp/testsuite/libgomp.fortran/nestedfn5.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } interface subroutine bar (q) diff --git a/libgomp/testsuite/libgomp.fortran/pr66199-2.f90 b/libgomp/testsuite/libgomp.fortran/pr66199-2.f90 index ad11ead..adae65b 100644 --- a/libgomp/testsuite/libgomp.fortran/pr66199-2.f90 +++ b/libgomp/testsuite/libgomp.fortran/pr66199-2.f90 @@ -1,6 +1,6 @@ ! PR middle-end/66199 ! { dg-do run } -! { dg-options "-O2 -fopenmp" } +! { dg-options "-O2 -fopenmp -Wno-hsa" } integer :: u(1024), v(1024), w(1024), a, b, c, d, e, a1, b1, a2, b2, d1, d2 a = 1 diff --git a/libgomp/testsuite/libgomp.fortran/target1.f90 b/libgomp/testsuite/libgomp.fortran/target1.f90 index c70daac..48a66b7 100644 --- a/libgomp/testsuite/libgomp.fortran/target1.f90 +++ b/libgomp/testsuite/libgomp.fortran/target1.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } module target1 contains diff --git a/libgomp/testsuite/libgomp.fortran/target4.f90 b/libgomp/testsuite/libgomp.fortran/target4.f90 index aa2f0a5..cff339b 100644 --- a/libgomp/testsuite/libgomp.fortran/target4.f90 +++ b/libgomp/testsuite/libgomp.fortran/target4.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } module target4 contains diff --git a/libgomp/testsuite/libgomp.fortran/target5.f90 b/libgomp/testsuite/libgomp.fortran/target5.f90 index c46faf2..bc1f1e2 100644 --- a/libgomp/testsuite/libgomp.fortran/target5.f90 +++ b/libgomp/testsuite/libgomp.fortran/target5.f90 @@ -1,5 +1,5 @@ ! { dg-do compile } -! { dg-options "-fopenmp" } +! { dg-options "-fopenmp -Wno-hsa" } integer :: r r = 0 diff --git a/libgomp/testsuite/libgomp.fortran/target6.f90 b/libgomp/testsuite/libgomp.fortran/target6.f90 index 13f5a52..956343f 100644 --- a/libgomp/testsuite/libgomp.fortran/target6.f90 +++ b/libgomp/testsuite/libgomp.fortran/target6.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } module target6 contains diff --git a/libgomp/testsuite/libgomp.fortran/target7.f90 b/libgomp/testsuite/libgomp.fortran/target7.f90 index 0c977c4..94221b8 100644 --- a/libgomp/testsuite/libgomp.fortran/target7.f90 +++ b/libgomp/testsuite/libgomp.fortran/target7.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } interface real function foo (x) diff --git a/libgomp/testsuite/libgomp.fortran/target8.f90 b/libgomp/testsuite/libgomp.fortran/target8.f90 index 0564e90..83263d4 100644 --- a/libgomp/testsuite/libgomp.fortran/target8.f90 +++ b/libgomp/testsuite/libgomp.fortran/target8.f90 @@ -1,4 +1,5 @@ ! { dg-do run } +! { dg-additional-options "-Wno-hsa" } integer, parameter :: n = 1000 integer, parameter :: c = 100