[OpenMP] Fix incorrect CUDA bc path after library change

[jhuber6]

No description provided.

[llvmbot]

@llvm/pr-subscribers-offload

Author: Joseph Huber (jhuber6)

Changes

---

Full diff: https://github.com/llvm/llvm-project/pull/157547.diff

1 Files Affected:

• (modified) offload/test/lit.cfg (+1-1)

diff --git a/offload/test/lit.cfg b/offload/test/lit.cfg
index f3e8e9a66685e..a41bcb9c0d064 100644
--- a/offload/test/lit.cfg
+++ b/offload/test/lit.cfg
@@ -169,7 +169,7 @@ else: # Unices
     if config.cuda_libdir:
         config.test_flags += " -Wl,-rpath," + config.cuda_libdir
     if config.libomptarget_current_target.startswith('nvptx'):
-        config.test_flags_clang += " --libomptarget-nvptx-bc-path=" + config.llvm_library_intdir
+        config.test_flags_clang += " --libomptarget-nvptx-bc-path=" + config.llvm_library_intdir + "/nvptx64-nvidia-cuda"
     if config.libomptarget_current_target.endswith('-LTO'):
         config.test_flags += " -foffload-lto"
     if config.libomptarget_current_target.endswith('-JIT-LTO') and evaluate_bool_env(

[jdenny-ornl]

For me, config.llvm_library_intdir is /home/jdenny/llvm/build/lib. But the file that's needed is /home/jdenny/llvm/build/runtimes/runtimes-nvptx64-nvidia-cuda-bins/openmp/device/libomptarget-nvptx.bc. So the above doesn't fix the problem.

[shiltian]

I thought at one point we set the intermediate directory for those bitcode files explicitly to config.llvm_library_intdir.

[jhuber6]

That's not getting installed there? It's supposed to be installed to build/lib/nvptx64-nvidia-cuda but it's possible something's messed up.

[jhuber6]

This is a quick fix, likely what we want is to inform the runtimes which targets are active or something.

[jdenny-ornl]

$ ls build/lib/nvptx64-nvidia-cuda/
crt1.o  libc.a  libm.a  libompdevice.a

[jdenny-ornl]

I am not installing before testing. But I thought you were pointing to a build directory anyway.

[jhuber6]

Forgot to specify the output to the right place, should hopefully work now.

[jdenny-ornl]

A clean build (on my amd gpu system or nvidia gpu system) now fails with something like:

ninja: error: 'openmp/device/libomptarget-amdgpu.bc', needed by '/home/jdenny/llvm/build/lib/amdgcn-amd-amdhsa/libompdevice.a', missing and no known rule to make it

I have not pulled since this morning. I only applied your diff.

[jhuber6]

Should be fixed

[jdenny-ornl]

Works for me. Thanks.