From 16ae2e90c6157e98e846d2bccbaaf533ca5e662a Mon Sep 17 00:00:00 2001
From: "Yat Sin, David" <David.YatSin@amd.com>
Date: Wed, 18 Jun 2025 22:01:23 -0400
Subject: [PATCH] Remove unnecessary dependency on hsakmt (#57)

---
 cmake_modules/rocprofiler_env.cmake | 24 ++++++------------------
 test/CMakeLists.txt                 | 10 +++++-----
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/cmake_modules/rocprofiler_env.cmake b/cmake_modules/rocprofiler_env.cmake
index 7b7c4727ac..517b033238 100644
--- a/cmake_modules/rocprofiler_env.cmake
+++ b/cmake_modules/rocprofiler_env.cmake
@@ -41,31 +41,19 @@ if(ROCPROFILER_LD_AQLPROFILE)
     target_compile_definitions(rocprofiler-build-flags INTERFACE ROCP_LD_AQLPROFILE=1)
 endif()
 
+if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm"  CACHE STRING "Default ROCM installation directory")
+endif()
+
 # Find hsa-runtime
 find_package(
     hsa-runtime64 CONFIG REQUIRED
     HINTS ${CMAKE_PREFIX_PATH}
-    PATHS /opt/rocm
+    PATHS ${ROCM_PATH}
     PATH_SUFFIXES lib/cmake/hsa-runtime64)
 
-# find KFD thunk
-find_package(
-    hsakmt CONFIG REQUIRED
-    HINTS ${CMAKE_PREFIX_PATH}
-    PATHS /opt/rocm
-    PATH_SUFFIXES lib/cmake/hsakmt)
-
-# Find ROCm TODO: Need a better method to find the ROCm path
-find_path(
-    HSA_KMT_INC_PATH "hsakmt/hsakmt.h"
-    HINTS ${CMAKE_PREFIX_PATH}
-    PATHS /opt/rocm
-    PATH_SUFFIXES include)
-if("${HSA_KMT_INC_PATH}" STREQUAL "")
-    get_target_property(HSA_KMT_INC_PATH hsakmt::hsakmt INTERFACE_INCLUDE_DIRECTORIES)
-endif()
 # Include path: /opt/rocm-ver/include. Go up one level to get ROCm  path
-get_filename_component(ROCM_ROOT_DIR "${HSA_KMT_INC_PATH}" DIRECTORY)
+get_filename_component(ROCM_ROOT_DIR ${ROCM_PATH}/include DIRECTORY)
 
 # Basic Tool Chain Information
 message("----------Build-Type: ${CMAKE_BUILD_TYPE}")
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5b1a659bc9..33d92f90d0 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -167,7 +167,7 @@ add_executable(${ST_EXE_NAME} ${ST_TST_SRC} ${UTIL_SRC} ${KERN_SRC})
 target_include_directories(${ST_EXE_NAME} PRIVATE ${TEST_DIR} ${ROOT_DIR}
                                                   ${PROJECT_SOURCE_DIR}/include)
 target_link_libraries(${ST_EXE_NAME} ${ROCPROFILER_TARGET} hsa-runtime64::hsa-runtime64
-                      hsakmt::hsakmt Threads::Threads stdc++fs dl)
+                      Threads::Threads stdc++fs dl)
 install(
     TARGETS ${ST_EXE_NAME}
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/tests-v1/test
@@ -178,7 +178,7 @@ add_executable(${STIN_EXE_NAME} ${STIN_TST_SRC} ${UTIL_SRC} ${KERN_SRC})
 target_include_directories(${STIN_EXE_NAME} PRIVATE ${TEST_DIR} ${ROOT_DIR}
                                                     ${PROJECT_SOURCE_DIR}/include)
 target_link_libraries(${STIN_EXE_NAME} ${ROCPROFILER_TARGET} hsa-runtime64::hsa-runtime64
-                      hsakmt::hsakmt Threads::Threads stdc++fs dl)
+                      Threads::Threads stdc++fs dl)
 install(
     TARGETS ${STIN_EXE_NAME}
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/tests-v1/test
@@ -189,7 +189,7 @@ add_library(${IN_EXE_NAME} SHARED ${IN_TST_SRC} ${UTIL_SRC} ${KERN_SRC})
 target_include_directories(${IN_EXE_NAME} PRIVATE ${TEST_DIR} ${ROOT_DIR}
                                                   ${PROJECT_SOURCE_DIR}/include)
 target_link_libraries(${IN_EXE_NAME} ${ROCPROFILER_TARGET} hsa-runtime64::hsa-runtime64
-                      hsakmt::hsakmt Threads::Threads stdc++fs dl)
+                      Threads::Threads stdc++fs dl)
 install(
     TARGETS ${IN_EXE_NAME}
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/tests-v1/test
@@ -200,8 +200,8 @@ add_executable(${EXE_NAME} ${CTRL_SRC} ${UTIL_SRC} ${KERN_SRC})
 set_target_properties(${EXE_NAME} PROPERTIES INSTALL_RPATH "${ROCM_APPEND_PRIVLIB_RPATH}")
 target_include_directories(${EXE_NAME} PRIVATE ${TEST_DIR} ${ROOT_DIR}
                                                ${PROJECT_SOURCE_DIR}/include)
-target_link_libraries(${EXE_NAME} hsa-runtime64::hsa-runtime64 hsakmt::hsakmt
-                      Threads::Threads stdc++fs dl)
+target_link_libraries(${EXE_NAME} hsa-runtime64::hsa-runtime64
+	               Threads::Threads stdc++fs dl)
 
 file(GLOB XML_FILES "${TEST_DIR}/tool/*.xml")
 configure_file(${TEST_DIR}/run.sh ${PROJECT_BINARY_DIR}/run.sh COPYONLY)