[Openmp-commits] [openmp] cee08ff - [Libomptarget] Do not pass 'nogpulib' to the non-LTO Nvidia tests (#70327)

[via Openmp-commits]

Author: Joseph Huber
Date: 2023-10-26T10:36:34-05:00
New Revision: cee08ff342f39f8cd2b3b66f48ecb33d8b5efe65

URL: https://github.com/llvm/llvm-project/commit/cee08ff342f39f8cd2b3b66f48ecb33d8b5efe65
DIFF: https://github.com/llvm/llvm-project/commit/cee08ff342f39f8cd2b3b66f48ecb33d8b5efe65.diff

LOG: [Libomptarget] Do not pass 'nogpulib' to the non-LTO Nvidia tests (#70327)

Summary:
For the other tests we pass `-nogpulib` to ensure that we set up the
needed libraries correctly. However, this caused problems for the
non-LTO build and test of Nvidia systems. In general this is because we
would do a separate compile of the libomptarget device runtime and then
link in that cubin. This exercised the runtime in a lot of ways it's not
used to, since doing things this way was hardly expected or tested. This
patch disables it only for the Nvidia non-LTO build so that we still get
the effect of `--liboimptarget-nvptx-bc-path` rather than ignoring it.

Added: 
    

Modified: 
    openmp/libomptarget/test/lit.cfg

Removed: 
    


################################################################################
diff  --git a/openmp/libomptarget/test/lit.cfg b/openmp/libomptarget/test/lit.cfg
index 80a3c10d3a949f5..6dab31bd35a9f31 100644
--- a/openmp/libomptarget/test/lit.cfg
+++ b/openmp/libomptarget/test/lit.cfg
@@ -128,7 +128,8 @@ elif config.operating_system == 'Darwin':
     config.test_flags += " -Wl,-rpath," + config.library_dir
     config.test_flags += " -Wl,-rpath," + config.omp_host_rtl_directory
 else: # Unices
-    config.test_flags += " -nogpulib"
+    if config.libomptarget_current_target != "nvptx64-nvidia-cuda":
+        config.test_flags += " -nogpulib"
     config.test_flags += " -Wl,-rpath," + config.library_dir
     config.test_flags += " -Wl,-rpath," + config.omp_host_rtl_directory
     config.test_flags += " -Wl,-rpath," + config.llvm_lib_directory