libgomp testsuite: Don't amend 'LD_LIBRARY_PATH' for system-provided HSA Runtime...

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.

(cherry picked from commit 2e309a4eff80e55b53d32d26926a2a94eabfea21)

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index b5557c5e95191250bc837b1d5f32b594f8bc369a..fe766716ae1b01e1e990c0f76c57c888e17fc311 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,12 @@
+2022-04-06  Thomas Schwinge  <thomas@codesourcery.com>
+
+       Backport from mainline:
+       2022-04-06  Thomas Schwinge  <thomas@codesourcery.com>
+
+       * 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.
+
 2022-05-10  Thomas Schwinge  <thomas@codesourcery.com>
 
        Backport from mainline:

diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index 8c5ecfff0acd3977424efb565cf96e85d0b73c6f..0aaa58f19c55ff1fcf17c7bf0a25e0531798bf9c 100644 (file)
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -202,10 +202,6 @@ proc libgomp_init { args } {
            lappend ALWAYS_CFLAGS "additional_flags=-L$cuda_driver_lib"
            append always_ld_library_path ":$cuda_driver_lib"
        }
-       global hsa_runtime_lib
-       if { $hsa_runtime_lib != "" } {
-           append always_ld_library_path ":$hsa_runtime_lib"
-       }
     }
 
     # 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 98fb442b5370e078e1e0d5c0c864774930d83a47..3c88d1d5a6216a381f5cd6c3fe6d3b244ebc7900 100644 (file)
--- a/libgomp/testsuite/libgomp-test-support.exp.in
+++ b/libgomp/testsuite/libgomp-test-support.exp.in
@@ -1,6 +1,5 @@
 set cuda_driver_include "@CUDA_DRIVER_INCLUDE@"
 set cuda_driver_lib "@CUDA_DRIVER_LIB@"
-set hsa_runtime_lib "@HSA_RUNTIME_LIB@"
 
 set offload_plugins "@offload_plugins@"
 set offload_targets "@offload_targets@"