SWDEV-495609 - Change include path for rocclr/utils

- Header files inside rocclr/utils when included from hipamd or opencl should be included as #include "rocclr/utils/xxx.h" instead of "utils/xxx.h"

Change-Id: Ic0760c33b9d091f5620dec67e5482c9698d22093


[ROCm/clr commit: 78f62d3230]

projects/clr/hipamd/src/hip_context.cpp

@@ -22,8 +22,8 @@
 #include "hip_internal.hpp"
 #include "hip_platform.hpp"
 #include "platform/runtime.hpp"
-#include "utils/flags.hpp"
+#include "rocclr/utils/flags.hpp"
-#include "utils/versions.hpp"
+#include "rocclr/utils/versions.hpp"
 
 namespace hip {
 std::once_flag g_ihipInitialized;

projects/clr/hipamd/src/hip_hcc.rc

@@ -17,7 +17,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "winresrc.h"
-#include "utils/versions.hpp"
+#include "rocclr/utils/versions.hpp"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

projects/clr/hipamd/src/hip_hcc_in.rc.in

@@ -19,7 +19,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "winresrc.h"
-#include "utils/versions.hpp"
+#include "rocclr/utils/versions.hpp"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

projects/clr/hipamd/src/hip_internal.hpp

@@ -24,7 +24,7 @@
 #include "vdi_common.hpp"
 #include "hip_prof_api.h"
 #include "trace_helper.h"
-#include "utils/debug.hpp"
+#include "rocclr/utils/debug.hpp"
 #include "hip_formatting.hpp"
 #include "hip_graph_capture.hpp"
 

projects/clr/hipamd/src/hiprtc/hiprtcComgrHelper.hpp

@@ -26,7 +26,7 @@ THE SOFTWARE.
 #include <string>
 
 #include "vdi_common.hpp"
-#include "utils/debug.hpp"
+#include "rocclr/utils/debug.hpp"
 #include "device/comgrctx.hpp"
 
 namespace hiprtc {

projects/clr/hipamd/src/hiprtc/hiprtcInternal.cpp

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #include <sys/stat.h>
 
 #include "vdi_common.hpp"
-#include "utils/flags.hpp"
+#include "rocclr/utils/flags.hpp"
 
 namespace hiprtc {
 using namespace helpers;

projects/clr/hipamd/src/hiprtc/hiprtcInternal.hpp

@@ -33,9 +33,9 @@ THE SOFTWARE.
 #include <string>
 
 #include "top.hpp"
-#include "utils/debug.hpp"
+#include "rocclr/utils/debug.hpp"
-#include "utils/flags.hpp"
+#include "rocclr/utils/flags.hpp"
-#include "utils/macros.hpp"
+#include "rocclr/utils/macros.hpp"
 
 #ifdef __HIP_ENABLE_RTC
 extern "C" {

projects/clr/opencl/amdocl/amdocl.rc

@@ -17,7 +17,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "winresrc.h"
-#include "utils/versions.hpp"
+#include "rocclr/utils/versions.hpp"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

projects/clr/opencl/amdocl/amdocl.rc.in

@@ -17,7 +17,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "winresrc.h"
-#include "utils/versions.hpp"
+#include "rocclr/utils/versions.hpp"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

projects/clr/opencl/amdocl/cl_device.cpp

@@ -22,7 +22,7 @@
 #include "vdi_common.hpp"
 #include "device/device.hpp"
 #include "platform/runtime.hpp"
-#include "utils/versions.hpp"
+#include "rocclr/utils/versions.hpp"
 #include "os/os.hpp"
 #include "cl_semaphore_amd.h"
 

projects/clr/rocclr/cmake/ROCclr.cmake

@@ -116,6 +116,7 @@ target_compile_definitions(rocclr PUBLIC
   ${AMD_OPENCL_DEFS})
 
 target_include_directories(rocclr PUBLIC
+  ${ROCCLR_SRC_DIR}/../
   ${ROCCLR_SRC_DIR}
   ${ROCCLR_SRC_DIR}/compiler/lib
   ${ROCCLR_SRC_DIR}/compiler/lib/include