From 9f650ae779b4d7e033f5f17290aad50e935424d2 Mon Sep 17 00:00:00 2001 From: Joseph Huber Date: Thu, 2 Feb 2023 10:58:16 -0600 Subject: [PATCH] [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 --- openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt | 1 - openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt | 1 - openmp/libomptarget/plugins/amdgpu/CMakeLists.txt | 1 - openmp/libomptarget/plugins/cuda/CMakeLists.txt | 1 - 4 files changed, 4 deletions(-) diff --git a/openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt b/openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt index c59a9e3..b813497 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 63359c0..6b7d2d7 100644 --- a/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt +++ b/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt @@ -51,7 +51,6 @@ else() target_include_directories(omptarget.rtl.cuda.nextgen PRIVATE ../../plugins/cuda/dynamic_cuda) target_sources(omptarget.rtl.cuda.nextgen PRIVATE ../../plugins/cuda/dynamic_cuda/cuda.cpp) endif() -add_dependencies(omptarget.rtl.cuda.nextgen omptarget.devicertl.nvptx) # Define debug prefix. TODO: This should be automatized in the Debug.h but it # requires changing the original plugins. diff --git a/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt b/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt index 2d7d0ca..7462b4c 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 b144272..d330291 100644 --- a/openmp/libomptarget/plugins/cuda/CMakeLists.txt +++ b/openmp/libomptarget/plugins/cuda/CMakeLists.txt @@ -50,7 +50,6 @@ else() target_include_directories(omptarget.rtl.cuda PRIVATE dynamic_cuda) target_sources(omptarget.rtl.cuda PRIVATE dynamic_cuda/cuda.cpp) endif() -add_dependencies(omptarget.rtl.cuda omptarget.devicertl.nvptx) # Define the suffix for the runtime messaging dumps. target_compile_definitions(omptarget.rtl.cuda PRIVATE TARGET_NAME="CUDA") -- 2.7.4