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

- remove all usage/support for rocprofiler:: namespace

[ROCm/rocprofiler-sdk commit: a76f61a0a3]
This commit is contained in:
Jonathan R. Madsen
2024-05-29 22:28:43 -05:00
committed by GitHub
vanhempi ada9d97b78
commit 12ae4e6ce4
41 muutettua tiedostoa jossa 179 lisäystä ja 169 poistoa
@@ -19,7 +19,7 @@ set(common_headers
xml.hpp)
add_library(rocprofiler-common-library STATIC)
add_library(rocprofiler::rocprofiler-common-library ALIAS rocprofiler-common-library)
add_library(rocprofiler-sdk::rocprofiler-common-library ALIAS rocprofiler-common-library)
add_subdirectory(container)
add_subdirectory(memory)
@@ -30,17 +30,17 @@ target_include_directories(rocprofiler-common-library
target_link_libraries(
rocprofiler-common-library
PUBLIC $<BUILD_INTERFACE:rocprofiler::rocprofiler-headers>
$<BUILD_INTERFACE:rocprofiler::rocprofiler-build-flags>
$<BUILD_INTERFACE:rocprofiler::rocprofiler-threading>
$<BUILD_INTERFACE:rocprofiler::rocprofiler-memcheck>
$<BUILD_INTERFACE:rocprofiler::rocprofiler-cxx-filesystem>
$<BUILD_INTERFACE:rocprofiler::rocprofiler-glog>
$<BUILD_INTERFACE:rocprofiler::rocprofiler-fmt>
$<BUILD_INTERFACE:rocprofiler::rocprofiler-dl>
$<BUILD_INTERFACE:rocprofiler::rocprofiler-ptl>
$<BUILD_INTERFACE:rocprofiler::rocprofiler-atomic>
$<BUILD_INTERFACE:rocprofiler::rocprofiler-hsakmt-nolink>)
PUBLIC $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-headers>
$<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-build-flags>
$<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-threading>
$<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-memcheck>
$<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-cxx-filesystem>
$<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-glog>
$<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-fmt>
$<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-dl>
$<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-ptl>
$<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-atomic>
$<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-hsakmt-nolink>)
set_target_properties(rocprofiler-common-library PROPERTIES OUTPUT_NAME
rocprofiler-common)
@@ -19,7 +19,7 @@
set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "development")
add_library(rocprofiler-sdk-codeobj INTERFACE)
add_library(rocprofiler::rocprofiler-sdk-codeobj ALIAS rocprofiler-sdk-codeobj)
add_library(rocprofiler-sdk::rocprofiler-sdk-codeobj ALIAS rocprofiler-sdk-codeobj)
target_include_directories(
rocprofiler-sdk-codeobj
@@ -28,8 +28,8 @@ target_include_directories(
target_link_libraries(
rocprofiler-sdk-codeobj
INTERFACE rocprofiler::rocprofiler-amd-comgr rocprofiler::rocprofiler-dw
rocprofiler::rocprofiler-elf)
INTERFACE rocprofiler-sdk::rocprofiler-amd-comgr rocprofiler-sdk::rocprofiler-dw
rocprofiler-sdk::rocprofiler-elf)
if(ROCPROFILER_BUILD_TESTS)
add_subdirectory(tests)
@@ -8,14 +8,14 @@ target_sources(codeobj-library-test PRIVATE ${CODEOBJ_LIB_TEST_SOURCES})
target_link_libraries(
codeobj-library-test
PRIVATE rocprofiler::rocprofiler-static-library
rocprofiler::rocprofiler-glog
rocprofiler::rocprofiler-hsa-runtime
rocprofiler::rocprofiler-hip
rocprofiler::rocprofiler-common-library
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
rocprofiler::rocprofiler-sdk-codeobj)
rocprofiler-sdk::rocprofiler-sdk-codeobj)
gtest_add_tests(
TARGET codeobj-library-test
@@ -6,7 +6,7 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "roctx")
find_package(rocprofiler-register REQUIRED)
add_library(rocprofiler-sdk-roctx-shared-library SHARED)
add_library(rocprofiler::rocprofiler-sdk-roctx-shared-library ALIAS
add_library(rocprofiler-sdk::rocprofiler-sdk-roctx-shared-library ALIAS
rocprofiler-sdk-roctx-shared-library)
add_library(rocprofiler-sdk-roctx::rocprofiler-sdk-roctx-shared-library ALIAS
rocprofiler-sdk-roctx-shared-library)
@@ -19,9 +19,11 @@ target_include_directories(
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
target_link_libraries(
rocprofiler-sdk-roctx-shared-library
PRIVATE rocprofiler-register::rocprofiler-register rocprofiler::rocprofiler-headers
rocprofiler::rocprofiler-build-flags rocprofiler::rocprofiler-memcheck
rocprofiler::rocprofiler-common-library)
PRIVATE rocprofiler-register::rocprofiler-register
rocprofiler-sdk::rocprofiler-headers
rocprofiler-sdk::rocprofiler-build-flags
rocprofiler-sdk::rocprofiler-memcheck
rocprofiler-sdk::rocprofiler-common-library)
set_target_properties(
rocprofiler-sdk-roctx-shared-library
@@ -38,13 +38,13 @@ add_subdirectory(plugins)
target_link_libraries(
rocprofiler-sdk-tool
PRIVATE rocprofiler::rocprofiler-shared-library
rocprofiler::rocprofiler-headers
rocprofiler::rocprofiler-build-flags
rocprofiler::rocprofiler-memcheck
rocprofiler::rocprofiler-common-library
rocprofiler::rocprofiler-cereal
rocprofiler::rocprofiler-perfetto)
PRIVATE rocprofiler-sdk::rocprofiler-shared-library
rocprofiler-sdk::rocprofiler-headers
rocprofiler-sdk::rocprofiler-build-flags
rocprofiler-sdk::rocprofiler-memcheck
rocprofiler-sdk::rocprofiler-common-library
rocprofiler-sdk::rocprofiler-cereal
rocprofiler-sdk::rocprofiler-perfetto)
set_target_properties(
rocprofiler-sdk-tool
@@ -64,7 +64,7 @@ install(
add_executable(rocprofv3-trigger-list-metrics)
target_sources(rocprofv3-trigger-list-metrics PRIVATE rocprofv3_trigger_list_metrics.cpp)
target_link_libraries(rocprofv3-trigger-list-metrics
PRIVATE rocprofiler::rocprofiler-hsa-runtime)
PRIVATE rocprofiler-sdk::rocprofiler-hsa-runtime)
set_target_properties(
rocprofv3-trigger-list-metrics
PROPERTIES RUNTIME_OUTPUT_DIRECTORY
@@ -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
@@ -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
@@ -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>)
@@ -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
@@ -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
@@ -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)
@@ -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
@@ -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
@@ -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
@@ -11,8 +11,8 @@ add_executable(buffering-test)
target_sources(buffering-test PRIVATE ${buffering_sources})
target_link_libraries(
buffering-test
PRIVATE rocprofiler::rocprofiler-headers rocprofiler::rocprofiler-common-library
GTest::gtest GTest::gtest_main)
PRIVATE rocprofiler-sdk::rocprofiler-headers
rocprofiler-sdk::rocprofiler-common-library GTest::gtest GTest::gtest_main)
gtest_add_tests(
TARGET buffering-test
@@ -11,8 +11,8 @@ add_executable(common-tests)
target_sources(common-tests PRIVATE ${common_sources})
target_link_libraries(
common-tests
PRIVATE rocprofiler::rocprofiler-headers rocprofiler::rocprofiler-common-library
GTest::gtest GTest::gtest_main)
PRIVATE rocprofiler-sdk::rocprofiler-headers
rocprofiler-sdk::rocprofiler-common-library GTest::gtest GTest::gtest_main)
gtest_add_tests(
TARGET common-tests