From c96272841bd0babdccdba1892ff2ea3b1a44a8fa Mon Sep 17 00:00:00 2001 From: Sean Keely Date: Thu, 5 May 2022 23:45:32 -0500 Subject: [PATCH] Adjust include paths for new header locations. Thunk and rocm_smi_lib paths have been updated. Change-Id: If2948172f8064dd992cbccbc2a80f9161ad4d457 [ROCm/ROCR-Runtime commit: 752cfd5ffd0a56ebc455925f8233794c031d86c3] --- .../rocrtst/suites/test_common/CMakeLists.txt | 13 +------------ .../runtime/hsa-runtime/core/inc/amd_blit_sdma.h | 2 +- .../runtime/hsa-runtime/core/inc/amd_cpu_agent.h | 2 +- .../hsa-runtime/core/inc/amd_filter_device.h | 2 +- .../runtime/hsa-runtime/core/inc/amd_gpu_agent.h | 2 +- .../hsa-runtime/core/inc/amd_memory_region.h | 2 +- .../runtime/hsa-runtime/core/inc/interrupt_signal.h | 2 +- .../runtime/hsa-runtime/core/inc/queue.h | 2 +- .../runtime/hsa-runtime/core/inc/signal.h | 2 +- .../hsa-runtime/core/runtime/amd_filter_device.cpp | 2 +- .../hsa-runtime/core/runtime/amd_topology.cpp | 2 +- .../runtime/hsa-runtime/image/image_manager_ai.cpp | 2 +- .../runtime/hsa-runtime/image/image_manager_kv.cpp | 2 +- 13 files changed, 13 insertions(+), 24 deletions(-) diff --git a/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt b/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt index c6dcf946ca..84c3522cff 100755 --- a/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt +++ b/projects/rocr-runtime/rocrtst/suites/test_common/CMakeLists.txt @@ -69,11 +69,8 @@ endif() # Required Defines first: find_package(hsa-runtime64 REQUIRED ) -message(STATUS "HSA Runtime found at ${hsa-runtime64_DIR} ") +find_package(rocm_smi REQUIRED) -set(ROCR_INC_DIR ${hsa-runtime64_DIR}/../../../include) -set(ROCM_SMI_INC_DIR ${ROCM_DIR}/rocm_smi/include) -set(ROCM_SMI_LIB_DIR ${ROCM_DIR}/rocm_smi/lib) set (ONLY64STR "64") if (DEFINED LLVM_DIR) @@ -222,12 +219,6 @@ MESSAGE("ROCRTST_LIBS SET STEP:Done") # Other source directories aux_source_directory(${ROCRTST_ROOT}/common common_srcs) -# -# Specify the directory containing various libraries of ROCR -# to be linked against for building ROC Perf applications -# -LINK_DIRECTORIES(${ROCR_LIB_DIR} ${ROCM_SMI_LIB_DIR}) - # # Extend the list of libraries to be used for linking ROC Perf Apps # @@ -250,10 +241,8 @@ aux_source_directory(${ROCRTST_ROOT}/suites/test_common testCommonSources) # Header file include path -include_directories(${ROCR_INC_DIR}) include_directories(${ROCRTST_ROOT}) include_directories(${ROCRTST_ROOT}/gtest/include) -include_directories(${ROCM_SMI_INC_DIR}) # Custom command set for code objects. set (HSACO_TARG_LIST "") diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_blit_sdma.h b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_blit_sdma.h index c7ebf9925a..5c8528054b 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_blit_sdma.h +++ b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_blit_sdma.h @@ -47,7 +47,7 @@ #include #include -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" #include "core/inc/amd_gpu_agent.h" #include "core/inc/blit.h" diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_cpu_agent.h b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_cpu_agent.h index 9bbed49c9e..d2b80cfac8 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_cpu_agent.h +++ b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_cpu_agent.h @@ -47,7 +47,7 @@ #include -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" #include "core/inc/runtime.h" #include "core/inc/agent.h" diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_filter_device.h b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_filter_device.h index bfae8526ab..01ad14e327 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_filter_device.h +++ b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_filter_device.h @@ -50,7 +50,7 @@ #include #include -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" namespace rocr { namespace AMD { diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_gpu_agent.h b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_gpu_agent.h index ed64d5be3e..c350be8b09 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_gpu_agent.h +++ b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_gpu_agent.h @@ -48,7 +48,7 @@ #include #include -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" #include "core/inc/runtime.h" #include "core/inc/agent.h" diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_memory_region.h b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_memory_region.h index f682415858..185889040f 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_memory_region.h +++ b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_memory_region.h @@ -45,7 +45,7 @@ #ifndef HSA_RUNTIME_CORE_INC_AMD_MEMORY_REGION_H_ #define HSA_RUNTIME_CORE_INC_AMD_MEMORY_REGION_H_ -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" #include "core/inc/agent.h" #include "core/inc/runtime.h" diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/interrupt_signal.h b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/interrupt_signal.h index a47f853ce2..fea227ba9a 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/interrupt_signal.h +++ b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/interrupt_signal.h @@ -48,7 +48,7 @@ #include #include -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" #include "core/inc/signal.h" #include "core/util/utils.h" diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/queue.h b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/queue.h index 8d2bbf4a21..a64b94fafd 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/queue.h +++ b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/queue.h @@ -54,7 +54,7 @@ #include "inc/amd_hsa_queue.h" -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" namespace rocr { namespace core { diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/signal.h b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/signal.h index 43411c9f6b..1907e52e36 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/signal.h +++ b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/signal.h @@ -51,7 +51,7 @@ #include #include -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" #include "core/common/shared.h" diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_filter_device.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_filter_device.cpp index 51b38a619f..1429c444e1 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_filter_device.cpp +++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_filter_device.cpp @@ -52,7 +52,7 @@ #include #include -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" #include "core/util/utils.h" #include "core/inc/runtime.h" diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_topology.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_topology.cpp index 17b5bc399e..34a5bb1e22 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_topology.cpp +++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_topology.cpp @@ -55,7 +55,7 @@ #include #endif -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" #include "core/inc/runtime.h" #include "core/inc/amd_cpu_agent.h" diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_ai.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_ai.cpp index 8329cc0d2d..c4c0cfe891 100755 --- a/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_ai.cpp +++ b/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_ai.cpp @@ -48,7 +48,7 @@ #include #include -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" #include "inc/hsa_ext_amd.h" #include "core/inc/hsa_internal.h" #include "addrlib/src/core/addrlib.h" diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_kv.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_kv.cpp index c81461ccec..fea0491fde 100755 --- a/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_kv.cpp +++ b/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_kv.cpp @@ -48,7 +48,7 @@ #include #include -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" #include "inc/hsa_ext_amd.h" #include "core/inc/hsa_internal.h" #include "core/inc/hsa_ext_amd_impl.h"