Remove directly linking to HIP and HSA runtimes (#373)
- librocprofiler-sdk.so no longer directly links to HIP runtime library (libamdhip64.so)
- librocprofiler-sdk.so no longer directly links to HSA runtime library (libhsa-runtime64.so)
- librocprofiler-sdk.so does directly link to AQL profile library (libhsa-amd-aqlprofile64.so) so HSA runtime library is still in DT_NEEDED
- This needs to be fixed eventually so rocprofiler-sdk library can be independent of HSA and HIP runtimes
[ROCm/rocprofiler-sdk commit: 57113e98c9]
This commit is contained in:
committed by
GitHub
parent
b3afc6c1ea
commit
c4a749d99e
@@ -37,9 +37,9 @@ target_link_libraries(
|
||||
$<BUILD_INTERFACE:rocprofiler::rocprofiler-glog>
|
||||
$<BUILD_INTERFACE:rocprofiler::rocprofiler-fmt>
|
||||
$<BUILD_INTERFACE:rocprofiler::rocprofiler-dl>
|
||||
$<BUILD_INTERFACE:rocprofiler::rocprofiler-hip>
|
||||
$<BUILD_INTERFACE:rocprofiler::rocprofiler-hip-nolink>
|
||||
$<BUILD_INTERFACE:rocprofiler::rocprofiler-amd-comgr>
|
||||
$<BUILD_INTERFACE:rocprofiler::rocprofiler-hsa-runtime>
|
||||
$<BUILD_INTERFACE:rocprofiler::rocprofiler-hsa-runtime-nolink>
|
||||
$<BUILD_INTERFACE:rocprofiler::rocprofiler-ptl>
|
||||
$<BUILD_INTERFACE:rocprofiler::rocprofiler-hsa-aql>
|
||||
$<BUILD_INTERFACE:rocprofiler::rocprofiler-drm>)
|
||||
|
||||
@@ -43,8 +43,8 @@ add_subdirectory(pc_sampling)
|
||||
|
||||
target_link_libraries(
|
||||
rocprofiler-object-library
|
||||
PUBLIC rocprofiler::rocprofiler-headers rocprofiler::rocprofiler-hsa-runtime
|
||||
rocprofiler::rocprofiler-hip
|
||||
PUBLIC rocprofiler::rocprofiler-headers rocprofiler::rocprofiler-hip-nolink
|
||||
rocprofiler::rocprofiler-hsa-runtime-nolink
|
||||
PRIVATE rocprofiler::rocprofiler-build-flags
|
||||
rocprofiler::rocprofiler-memcheck
|
||||
rocprofiler::rocprofiler-common-library
|
||||
@@ -69,9 +69,12 @@ target_sources(rocprofiler-shared-library
|
||||
PRIVATE $<TARGET_OBJECTS:rocprofiler::rocprofiler-object-library>)
|
||||
target_link_libraries(
|
||||
rocprofiler-shared-library
|
||||
INTERFACE rocprofiler::rocprofiler-headers rocprofiler::rocprofiler-hsa-runtime
|
||||
rocprofiler::rocprofiler-hip
|
||||
PRIVATE rocprofiler::rocprofiler-build-flags
|
||||
INTERFACE rocprofiler::rocprofiler-headers
|
||||
$<BUILD_INTERFACE:rocprofiler::rocprofiler-hsa-runtime-nolink>
|
||||
$<BUILD_INTERFACE:rocprofiler::rocprofiler-hip-nolink>
|
||||
PRIVATE rocprofiler::rocprofiler-hsa-runtime-nolink
|
||||
rocprofiler::rocprofiler-hip-nolink
|
||||
rocprofiler::rocprofiler-build-flags
|
||||
rocprofiler::rocprofiler-memcheck
|
||||
rocprofiler::rocprofiler-common-library
|
||||
rocprofiler::rocprofiler-cxx-filesystem
|
||||
@@ -110,8 +113,8 @@ target_sources(rocprofiler-static-library
|
||||
PRIVATE $<TARGET_OBJECTS:rocprofiler::rocprofiler-object-library>)
|
||||
target_link_libraries(
|
||||
rocprofiler-static-library
|
||||
PUBLIC rocprofiler::rocprofiler-headers rocprofiler::rocprofiler-hsa-runtime
|
||||
rocprofiler::rocprofiler-hip
|
||||
PUBLIC rocprofiler::rocprofiler-headers rocprofiler::rocprofiler-hsa-runtime-nolink
|
||||
rocprofiler::rocprofiler-hip-nolink
|
||||
PRIVATE rocprofiler::rocprofiler-common-library
|
||||
rocprofiler::rocprofiler-object-library)
|
||||
|
||||
|
||||
@@ -18,7 +18,8 @@ target_sources(rocprofiler-lib-tests PRIVATE ${rocprofiler_lib_sources} details/
|
||||
target_link_libraries(
|
||||
rocprofiler-lib-tests
|
||||
PRIVATE rocprofiler::rocprofiler-static-library
|
||||
rocprofiler::rocprofiler-common-library GTest::gtest GTest::gtest_main)
|
||||
rocprofiler::rocprofiler-common-library rocprofiler::rocprofiler-hsa-runtime
|
||||
GTest::gtest GTest::gtest_main)
|
||||
|
||||
gtest_add_tests(
|
||||
TARGET rocprofiler-lib-tests
|
||||
@@ -42,7 +43,8 @@ target_sources(rocprofiler-lib-tests-shared PRIVATE ${rocprofiler_shared_lib_sou
|
||||
target_link_libraries(
|
||||
rocprofiler-lib-tests-shared
|
||||
PRIVATE rocprofiler::rocprofiler-shared-library
|
||||
rocprofiler::rocprofiler-common-library GTest::gtest GTest::gtest_main)
|
||||
rocprofiler::rocprofiler-common-library rocprofiler::rocprofiler-hsa-runtime
|
||||
GTest::gtest GTest::gtest_main)
|
||||
|
||||
gtest_add_tests(
|
||||
TARGET rocprofiler-lib-tests-shared
|
||||
|
||||
Reference in New Issue
Block a user