Hi, On Fri, Feb 26, 2016 at 05:07:56PM +0100, Jakub Jelinek wrote: > 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.
... > > 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). > as Jakub requested, this patch deals with HSA "excess errors" in the libgomp library testsuite by passing -Wno-hsa to all of them. IIUC, that passing it in the second parameter of dg-runtest (as opposed to the third) means that it will apply even tests that have their own dg-options, which is presumably easier for everyone, provided that hsa will get is own libgomp testsuite directories. OK for trunk? Thanks, Martin 2016-02-29 Martin Jambor <[email protected]> * testsuite/libgomp.c/c.exp: Pass -Wno-hsa to all tests. * testsuite/libgomp.c++/c++.exp: Likewise. * testsuite/libgomp.fortran/fortran.exp: Likewise. --- libgomp/testsuite/libgomp.c++/c++.exp | 2 +- libgomp/testsuite/libgomp.c/c.exp | 2 +- libgomp/testsuite/libgomp.fortran/fortran.exp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libgomp/testsuite/libgomp.c++/c++.exp b/libgomp/testsuite/libgomp.c++/c++.exp index 0454f95..120e573 100644 --- a/libgomp/testsuite/libgomp.c++/c++.exp +++ b/libgomp/testsuite/libgomp.c++/c++.exp @@ -65,7 +65,7 @@ if { $lang_test_file_found } { } # Main loop. - dg-runtest $tests "" "$libstdcxx_includes $DEFAULT_CFLAGS" + dg-runtest $tests "-Wno-hsa" "$libstdcxx_includes $DEFAULT_CFLAGS" } # All done. diff --git a/libgomp/testsuite/libgomp.c/c.exp b/libgomp/testsuite/libgomp.c/c.exp index 300b921..d3cd144 100644 --- a/libgomp/testsuite/libgomp.c/c.exp +++ b/libgomp/testsuite/libgomp.c/c.exp @@ -31,7 +31,7 @@ append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST] set_ld_library_path_env_vars # Main loop. -dg-runtest $tests "" $DEFAULT_CFLAGS +dg-runtest $tests "-Wno-hsa" $DEFAULT_CFLAGS # All done. dg-finish diff --git a/libgomp/testsuite/libgomp.fortran/fortran.exp b/libgomp/testsuite/libgomp.fortran/fortran.exp index 9e6b643..ea84d5c 100644 --- a/libgomp/testsuite/libgomp.fortran/fortran.exp +++ b/libgomp/testsuite/libgomp.fortran/fortran.exp @@ -66,7 +66,7 @@ if { $lang_test_file_found } { # For Fortran we're doing torture testing, as Fortran has far more tests # with arrays etc. that testing just -O0 or -O2 is insufficient, that is # typically not the case for C/C++. - gfortran-dg-runtest $tests "" "" + gfortran-dg-runtest $tests "-Wno-hsa" "" } # All done. -- 2.7.1
