Adjust include paths for new header locations.
Thunk and rocm_smi_lib paths have been updated.
Change-Id: If2948172f8064dd992cbccbc2a80f9161ad4d457
[ROCm/ROCR-Runtime commit: 752cfd5ffd]
This commit is contained in:
Sean Keely
@@ -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 "")
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
#include <stdint.h>
|
||||
#include <vector>
|
||||
|
||||
#include "hsakmt.h"
|
||||
#include "hsakmt/hsakmt.h"
|
||||
|
||||
#include "core/inc/amd_gpu_agent.h"
|
||||
#include "core/inc/blit.h"
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "hsakmt.h"
|
||||
#include "hsakmt/hsakmt.h"
|
||||
|
||||
#include "core/inc/runtime.h"
|
||||
#include "core/inc/agent.h"
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
#include <string>
|
||||
#include <sstream>
|
||||
|
||||
#include "hsakmt.h"
|
||||
#include "hsakmt/hsakmt.h"
|
||||
|
||||
namespace rocr {
|
||||
namespace AMD {
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
#include <vector>
|
||||
#include <map>
|
||||
|
||||
#include "hsakmt.h"
|
||||
#include "hsakmt/hsakmt.h"
|
||||
|
||||
#include "core/inc/runtime.h"
|
||||
#include "core/inc/agent.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"
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include "hsakmt.h"
|
||||
#include "hsakmt/hsakmt.h"
|
||||
|
||||
#include "core/inc/signal.h"
|
||||
#include "core/util/utils.h"
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
|
||||
#include "inc/amd_hsa_queue.h"
|
||||
|
||||
#include "hsakmt.h"
|
||||
#include "hsakmt/hsakmt.h"
|
||||
|
||||
namespace rocr {
|
||||
namespace core {
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
#include <vector>
|
||||
#include <utility>
|
||||
|
||||
#include "hsakmt.h"
|
||||
#include "hsakmt/hsakmt.h"
|
||||
|
||||
#include "core/common/shared.h"
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
#include <iostream>
|
||||
#include <climits>
|
||||
|
||||
#include "hsakmt.h"
|
||||
#include "hsakmt/hsakmt.h"
|
||||
|
||||
#include "core/util/utils.h"
|
||||
#include "core/inc/runtime.h"
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
#include <iostream>
|
||||
#endif
|
||||
|
||||
#include "hsakmt.h"
|
||||
#include "hsakmt/hsakmt.h"
|
||||
|
||||
#include "core/inc/runtime.h"
|
||||
#include "core/inc/amd_cpu_agent.h"
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
#include <algorithm>
|
||||
#include <climits>
|
||||
|
||||
#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"
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
#include <algorithm>
|
||||
#include <climits>
|
||||
|
||||
#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"
|
||||
|
||||
مرجع در شماره جدید
Block a user