Skip to content

Commit 1216de9

Browse files
committed
[offload] Move additional plugin dependencies to add_target_library
Move the dependencies on `LLVMFrontendOffloading` and `LLVMProfileData` from amdgpu and common, respectively, to the base `add_target_library()` macro. This means we can take advantage of LINK_COMPONENTS and do not have to add extra complexity to handle dylib and standalone builds.
1 parent daf4503 commit 1216de9

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

offload/plugins-nextgen/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ function(add_target_library target_name lib_name)
1212
CodeGen
1313
Core
1414
Extensions
15+
FrontendOffloading
1516
InstCombine
1617
Instrumentation
1718
IPO
@@ -20,6 +21,7 @@ function(add_target_library target_name lib_name)
2021
MC
2122
Object
2223
Passes
24+
ProfileData
2325
Remarks
2426
ScalarOpts
2527
Support

offload/plugins-nextgen/amdgpu/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ target_include_directories(omptarget.rtl.amdgpu PRIVATE
1010

1111
if(hsa-runtime64_FOUND AND NOT "amdgpu" IN_LIST LIBOMPTARGET_DLOPEN_PLUGINS)
1212
message(STATUS "Building AMDGPU plugin linked against libhsa")
13-
target_link_libraries(omptarget.rtl.amdgpu PRIVATE hsa-runtime64::hsa-runtime64 LLVMFrontendOffloading)
13+
target_link_libraries(omptarget.rtl.amdgpu PRIVATE hsa-runtime64::hsa-runtime64)
1414
else()
1515
message(STATUS "Building AMDGPU plugin for dlopened libhsa")
1616
target_include_directories(omptarget.rtl.amdgpu PRIVATE dynamic_hsa)
1717
target_sources(omptarget.rtl.amdgpu PRIVATE dynamic_hsa/hsa.cpp)
18-
target_link_libraries(omptarget.rtl.amdgpu PRIVATE LLVMFrontendOffloading)
1918
endif()
2019

2120
# Configure testing for the AMDGPU plugin. We will build tests if we could a

offload/plugins-nextgen/common/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ add_library(PluginCommon OBJECT
77
src/RPC.cpp
88
src/Utils/ELF.cpp
99
)
10-
add_dependencies(PluginCommon intrinsics_gen LLVMProfileData)
10+
add_dependencies(PluginCommon intrinsics_gen)
1111

1212
# Only enable JIT for those targets that LLVM can support.
1313
set(supported_jit_targets AMDGPU NVPTX)
@@ -43,7 +43,6 @@ target_compile_definitions(PluginCommon PRIVATE
4343

4444
target_compile_options(PluginCommon PUBLIC ${offload_compile_flags})
4545
target_link_options(PluginCommon PUBLIC ${offload_link_flags})
46-
target_link_libraries(PluginCommon PRIVATE LLVMProfileData)
4746

4847
target_include_directories(PluginCommon PUBLIC
4948
${CMAKE_CURRENT_SOURCE_DIR}/include

0 commit comments

Comments
 (0)