caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[offload] Fix finding amdgpu/nvptx-arch to generate tests (#135072)

Browse Source 
PR #134713, which landed as 79cb6f05da, causes this on my test
systems:

```
-- Building AMDGPU plugin for dlopened libhsa
-- Not generating AMDGPU tests, no supported devices detected. Use 'LIBOMPTARGET_FORCE_AMDGPU_TESTS' to override.
-- Building CUDA plugin for dlopened libcuda
-- Not generating NVIDIA tests, no supported devices detected. Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.
```

The problem is it cannot locate amdgpu-arch and nvptx-arch. This patch
enables it to.

I suspect there is more cleanup to do here. amdgpu-arch and nvptx-arch
do not appear to exist as cmake targets anymore, but there is still
cmake code here that looks for those targets.
This commit is contained in:
Joel E. Denny
2025-04-09 15:54:29 -04:00
committed by GitHub
parent 46de0caed8
commit 5709506de0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
offload/cmake/Modules/LibomptargetGetDependencies.cmake
View File

@@ -51,7 +51,7 @@ if(TARGET nvptx-arch)
get_property(LIBOMPTARGET_NVPTX_ARCH TARGET nvptx-arch PROPERTY LOCATION)
else()
find_program(LIBOMPTARGET_NVPTX_ARCH NAMES nvptx-arch
PATHS ${LLVM_TOOLS_BINARY_DIR}/bin)
PATHS ${LLVM_TOOLS_BINARY_DIR})
endif()
if(LIBOMPTARGET_NVPTX_ARCH)
@@ -75,7 +75,7 @@ if(TARGET amdgpu-arch)
get_property(LIBOMPTARGET_AMDGPU_ARCH TARGET amdgpu-arch PROPERTY LOCATION)
else()
find_program(LIBOMPTARGET_AMDGPU_ARCH NAMES amdgpu-arch
PATHS ${LLVM_TOOLS_BINARY_DIR}/bin)
PATHS ${LLVM_TOOLS_BINARY_DIR})
endif()
if(LIBOMPTARGET_AMDGPU_ARCH)