From cf52ecb69b58c0ca6229cc0e2b201c68a10b0f16 Mon Sep 17 00:00:00 2001
From: Evgeny <evgeny.shcherbakov@amd.com>
Date: Wed, 23 Jan 2019 21:05:31 -0600
Subject: [PATCH] adding include dir for hsa/hsa.h

[ROCm/roctracer commit: fbe3612b5e86b6113b9e7a313e60c88258944ba8]
---
 projects/roctracer/build.sh                | 18 +++++++++---------
 projects/roctracer/cmake_modules/env.cmake | 13 ++++++++++---
 projects/roctracer/src/CMakeLists.txt      |  2 +-
 projects/roctracer/test/CMakeLists.txt     |  2 +-
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/projects/roctracer/build.sh b/projects/roctracer/build.sh
index 2b98eb2bc8..f8d46442b8 100755
--- a/projects/roctracer/build.sh
+++ b/projects/roctracer/build.sh
@@ -7,29 +7,29 @@ fatal() {
   exit 1
 }
 
-if [ -z "$ROCTRACER_ROOT" ]; then export ROCTRACER_ROOT=$PWD; fi
-if [ -z "$BUILD_DIR" ] ; then export BUILD_DIR=$PWD; fi
+if [ -z "$ROCTRACER_ROOT" ]; then ROCTRACER_ROOT=$PWD; fi
+if [ -z "$BUILD_DIR" ] ; then BUILD_DIR=$PWD; fi
 if [ -z "$HIP_PATH" ] ; then export HIP_PATH="$ROCM_PATH/hip"; fi
 if [ -z "$HCC_HOME" ] ; then export HCC_HOME="$ROCM_PATH/hcc"; fi
-if [ -z "$BUILD_TYPE" ] ; then export BUILD_TYPR="release"; fi
-if [ -z "$PACKAGE_ROOT" ] ; then export PACKAGE_ROOT=$ROCM_PATH; fi
-if [ -z "$PACKAGE_PREFIX" ] ; then export PACKAGE_PREFIX="$ROCM_PATH/$COMPONENT"; fi
+if [ -z "$BUILD_TYPE" ] ; then BUILD_TYPE="release"; fi
+if [ -z "$PACKAGE_ROOT" ] ; then PACKAGE_ROOT=$ROCM_PATH; fi
+if [ -z "$PACKAGE_PREFIX" ] ; then PACKAGE_PREFIX="$ROCM_PATH/$COMPONENT"; fi
 
+ROCTRACER_ROOT=$(cd $ROCTRACER_ROOT && echo $PWD)
 MAKE_OPTS="-j 8 -C $BUILD_DIR"
 
 mkdir -p $BUILD_DIR
 pushd $BUILD_DIR
+
 cmake \
     -DCMAKE_MODULE_PATH=$ROCTRACER_ROOT/cmake_modules \
     -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-    -DCMAKE_PREFIX_PATH="$PACKAGE_ROOT/hsa/include/hsa;$PACKAGE_ROOT/hsa/lib;$PACKAGE_ROOT/libhsakmt/lib" \
+    -DCMAKE_PREFIX_PATH="$PACKAGE_ROOT" \
     -DCMAKE_INSTALL_PREFIX=$PACKAGE_ROOT \
     -DCPACK_PACKAGING_INSTALL_PREFIX=$PACKAGE_PREFIX \
     -DCPACK_GENERATOR="DEB;RPM" \
     $ROCTRACER_ROOT
-popd
-
-make $MAKE_OPTS
+make
 make mytest
 make package
 
diff --git a/projects/roctracer/cmake_modules/env.cmake b/projects/roctracer/cmake_modules/env.cmake
index d5a91eff7e..b1966e07cd 100644
--- a/projects/roctracer/cmake_modules/env.cmake
+++ b/projects/roctracer/cmake_modules/env.cmake
@@ -90,13 +90,19 @@ endif ()
 
 ## Find hsa-runtime headers/lib
 find_file ( HSA_RUNTIME_INC "hsa.h" )
-if ( "${HSA_RUNTIME_INC_PATH}" STREQUAL "" )
-  find_file ( HSA_RUNTIME_INC "hsa/hsa.h" )
-endif()
+find_file ( HSA_RUNTIME_HSA_INC "hsa/hsa.h" )
 find_library ( HSA_RUNTIME_LIB "libhsa-runtime${NBIT}.so" )
 get_filename_component ( HSA_RUNTIME_INC_PATH ${HSA_RUNTIME_INC} DIRECTORY )
