summaryrefslogtreecommitdiffstats
path: root/libgomp
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2022-04-06 10:39:56 +0200
committerThomas Schwinge <thomas@codesourcery.com>2022-05-11 14:24:21 +0200
commit2e309a4eff80e55b53d32d26926a2a94eabfea21 (patch)
tree0c05f284b58dcea83b4e6603443b74edce003823 /libgomp
parentdocs: document --with-zstd (diff)
downloadgcc-2e309a4eff80e55b53d32d26926a2a94eabfea21.tar.gz
gcc-2e309a4eff80e55b53d32d26926a2a94eabfea21.tar.bz2
gcc-2e309a4eff80e55b53d32d26926a2a94eabfea21.tar.xz
libgomp testsuite: Don't amend 'LD_LIBRARY_PATH' for system-provided HSA Runtime library
This is only active if GCC is 'configure'd with '--with-hsa-runtime=[...]' or '--with-hsa-runtime-lib=[...]' -- which nobody really is doing, as far as I can tell. 'libgomp/testsuite/lib/libgomp.exp:libgomp_init' states: # For build-tree testing, also consider the library paths used for builing. # For installed testing, we assume all that to be provided in the sysroot. if { $blddir != "" } { [...] global hsa_runtime_lib if { $hsa_runtime_lib != "" } { append always_ld_library_path ":$hsa_runtime_lib" } } However, the libgomp GCN plugin is unconditionally built against the GCC-shipped 'include/hsa*.h' header files, and at run time does 'dlopen("libhsa-runtime64.so.1")', so there is no system-provided HSA Runtime library "used for builing". It thus doesn't make sense to amend 'LD_LIBRARY_PATH' for system-provided HSA Runtime library. libgomp/ * testsuite/lib/libgomp.exp (libgomp_init): Don't 'append always_ld_library_path ":$hsa_runtime_lib"'. * testsuite/libgomp-test-support.exp.in (hsa_runtime_lib): Don't set.
Diffstat (limited to 'libgomp')
-rw-r--r--libgomp/testsuite/lib/libgomp.exp4
-rw-r--r--libgomp/testsuite/libgomp-test-support.exp.in1
2 files changed, 0 insertions, 5 deletions
diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index 8c5ecfff0ac..0aaa58f19c5 100644
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -202,10 +202,6 @@ proc libgomp_init { args } {
202 lappend ALWAYS_CFLAGS "additional_flags=-L$cuda_driver_lib" 202 lappend ALWAYS_CFLAGS "additional_flags=-L$cuda_driver_lib"
203 append always_ld_library_path ":$cuda_driver_lib" 203 append always_ld_library_path ":$cuda_driver_lib"
204 } 204 }
205 global hsa_runtime_lib
206 if { $hsa_runtime_lib != "" } {
207 append always_ld_library_path ":$hsa_runtime_lib"
208 }
209 } 205 }
210 206
211 # We use atomic operations in the testcases to validate results. 207 # We use atomic operations in the testcases to validate results.
diff --git a/libgomp/testsuite/libgomp-test-support.exp.in b/libgomp/testsuite/libgomp-test-support.exp.in
index 98fb442b537..3c88d1d5a62 100644
--- a/libgomp/testsuite/libgomp-test-support.exp.in
+++ b/libgomp/testsuite/libgomp-test-support.exp.in
@@ -1,6 +1,5 @@
1set cuda_driver_include "@CUDA_DRIVER_INCLUDE@" 1set cuda_driver_include "@CUDA_DRIVER_INCLUDE@"
2set cuda_driver_lib "@CUDA_DRIVER_LIB@" 2set cuda_driver_lib "@CUDA_DRIVER_LIB@"
3set hsa_runtime_lib "@HSA_RUNTIME_LIB@"
4 3
5set offload_plugins "@offload_plugins@" 4set offload_plugins "@offload_plugins@"
6set offload_targets "@offload_targets@" 5set offload_targets "@offload_targets@"