Update how code references publicly available ROCr headers

Change-Id: I357c51eb713a23704d4fee71081be46a73a71806 [ROCm/ROCR-Runtime commit: 627991b1c1]
2020-02-20 18:00:07 -06:00
commit 38747b8fec
@@ -53,7 +53,7 @@ include_directories( ${HSAKMT_INC_PATH} )
 link_directories( ${HSAKMT_LIB_PATH} )

 ## Find the hsa-runtime and include files
-get_include_path( HSA_INC_PATH "ROCr include path" NAMES "hsa.h" "hsa/hsa.h" HINTS "${CMAKE_BINARY_DIR}/../../include" "${CMAKE_CURRENT_SOURCE_DIR}/../hsa-runtime/inc" PATHS "/opt/rocm/include")
+get_include_path( HSA_INC_PATH "ROCr include path" NAMES "inc/hsa.h" HINTS "${CMAKE_CURRENT_SOURCE_DIR}/../hsa-runtime" "${CMAKE_BINARY_DIR}/../../include" PATHS "/opt/rocm/include")
 get_library_path( HSA_LIB_PATH "ROCr library path" NAMES "libhsa-runtime64.so" HINTS "${CMAKE_BINARY_DIR}/../../lib" "${CMAKE_BINARY_DIR}/../hsa-core" "${CMAKE_CURRENT_SOURCE_DIR}/../hsa-runtime/build" PATHS "/opt/rocm/lib")
 include_directories( ${HSA_INC_PATH} )
 link_directories( ${HSA_LIB_PATH} )
@@ -103,8 +103,6 @@ link_directories ( ${HSAKMT_LIB_PATH} )

 ## Set include directories for ROCr runtime
 include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} )
-include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/inc )
-include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/core/inc )
 include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/libamdhsacode )

 ## ROCr build internal versioning
@@ -40,7 +40,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-#include "hsa_api_trace.h"
+#include "inc/hsa_api_trace.h"
 #include "core/inc/hsa_api_trace_int.h"

 static const HsaApiTable* hsaApiTable;
@@ -82,11 +82,11 @@ mes of its
 #ifndef AMD_HSA_CODE_HPP_
 #define AMD_HSA_CODE_HPP_

-#include "amd_elf_image.hpp"
-#include "amd_hsa_elf.h"
-#include "amd_hsa_kernel_code.h"
-#include "hsa.h"
-#include "hsa_ext_finalize.h"
+#include "core/inc/amd_elf_image.hpp"
+#include "inc/amd_hsa_elf.h"
+#include "inc/amd_hsa_kernel_code.h"
+#include "inc/hsa.h"
+#include "inc/hsa_ext_finalize.h"
 #include <memory>
 #include <sstream>
 #include <cassert>
@@ -45,10 +45,10 @@

 #include <cstddef>
 #include <cstdint>
-#include "hsa.h"
-#include "hsa_ext_image.h"
-#include "hsa_ven_amd_loader.h"
-#include "amd_hsa_elf.h"
+#include "inc/hsa.h"
+#include "inc/hsa_ext_image.h"
+#include "inc/hsa_ven_amd_loader.h"
+#include "inc/amd_hsa_elf.h"
 #include <string>
 #include <mutex>
 #include <vector>
@@ -45,9 +45,9 @@
 #ifndef HSA_RUNTIME_CORE_INC_EXT_AMD_H_
 #define HSA_RUNTIME_CORE_INC_EXT_AMD_H_

