AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate to rocprofiler-sdk:: namespace in CMake everywhere (#892)

Browse Source 
- remove all usage/support for rocprofiler:: namespace
This commit is contained in:
Jonathan R. Madsen
2024-05-29 22:28:43 -05:00
committed by GitHub
parent 5525b400c3
commit a76f61a0a3
41 changed files with 179 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/lib/rocprofiler-sdk/CMakeLists.txt
+33 -31
View File
@@ -31,7 +31,7 @@ set(ROCPROFILER_LIB_SOURCES
# ----------------------------------------------------------------------------------------#
add_library(rocprofiler-object-library OBJECT)
add_library(rocprofiler::rocprofiler-object-library ALIAS rocprofiler-object-library)
add_library(rocprofiler-sdk::rocprofiler-object-library ALIAS rocprofiler-object-library)
target_sources(rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_SOURCES}
${ROCPROFILER_LIB_HEADERS})
@@ -52,15 +52,15 @@ add_subdirectory(details)
target_link_libraries(
rocprofiler-object-library
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
rocprofiler::rocprofiler-amd-comgr
rocprofiler::rocprofiler-hsa-aql
rocprofiler::rocprofiler-drm
rocprofiler::rocprofiler-hsakmt-nolink)
PUBLIC rocprofiler-sdk::rocprofiler-headers rocprofiler-sdk::rocprofiler-hip-nolink
rocprofiler-sdk::rocprofiler-hsa-runtime-nolink
PRIVATE rocprofiler-sdk::rocprofiler-build-flags
rocprofiler-sdk::rocprofiler-memcheck
rocprofiler-sdk::rocprofiler-common-library
rocprofiler-sdk::rocprofiler-amd-comgr
rocprofiler-sdk::rocprofiler-hsa-aql
rocprofiler-sdk::rocprofiler-drm
rocprofiler-sdk::rocprofiler-hsakmt-nolink)
target_compile_definitions(rocprofiler-object-library PRIVATE rocprofiler_EXPORTS=1)
@@ -73,25 +73,26 @@ set_target_properties(rocprofiler-object-library PROPERTIES POSITION_INDEPENDENT
# ----------------------------------------------------------------------------------------#
add_library(rocprofiler-shared-library SHARED)
add_library(rocprofiler::rocprofiler-shared-library ALIAS rocprofiler-shared-library)
add_library(rocprofiler-sdk::rocprofiler-shared-library ALIAS rocprofiler-shared-library)
target_sources(
rocprofiler-shared-library
PRIVATE $<TARGET_OBJECTS:rocprofiler::rocprofiler-object-library> shared_library.cpp)
PRIVATE $<TARGET_OBJECTS:rocprofiler-sdk::rocprofiler-object-library>
shared_library.cpp)
target_link_libraries(
rocprofiler-shared-library
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
rocprofiler::rocprofiler-dl
rocprofiler::rocprofiler-amd-comgr
rocprofiler::rocprofiler-object-library)
INTERFACE rocprofiler-sdk::rocprofiler-headers
$<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-hsa-runtime-nolink>
$<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-hip-nolink>
PRIVATE rocprofiler-sdk::rocprofiler-hsa-runtime-nolink
rocprofiler-sdk::rocprofiler-hip-nolink
rocprofiler-sdk::rocprofiler-build-flags
rocprofiler-sdk::rocprofiler-memcheck
rocprofiler-sdk::rocprofiler-common-library
rocprofiler-sdk::rocprofiler-cxx-filesystem
rocprofiler-sdk::rocprofiler-dl
rocprofiler-sdk::rocprofiler-amd-comgr
rocprofiler-sdk::rocprofiler-object-library)
set_target_properties(
rocprofiler-shared-library
@@ -102,7 +103,7 @@ set_target_properties(
INSTALL_RPATH "\$ORIGIN"
DEFINE_SYMBOL rocprofiler_EXPORTS)
add_library(rocprofiler::rocprofiler-library ALIAS rocprofiler-shared-library)
add_library(rocprofiler-sdk::rocprofiler-library ALIAS rocprofiler-shared-library)
install(
TARGETS rocprofiler-shared-library
@@ -117,16 +118,17 @@ install(
# ----------------------------------------------------------------------------------------#
add_library(rocprofiler-static-library EXCLUDE_FROM_ALL STATIC)
add_library(rocprofiler::rocprofiler-static-library ALIAS rocprofiler-static-library)
add_library(rocprofiler-sdk::rocprofiler-static-library ALIAS rocprofiler-static-library)
target_sources(rocprofiler-static-library
PRIVATE $<TARGET_OBJECTS:rocprofiler::rocprofiler-object-library>)
PRIVATE $<TARGET_OBJECTS:rocprofiler-sdk::rocprofiler-object-library>)
target_link_libraries(
rocprofiler-static-library
PUBLIC rocprofiler::rocprofiler-headers rocprofiler::rocprofiler-hsa-runtime-nolink
rocprofiler::rocprofiler-hip-nolink
PRIVATE rocprofiler::rocprofiler-common-library
rocprofiler::rocprofiler-object-library)
PUBLIC rocprofiler-sdk::rocprofiler-headers
rocprofiler-sdk::rocprofiler-hsa-runtime-nolink
rocprofiler-sdk::rocprofiler-hip-nolink
PRIVATE rocprofiler-sdk::rocprofiler-common-library
rocprofiler-sdk::rocprofiler-object-library)
set_target_properties(
rocprofiler-static-library PROPERTIES OUTPUT_NAME rocprofiler-sdk DEFINE_SYMBOL
source/lib/rocprofiler-sdk/aql/tests/CMakeLists.txt
+3 -3
View File
@@ -10,9 +10,9 @@ target_sources(aql-test PRIVATE ${ROCPROFILER_LIB_AQL_TEST_SOURCES})
target_link_libraries(
aql-test
PRIVATE rocprofiler::rocprofiler-static-library rocprofiler::rocprofiler-glog
rocprofiler::rocprofiler-hsa-runtime rocprofiler::rocprofiler-hip
rocprofiler::rocprofiler-common-library GTest::gtest GTest::gtest_main)
PRIVATE rocprofiler-sdk::rocprofiler-static-library rocprofiler-sdk::rocprofiler-glog
rocprofiler-sdk::rocprofiler-hsa-runtime rocprofiler-sdk::rocprofiler-hip
rocprofiler-sdk::rocprofiler-common-library GTest::gtest GTest::gtest_main)
gtest_add_tests(
TARGET aql-test
source/lib/rocprofiler-sdk/counters/parser/CMakeLists.txt
+1 -1
View File
@@ -42,7 +42,7 @@ target_sources(rocprofiler-expr-parser PRIVATE ${expr_parser_sources})
target_include_directories(rocprofiler-expr-parser PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_definitions(rocprofiler-expr-parser PRIVATE YY_NO_INPUT)
target_link_libraries(rocprofiler-expr-parser
PRIVATE rocprofiler::rocprofiler-common-library)
PRIVATE rocprofiler-sdk::rocprofiler-common-library)
target_sources(rocprofiler-object-library
PUBLIC $<TARGET_OBJECTS:rocprofiler-expr-parser>)
source/lib/rocprofiler-sdk/counters/parser/tests/CMakeLists.txt
+2 -2
View File
@@ -10,8 +10,8 @@ target_sources(parser-test PRIVATE ${ROCPROFILER_LIB_PARSER_TEST_SOURCES})
target_link_libraries(
parser-test
PRIVATE rocprofiler::rocprofiler-common-library
rocprofiler::rocprofiler-static-library GTest::gtest GTest::gtest_main)
PRIVATE rocprofiler-sdk::rocprofiler-common-library
rocprofiler-sdk::rocprofiler-static-library GTest::gtest GTest::gtest_main)
gtest_add_tests(
TARGET parser-test
source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt
+3 -3
View File
@@ -53,9 +53,9 @@ add_dependencies(counter-test agent_hasco_targets)
target_link_libraries(
counter-test
PRIVATE rocprofiler::rocprofiler-hsa-runtime rocprofiler::rocprofiler-hip
rocprofiler::rocprofiler-common-library
rocprofiler::rocprofiler-static-library GTest::gtest GTest::gtest_main)
PRIVATE rocprofiler-sdk::rocprofiler-hsa-runtime rocprofiler-sdk::rocprofiler-hip
rocprofiler-sdk::rocprofiler-common-library
rocprofiler-sdk::rocprofiler-static-library GTest::gtest GTest::gtest_main)
gtest_add_tests(
TARGET counter-test
source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt
+6 -6
View File
@@ -18,8 +18,8 @@ target_include_directories(pcs_gfx9_test PRIVATE ${PCTEST_INCLUDE_DIR})
target_link_libraries(
pcs_gfx9_test
PRIVATE rocprofiler::rocprofiler-common-library
rocprofiler::rocprofiler-static-library GTest::gtest GTest::gtest_main)
PRIVATE rocprofiler-sdk::rocprofiler-common-library
rocprofiler-sdk::rocprofiler-static-library GTest::gtest GTest::gtest_main)
gtest_add_tests(
TARGET pcs_gfx9_test
@@ -36,8 +36,8 @@ target_include_directories(pcs_id_test PRIVATE ${PCTEST_INCLUDE_DIR})
target_link_libraries(
pcs_id_test
PRIVATE rocprofiler::rocprofiler-common-library
rocprofiler::rocprofiler-static-library GTest::gtest GTest::gtest_main)
PRIVATE rocprofiler-sdk::rocprofiler-common-library
rocprofiler-sdk::rocprofiler-static-library GTest::gtest GTest::gtest_main)
gtest_add_tests(
TARGET pcs_id_test
@@ -56,5 +56,5 @@ target_include_directories(pcs_bench_test PRIVATE ${PCTEST_INCLUDE_DIR})
target_link_libraries(
pcs_bench_test
PRIVATE rocprofiler::rocprofiler-common-library
rocprofiler::rocprofiler-static-library GTest::gtest GTest::gtest_main)
PRIVATE rocprofiler-sdk::rocprofiler-common-library
rocprofiler-sdk::rocprofiler-static-library GTest::gtest GTest::gtest_main)
source/lib/rocprofiler-sdk/pc_sampling/tests/CMakeLists.txt
+2 -2
View File
@@ -15,8 +15,8 @@ target_sources(pcs-test PRIVATE ${ROCPROFILER_LIB_PC_SAMPLING_TEST_SOURCES}
target_link_libraries(
pcs-test
PRIVATE rocprofiler::rocprofiler-common-library
rocprofiler::rocprofiler-static-library GTest::gtest GTest::gtest_main)
PRIVATE rocprofiler-sdk::rocprofiler-common-library
rocprofiler-sdk::rocprofiler-static-library GTest::gtest GTest::gtest_main)
gtest_add_tests(
TARGET pcs-test
source/lib/rocprofiler-sdk/tests/CMakeLists.txt
+8 -8
View File
@@ -18,9 +18,9 @@ add_executable(rocprofiler-lib-tests)
target_sources(rocprofiler-lib-tests PRIVATE ${rocprofiler_lib_sources} details/agent.cpp)
target_link_libraries(
rocprofiler-lib-tests
PRIVATE rocprofiler::rocprofiler-static-library
rocprofiler::rocprofiler-common-library rocprofiler::rocprofiler-hsa-runtime
GTest::gtest GTest::gtest_main)
PRIVATE rocprofiler-sdk::rocprofiler-static-library
rocprofiler-sdk::rocprofiler-common-library
rocprofiler-sdk::rocprofiler-hsa-runtime GTest::gtest GTest::gtest_main)
gtest_add_tests(
TARGET rocprofiler-lib-tests
@@ -44,11 +44,11 @@ add_executable(rocprofiler-lib-tests-shared)
target_sources(rocprofiler-lib-tests-shared PRIVATE ${rocprofiler_shared_lib_sources})
target_link_libraries(
rocprofiler-lib-tests-shared
PRIVATE rocprofiler::rocprofiler-shared-library
rocprofiler::rocprofiler-common-library
rocprofiler::rocprofiler-hsa-runtime
rocprofiler::rocprofiler-drm
rocprofiler::rocprofiler-sdk-roctx-shared-library
PRIVATE rocprofiler-sdk::rocprofiler-shared-library
rocprofiler-sdk::rocprofiler-common-library
rocprofiler-sdk::rocprofiler-hsa-runtime
rocprofiler-sdk::rocprofiler-drm
rocprofiler-sdk::rocprofiler-sdk-roctx-shared-library
GTest::gtest
GTest::gtest_main)
set_target_properties(rocprofiler-lib-tests-shared PROPERTIES BUILD_RPATH
source/lib/rocprofiler-sdk/thread_trace/tests/CMakeLists.txt
+3 -3
View File
@@ -10,9 +10,9 @@ target_sources(thread-trace-packet-test PRIVATE ${ROCPROFILER_THREAD_TRACE_TEST_
target_link_libraries(
thread-trace-packet-test
PRIVATE rocprofiler::rocprofiler-static-library rocprofiler::rocprofiler-glog
rocprofiler::rocprofiler-hsa-runtime rocprofiler::rocprofiler-hip
rocprofiler::rocprofiler-common-library GTest::gtest GTest::gtest_main)
PRIVATE rocprofiler-sdk::rocprofiler-static-library rocprofiler-sdk::rocprofiler-glog
rocprofiler-sdk::rocprofiler-hsa-runtime rocprofiler-sdk::rocprofiler-hip
rocprofiler-sdk::rocprofiler-common-library GTest::gtest GTest::gtest_main)
gtest_add_tests(
TARGET thread-trace-packet-test