From e37c63ea092e651e4297f7e6b82395cbad03ca42 Mon Sep 17 00:00:00 2001 From: Kent Russell Date: Tue, 27 Apr 2021 12:56:34 -0400 Subject: [PATCH] roctracer: Support static thunk Add numa lib as this will be required with a static thunk Look for static thunk of shared thunk cannot be found Signed-off-by: Kent Russell Change-Id: I5de63e0a56a8946132ccbb7140a19a82a70b951d [ROCm/roctracer commit: 5c9329aec8daa67760f9415900dc46f76a864d6d] --- projects/roctracer/cmake_modules/env.cmake | 3 +++ projects/roctracer/test/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/roctracer/cmake_modules/env.cmake b/projects/roctracer/cmake_modules/env.cmake index 199798bea2..ab6c7f8856 100644 --- a/projects/roctracer/cmake_modules/env.cmake +++ b/projects/roctracer/cmake_modules/env.cmake @@ -150,6 +150,9 @@ get_filename_component ( HSA_RUNTIME_INC_PATH "${HSA_RUNTIME_INC}" DIRECTORY ) get_filename_component ( HSA_RUNTIME_LIB_PATH "${HSA_RUNTIME_LIB}" DIRECTORY ) find_library ( HSA_KMT_LIB "libhsakmt.so" ) +if ( "${HSA_KMT_LIB_PATH}" STREQUAL "" ) + find_library ( HSA_KMT_LIB "libhsakmt.a" ) +endif() get_filename_component ( HSA_KMT_LIB_PATH "${HSA_KMT_LIB}" DIRECTORY ) set ( HSA_KMT_INC_PATH "${HSA_KMT_LIB_PATH}/../include" ) diff --git a/projects/roctracer/test/CMakeLists.txt b/projects/roctracer/test/CMakeLists.txt index e07e7d8b91..748ee95a28 100644 --- a/projects/roctracer/test/CMakeLists.txt +++ b/projects/roctracer/test/CMakeLists.txt @@ -86,7 +86,7 @@ if ( DEFINED ROCTRACER_TARGET ) set ( TEST_LIB_SRC ${TEST_DIR}/tool/tracer_tool.cpp ${UTIL_SRC} ) add_library ( ${TEST_LIB} SHARED ${TEST_LIB_SRC} ) target_include_directories ( ${TEST_LIB} PRIVATE ${HSA_TEST_DIR} ${ROOT_DIR} ${ROOT_DIR}/inc ${HSA_RUNTIME_INC_PATH} ${HIP_INC_DIR} ${HSA_KMT_INC_PATH} ${GEN_INC_DIR} ) - target_link_libraries ( ${TEST_LIB} ${ROCTRACER_TARGET} ${HSA_RUNTIME_LIB} c stdc++ dl pthread rt ) + target_link_libraries ( ${TEST_LIB} ${ROCTRACER_TARGET} ${HSA_RUNTIME_LIB} c stdc++ dl pthread rt numa ) endif () ## Build hsaco_test.cpp referenc test