+get_filename_component ( HSA_RUNTIME_HSA_INC_PATH ${HSA_RUNTIME_HSA_INC} DIRECTORY )
 get_filename_component ( HSA_RUNTIME_LIB_PATH ${HSA_RUNTIME_LIB} DIRECTORY )
 
+if ( "${HSA_RUNTIME_INC_PATH}" STREQUAL "" )
+  set ( HSA_RUNTIME_INC_PATH ${HSA_RUNTIME_HSA_INC_PATH} )
+endif ()
+if ( NOT "${HSA_RUNTIME_HSA_INC_PATH}" STREQUAL "" )
+  set ( HSA_RUNTIME_HSA_INC_PATH ${HSA_RUNTIME_HSA_INC_PATH}/.. )
+endif ()
+
 find_library ( HSA_KMT_LIB "libhsakmt.so" )
 get_filename_component ( HSA_KMT_LIB_PATH ${HSA_KMT_LIB} DIRECTORY )
 
@@ -106,6 +112,7 @@ message ( "-----------BuildType: ${CMAKE_BUILD_TYPE}" )
 message ( "------------Compiler: ${CMAKE_CXX_COMPILER}" )
 message ( "----Compiler-Version: ${CMAKE_CXX_COMPILER_VERSION}" )
 message ( "-----HSA-Runtime-Inc: ${HSA_RUNTIME_INC_PATH}" )
+message ( "-HSA-Runtime-HSA-Inc: ${HSA_RUNTIME_HSA_INC_PATH}" )
 message ( "-----HSA-Runtime-Lib: ${HSA_RUNTIME_LIB_PATH}" )
 message ( "-------------HCC-Inc: ${HCC_INC_DIR}" )
 message ( "-------------HIP-Inc: ${HIP_INC_DIR}" )
diff --git a/projects/roctracer/src/CMakeLists.txt b/projects/roctracer/src/CMakeLists.txt
index 2650dc35fe..2ac70bb6a8 100644
--- a/projects/roctracer/src/CMakeLists.txt
+++ b/projects/roctracer/src/CMakeLists.txt
@@ -7,6 +7,6 @@ set ( LIB_SRC
   ${LIB_DIR}/util/hsa_rsrc_factory.cpp
 )
 add_library ( ${TARGET_LIB} SHARED ${LIB_SRC} )
-target_include_directories ( ${TARGET_LIB} PRIVATE ${LIB_DIR} ${ROOT_DIR} ${ROOT_DIR}/inc ${HSA_RUNTIME_INC_PATH} ${HIP_INC_DIR} ${HCC_INC_DIR} )
+target_include_directories ( ${TARGET_LIB} PRIVATE ${LIB_DIR} ${ROOT_DIR} ${ROOT_DIR}/inc ${HSA_RUNTIME_INC_PATH} ${HSA_RUNTIME_HSA_INC_PATH} ${HIP_INC_DIR} ${HCC_INC_DIR} )
 target_link_libraries( ${TARGET_LIB} PRIVATE ${HSA_RUNTIME_LIB} c stdc++ )
 execute_process ( COMMAND sh -xc "${ROOT_DIR}/script/hsaap.py ${ROOT_DIR} ${HSA_RUNTIME_INC_PATH}" )
diff --git a/projects/roctracer/test/CMakeLists.txt b/projects/roctracer/test/CMakeLists.txt
index ef74c04466..d0bc7220c7 100644
--- a/projects/roctracer/test/CMakeLists.txt
+++ b/projects/roctracer/test/CMakeLists.txt
@@ -44,7 +44,7 @@ file( GLOB UTIL_SRC "${HSA_TEST_DIR}/util/*.cpp" )
 set ( TEST_LIB "tracer_tool" )
 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} ${HSA_RUNTIME_INC_PATH} ${HIP_INC_DIR} ${HCC_INC_DIR} )
+target_include_directories ( ${TEST_LIB} PRIVATE ${HSA_TEST_DIR} ${ROOT_DIR} ${HSA_RUNTIME_INC_PATH} ${HSA_RUNTIME_HSA_INC_PATH} ${HIP_INC_DIR} ${HCC_INC_DIR} )
 target_link_libraries ( ${TEST_LIB} ${ROCTRACER_TARGET} ${HSA_RUNTIME_LIB} c stdc++ dl pthread rt )
 
 ## Build HSA test