-#include "hsa.h"
-#include "hsa_ext_image.h"
-#include "hsa_ext_amd.h"
+#include "inc/hsa.h"
+#include "inc/hsa_ext_image.h"
+#include "inc/hsa_ext_amd.h"

 // Wrap internal implementation inside AMD namespace
 namespace AMD {
@@ -46,7 +46,7 @@
 #include <string>
 #include <vector>

-#include "hsa_api_trace_int.h"
+#include "core/inc/hsa_api_trace_int.h"

 #include "core/util/os.h"
 #include "core/util/utils.h"
@@ -66,7 +66,7 @@
 #include "core/util/utils.h"

 #include "core/inc/amd_loader_context.hpp"
-#include "amd_hsa_code.hpp"
+#include "core/inc/amd_hsa_code.hpp"

 //---------------------------------------------------------------------------//
 //    Constants                                                              //
@@ -48,7 +48,7 @@
 #include "core/inc/amd_memory_region.h"
 #include "core/inc/host_queue.h"

-#include "hsa_ext_image.h"
+#include "inc/hsa_ext_image.h"

 namespace amd {
 CpuAgent::CpuAgent(HSAuint32 node, const HsaNodeProperties& node_props)
@@ -40,7 +40,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-#include "hsa_ven_amd_loader.h"
+#include "inc/hsa_ven_amd_loader.h"

 #include "core/inc/amd_hsa_loader.hpp"
 #include "core/inc/runtime.h"
@@ -40,7 +40,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////

-#include "amd_elf_image.hpp"
+#include "core/inc/amd_elf_image.hpp"
 #include "amd_hsa_code_util.hpp"
 #include <gelf.h>
 #include <errno.h>
@@ -44,10 +44,10 @@
 #include <cstring>
 #include <iomanip>
 #include <algorithm>
-#include "amd_hsa_code.hpp"
+#include "core/inc/amd_hsa_code.hpp"
 #include "amd_hsa_code_util.hpp"
 #include <libelf.h>
-#include "amd_hsa_elf.h"
+#include "inc/amd_hsa_elf.h"
 #include <fstream>
 #include <sstream>
 #include <cstdlib>
@@ -59,7 +59,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #endif // _WIN32
-#include "Brig.h"
+#include "inc/Brig.h"

 namespace {
 auto eq = " = ";
@@ -52,10 +52,10 @@
 #else // _WIN32
 #include <cstdlib>
 #endif // _WIN32
-#include "amd_hsa_kernel_code.h"
-#include "amd_hsa_elf.h"
-#include "hsa.h"
-#include "hsa_ext_finalize.h"
+#include "inc/amd_hsa_kernel_code.h"
+#include "inc/amd_hsa_elf.h"
+#include "inc/hsa.h"
+#include "inc/hsa_ext_finalize.h"

 #define hsa_error(e) static_cast<hsa_status_t>(e)

@@ -50,9 +50,9 @@
 #include <fstream>
 #include <libelf.h>
 #include <unistd.h>
-#include "amd_hsa_elf.h"
-#include "amd_hsa_kernel_code.h"
-#include "amd_hsa_code.hpp"
+#include "inc/amd_hsa_elf.h"
+#include "inc/amd_hsa_kernel_code.h"
+#include "core/inc/amd_hsa_code.hpp"
 #include "amd_hsa_code_util.hpp"
 #include "amd_options.hpp"
 #include "core/util/utils.h"
@@ -55,11 +55,11 @@
 #include <utility>
 #include <vector>
 #include <cstring>
-#include "hsa.h"
-#include "hsa_ext_image.h"
-#include "amd_hsa_loader.hpp"
-#include "amd_hsa_code.hpp"
-#include "amd_hsa_kernel_code.h"
+#include "inc/hsa.h"
+#include "inc/hsa_ext_image.h"
+#include "core/inc/amd_hsa_loader.hpp"
+#include "core/inc/amd_hsa_code.hpp"
+#include "inc/amd_hsa_kernel_code.h"
 #include "amd_hsa_locks.hpp"

 namespace amd {
@@ -43,7 +43,7 @@
 #ifndef LOADERS_HPP_
 #define LOADERS_HPP_

-#include "amd_hsa_loader.hpp"
+#include "core/inc/amd_hsa_loader.hpp"
 #include <set>
 #include <iostream>