Author: Joseph Huber Date: 2023-02-14T09:00:25+01:00 New Revision: 6d859df46e93e04bd7a4f90d9a9056763998f638
URL: https://github.com/llvm/llvm-project/commit/6d859df46e93e04bd7a4f90d9a9056763998f638 DIFF: https://github.com/llvm/llvm-project/commit/6d859df46e93e04bd7a4f90d9a9056763998f638.diff LOG: [Libomptarget] Remove dependency on the DeviceRTL from the GPU plugins The GPU plugins have a dependency on the device libraries. Sometimes we cannot build the device libraries because the user does not have a valid `clang` to use or it was explicitly disabled. Currently this leads to a transitive failure because we cannot meet this dependency. This patch simply removes that dependency. Fixes https://github.com/llvm/llvm-project/issues/60457 Reviewed By: tianshilei1992 Differential Revision: https://reviews.llvm.org/D143196 (cherry picked from commit 9f650ae779b4d7e033f5f17290aad50e935424d2) Added: Modified: openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt openmp/libomptarget/plugins/amdgpu/CMakeLists.txt openmp/libomptarget/plugins/cuda/CMakeLists.txt Removed: ################################################################################ diff --git a/openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt b/openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt index b469850297ecc..8f234eebe1e4a 100644 --- a/openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt +++ b/openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt @@ -90,7 +90,6 @@ add_llvm_library(omptarget.rtl.amdgpu.nextgen SHARED NO_INSTALL_RPATH ) -add_dependencies(omptarget.rtl.amdgpu.nextgen omptarget.devicertl.amdgpu) target_include_directories( omptarget.rtl.amdgpu.nextgen diff --git a/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt b/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt index 02cf47b405caf..da19ec3e7d2dd 100644 --- a/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt +++ b/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt @@ -85,7 +85,6 @@ else() NO_INSTALL_RPATH ) endif() -add_dependencies(omptarget.rtl.cuda.nextgen omptarget.devicertl.nvptx) # Install plugin under the lib destination folder. install(TARGETS omptarget.rtl.cuda.nextgen LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}") diff --git a/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt b/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt index 4d8f9050fd004..1619f1e451af2 100644 --- a/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt +++ b/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt @@ -90,7 +90,6 @@ add_llvm_library(omptarget.rtl.amdgpu SHARED NO_INSTALL_RPATH ) -add_dependencies(omptarget.rtl.amdgpu omptarget.devicertl.amdgpu) target_include_directories( omptarget.rtl.amdgpu diff --git a/openmp/libomptarget/plugins/cuda/CMakeLists.txt b/openmp/libomptarget/plugins/cuda/CMakeLists.txt index 520c6b0365de2..6d0b767cecbb3 100644 --- a/openmp/libomptarget/plugins/cuda/CMakeLists.txt +++ b/openmp/libomptarget/plugins/cuda/CMakeLists.txt @@ -82,7 +82,6 @@ else() NO_INSTALL_RPATH ) endif() -add_dependencies(omptarget.rtl.cuda omptarget.devicertl.nvptx) # Install plugin under the lib destination folder. install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}") _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
