From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1729) id 653A33850227; Wed, 29 Jun 2022 14:47:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 653A33850227 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Kwok Yeung To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-12] libgomp testsuite: Don't amend 'LD_LIBRARY_PATH' for system-provided HSA Runtime library X-Act-Checkin: gcc X-Git-Author: Thomas Schwinge X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: 270bfaf9addc79163a7f170e8da01c2579bc5a5f X-Git-Newrev: cb3cdd60f6b3ca9a354cdcaf4be024142473d215 Message-Id: <20220629144742.653A33850227@sourceware.org> Date: Wed, 29 Jun 2022 14:47:42 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jun 2022 14:47:42 -0000 https://gcc.gnu.org/g:cb3cdd60f6b3ca9a354cdcaf4be024142473d215 commit cb3cdd60f6b3ca9a354cdcaf4be024142473d215 Author: Thomas Schwinge Date: Wed Apr 6 10:39:56 2022 +0200 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. (cherry picked from commit 2e309a4eff80e55b53d32d26926a2a94eabfea21) Diff: --- libgomp/ChangeLog.omp | 9 +++++++++ libgomp/testsuite/lib/libgomp.exp | 4 ---- libgomp/testsuite/libgomp-test-support.exp.in | 1 - 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index b5557c5e951..fe766716ae1 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,12 @@ +2022-04-06 Thomas Schwinge + + Backport from mainline: + 2022-04-06 Thomas Schwinge + + * 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 Backport from mainline: 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 } { 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 98fb442b537..3c88d1d5a62 100644 --- 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@"