From c767eafb393294214e9d25142a9eebebf234892b Mon Sep 17 00:00:00 2001 From: Robin Voetter Date: Sat, 4 Apr 2026 21:20:32 +0000 Subject: [PATCH] [rocprofiler-sdk] add missing rocprofiler-sdk::rocprofiler-sdk-amd-comgr dependencies These targets, mostly tests, were missing dependencies on amd comgr. --- .../lib/att-tool/waitcnt/tests/CMakeLists.txt | 1 + source/lib/python/utilities.cmake | 3 ++- .../counters/tests/CMakeLists.txt | 13 +++++++++--- .../pc_sampling/parser/tests/CMakeLists.txt | 20 ++++++++++++++----- .../pc_sampling/tests/CMakeLists.txt | 4 +++- .../lib/rocprofiler-sdk/tests/CMakeLists.txt | 2 ++ .../thread_trace/tests/CMakeLists.txt | 1 + 7 files changed, 34 insertions(+), 10 deletions(-) diff --git a/source/lib/att-tool/waitcnt/tests/CMakeLists.txt b/source/lib/att-tool/waitcnt/tests/CMakeLists.txt index 4cc800600e..88dbeaf15a 100644 --- a/source/lib/att-tool/waitcnt/tests/CMakeLists.txt +++ b/source/lib/att-tool/waitcnt/tests/CMakeLists.txt @@ -17,6 +17,7 @@ target_link_libraries( rocprofiler-sdk::rocprofiler-sdk-common-library rocprofiler-sdk::rocprofiler-sdk-glog rocprofiler-sdk::rocprofiler-sdk-static-library + rocprofiler-sdk::rocprofiler-sdk-amd-comgr GTest::gtest GTest::gtest_main) diff --git a/source/lib/python/utilities.cmake b/source/lib/python/utilities.cmake index 8f51fe971b..e527278f38 100644 --- a/source/lib/python/utilities.cmake +++ b/source/lib/python/utilities.cmake @@ -211,7 +211,8 @@ function(rocprofiler_rocpd_python_bindings _VERSION) rocprofiler-sdk::rocprofiler-sdk-gotcha rocprofiler-sdk::rocprofiler-sdk-dw rocprofiler-sdk::rocprofiler-sdk-static-library - rocprofiler-sdk::rocprofiler-sdk-rocpd-library) + rocprofiler-sdk::rocprofiler-sdk-rocpd-library + rocprofiler-sdk::rocprofiler-sdk-amd-comgr) # if "Development" is specified instead of "Development.Module", we need to link to # python libraries diff --git a/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt index 824a5c7ae0..5f0bdf313f 100644 --- a/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt +++ b/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt @@ -55,6 +55,7 @@ target_sources( target_link_libraries( counter_test_constants PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library + rocprofiler-sdk::rocprofiler-sdk-amd-comgr rocprofiler-sdk::rocprofiler-sdk-static-library rocprofiler-sdk::rocprofiler-sdk-hip rocprofiler-sdk::rocprofiler-sdk-hsa-runtime) @@ -77,6 +78,7 @@ target_link_libraries( rocprofiler-sdk::rocprofiler-sdk-hsa-runtime rocprofiler-sdk::rocprofiler-sdk-hip rocprofiler-sdk::rocprofiler-sdk-common-library + rocprofiler-sdk::rocprofiler-sdk-amd-comgr rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest GTest::gtest_main) @@ -111,9 +113,14 @@ add_executable(consumer-tests) target_sources(consumer-tests PRIVATE ${ROCPROFILER_LIB_CONSUMER_TEST_SOURCES}) target_link_libraries( - consumer-tests rocprofiler-sdk::rocprofiler-sdk-hsa-runtime - rocprofiler-sdk::rocprofiler-sdk-hip rocprofiler-sdk::rocprofiler-sdk-common-library - rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest GTest::gtest_main) + consumer-tests + rocprofiler-sdk::rocprofiler-sdk-hsa-runtime + rocprofiler-sdk::rocprofiler-sdk-hip + rocprofiler-sdk::rocprofiler-sdk-common-library + rocprofiler-sdk::rocprofiler-sdk-amd-comgr + rocprofiler-sdk::rocprofiler-sdk-static-library + GTest::gtest + GTest::gtest_main) rocprofiler_add_unit_test( TARGET consumer-tests diff --git a/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt index 46feb0cf51..8a8168186e 100644 --- a/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt +++ b/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt @@ -30,7 +30,9 @@ target_include_directories(pcs_gfx9_test PRIVATE ${PCTEST_INCLUDE_DIR}) target_link_libraries( pcs_gfx9_test PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library - rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest + rocprofiler-sdk::rocprofiler-sdk-amd-comgr + rocprofiler-sdk::rocprofiler-sdk-static-library + GTest::gtest GTest::gtest_main) rocprofiler_add_unit_test( @@ -50,7 +52,9 @@ target_include_directories(pcs_id_test PRIVATE ${PCTEST_INCLUDE_DIR}) target_link_libraries( pcs_id_test PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library - rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest + rocprofiler-sdk::rocprofiler-sdk-amd-comgr + rocprofiler-sdk::rocprofiler-sdk-static-library + GTest::gtest GTest::gtest_main) rocprofiler_add_unit_test( @@ -72,7 +76,9 @@ target_include_directories(pcs_bench_test PRIVATE ${PCTEST_INCLUDE_DIR}) target_link_libraries( pcs_bench_test PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library - rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest + rocprofiler-sdk::rocprofiler-sdk-amd-comgr + rocprofiler-sdk::rocprofiler-sdk-static-library + GTest::gtest GTest::gtest_main) add_executable(pcs_thread_test) @@ -85,7 +91,9 @@ target_include_directories(pcs_thread_test PRIVATE ${PCTEST_INCLUDE_DIR}) target_link_libraries( pcs_thread_test PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library - rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest + rocprofiler-sdk::rocprofiler-sdk-amd-comgr + rocprofiler-sdk::rocprofiler-sdk-static-library + GTest::gtest GTest::gtest_main) rocprofiler_add_unit_test( @@ -106,7 +114,9 @@ target_include_directories(pcs_gfx12_test PRIVATE ${PCTEST_INCLUDE_DIR}) target_link_libraries( pcs_gfx12_test PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library - rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest + rocprofiler-sdk::rocprofiler-sdk-amd-comgr + rocprofiler-sdk::rocprofiler-sdk-static-library + GTest::gtest GTest::gtest_main) rocprofiler_add_unit_test( diff --git a/source/lib/rocprofiler-sdk/pc_sampling/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/pc_sampling/tests/CMakeLists.txt index 4f91344f06..2268cd9eba 100644 --- a/source/lib/rocprofiler-sdk/pc_sampling/tests/CMakeLists.txt +++ b/source/lib/rocprofiler-sdk/pc_sampling/tests/CMakeLists.txt @@ -16,7 +16,9 @@ target_sources(pcs-test PRIVATE ${ROCPROFILER_LIB_PC_SAMPLING_TEST_SOURCES} target_link_libraries( pcs-test PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library - rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest + rocprofiler-sdk::rocprofiler-sdk-amd-comgr + rocprofiler-sdk::rocprofiler-sdk-static-library + GTest::gtest GTest::gtest_main) rocprofiler_add_unit_test( diff --git a/source/lib/rocprofiler-sdk/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/tests/CMakeLists.txt index 3a33b6b547..15f1728955 100644 --- a/source/lib/rocprofiler-sdk/tests/CMakeLists.txt +++ b/source/lib/rocprofiler-sdk/tests/CMakeLists.txt @@ -30,6 +30,7 @@ target_link_libraries( rocprofiler-sdk-lib-tests PRIVATE rocprofiler-sdk::rocprofiler-sdk-static-library rocprofiler-sdk::rocprofiler-sdk-common-library + rocprofiler-sdk::rocprofiler-sdk-amd-comgr rocprofiler-sdk::counter-test-constants rocprofiler-sdk::rocprofiler-sdk-hsa-runtime rocprofiler-sdk::rocprofiler-sdk-drm @@ -64,6 +65,7 @@ target_link_libraries( rocprofiler-sdk-lib-tests-shared PRIVATE rocprofiler-sdk::rocprofiler-sdk-shared-library rocprofiler-sdk::rocprofiler-sdk-common-library + rocprofiler-sdk::rocprofiler-sdk-amd-comgr rocprofiler-sdk::rocprofiler-sdk-hsa-runtime rocprofiler-sdk::rocprofiler-sdk-drm rocprofiler-sdk::rocprofiler-sdk-roctx-shared-library diff --git a/source/lib/rocprofiler-sdk/thread_trace/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/thread_trace/tests/CMakeLists.txt index 410fa84eb4..7ce4c73e20 100644 --- a/source/lib/rocprofiler-sdk/thread_trace/tests/CMakeLists.txt +++ b/source/lib/rocprofiler-sdk/thread_trace/tests/CMakeLists.txt @@ -15,6 +15,7 @@ target_link_libraries( rocprofiler-sdk::rocprofiler-sdk-hsa-runtime rocprofiler-sdk::rocprofiler-sdk-hip rocprofiler-sdk::rocprofiler-sdk-common-library + rocprofiler-sdk::rocprofiler-sdk-amd-comgr GTest::gtest GTest::gtest_main rocprofiler-sdk::counter-test-constants) -- 2.43.0