From 9a7b67c820dec152581c39c2cd285db8f8a33cc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henry=20Linjam=C3=A4ki?= <henry.mikael.linjamaki@intel.com>
Date: Fri, 30 Sep 2022 13:03:54 +0300
Subject: [PATCH 1/2] Fix a test failed after switching to C++-based hipcc

---
 bin/cuspvc-build.in       | 5 +++--
 bin/cuspvc-install.in     | 1 +
 tests/cuda/CMakeLists.txt | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bin/cuspvc-build.in b/bin/cuspvc-build.in
index b1a093b6b..59685ac63 100755
--- a/bin/cuspvc-build.in
+++ b/bin/cuspvc-build.in
@@ -29,5 +29,6 @@
 #=============================================================================
 
 export HIP_PLATFORM=spirv
-export PATH=@CLANG_BIN_DIR@:@CMAKE_BINARY_DIR@/bin:$PATH
-hipcc @CHIP_INCLUDES@ "$@"
+export HIP_PATH=@CMAKE_BINARY_DIR@
+export PATH=@CLANG_BIN_DIR@:@CMAKE_BINARY_DIR@/bin:@CMAKE_BINARY_DIR@/HIPCC:$PATH
+hipcc.bin @CHIP_INCLUDES@ "$@"
diff --git a/bin/cuspvc-install.in b/bin/cuspvc-install.in
index ed8d543f9..798d3f147 100755
--- a/bin/cuspvc-install.in
+++ b/bin/cuspvc-install.in
@@ -28,6 +28,7 @@
 #=============================================================================
 
 export HIP_PLATFORM=spirv
+export HIP_PATH=@CMAKE_INSTALL_PREFIX@
 # Set PATH for locating hipcc and clang.
 export PATH=@CLANG_BIN_DIR@:@CMAKE_INSTALL_PREFIX@/bin:$PATH
 hipcc -I@CMAKE_INSTALL_PREFIX@/include/cuspv "$@"
diff --git a/tests/cuda/CMakeLists.txt b/tests/cuda/CMakeLists.txt
index 10729f906..a807bc245 100644
--- a/tests/cuda/CMakeLists.txt
+++ b/tests/cuda/CMakeLists.txt
@@ -18,6 +18,8 @@ function(add_compile_test)
 endfunction()
 
 add_compile_test(NAME activemask SOURCES activemask.cu
-  COMPILE_OPTIONS -fsyntax-only)
+  # '-c' option is a kludge fix for C++ based hipcc. This test worked
+  # without the option with the previous perl-based hipcc.
+  COMPILE_OPTIONS "-fsyntax-only -c")
 set_tests_properties(activemask PROPERTIES
   PASS_REGULAR_EXPRESSION "error: '__activemask' is unavailable: unsupported in CHIP-SPV")

From f6b78ecc0949a98e58bfb798b2a42f759001e090 Mon Sep 17 00:00:00 2001
From: Paulius Velesko <pvelesko@pglc.io>
Date: Sun, 2 Oct 2022 06:27:39 +0000
Subject: [PATCH 2/2] update HIPCC and adjust cuspv

---
 CMakeLists.txt      | 11 ++++++++---
 HIPCC               |  2 +-
 bin/cuspvc-build.in |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 549ce84e3..c7324e07f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -250,13 +250,14 @@ enable_testing()
 add_subdirectory(HIP/tests/catch catch)
 add_subdirectory(tests/cuda)
 add_subdirectory(./samples samples)
+set(HIPCC_BUILD_PATH "${CMAKE_BINARY_DIR}/bin")
 add_subdirectory(HIPCC)
 # Make CHIP depend on devicelib_bc and LLVMHipPasses for
 # convenience. The CHIP module itself does not depend on these but
 # HIP program compilation does.
 add_dependencies(CHIP devicelib_bc LLVMHipPasses)
 add_dependencies(samples CHIP)
-add_dependencies(CHIP hipcc.bin)
+add_dependencies(CHIP hipcc.bin hipconfig.bin)
 
 add_subdirectory(bin)
 
@@ -499,9 +500,13 @@ file(WRITE "${PROJECT_BINARY_DIR}/share/.hipInfo" ${_hipInfo_build})
 install(FILES ${PROJECT_BINARY_DIR}/share/.hipInfo_install
   DESTINATION ${SHARE_INSTALL_DIR} RENAME .hipInfo)
 
+# Copy over includes for hipcc to work in the build dir
+file(COPY ${CMAKE_SOURCE_DIR}/include DESTINATION ${CMAKE_BINARY_DIR})
+file(COPY ${CMAKE_SOURCE_DIR}/HIP/include/hip DESTINATION ${CMAKE_BINARY_DIR}/include)
+
 # Copy hipconfig, hipvars, etc to bin
-install(FILES ${CMAKE_BINARY_DIR}/HIPCC/hipcc.bin DESTINATION ${BIN_INSTALL_DIR} RENAME hipcc PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ)
-install(FILES ${CMAKE_BINARY_DIR}/HIPCC/hipconfig.bin DESTINATION ${BIN_INSTALL_DIR} RENAME hipconfig PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ)
+install(FILES ${CMAKE_BINARY_DIR}/bin/hipcc.bin DESTINATION ${BIN_INSTALL_DIR} RENAME hipcc PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ)
+install(FILES ${CMAKE_BINARY_DIR}/bin/hipconfig.bin DESTINATION ${BIN_INSTALL_DIR} RENAME hipconfig PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ)
 
 set(CHIP_CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR})
 set(CHIP_CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/HIPCC b/HIPCC
index 7ab224e1d..3aceb8f9f 160000
--- a/HIPCC
+++ b/HIPCC
@@ -1 +1 @@
-Subproject commit 7ab224e1dd4b61fea27f2e597f4505d7a8c80285
+Subproject commit 3aceb8f9fcf063191a1150b041dc0f287d40c7dc
diff --git a/bin/cuspvc-build.in b/bin/cuspvc-build.in
index 59685ac63..61fe46fec 100755
--- a/bin/cuspvc-build.in
+++ b/bin/cuspvc-build.in
@@ -29,6 +29,6 @@
 #=============================================================================
 
 export HIP_PLATFORM=spirv
+export PATH=@CLANG_BIN_DIR@:@CMAKE_BINARY_DIR@/bin:$PATH
 export HIP_PATH=@CMAKE_BINARY_DIR@
-export PATH=@CLANG_BIN_DIR@:@CMAKE_BINARY_DIR@/bin:@CMAKE_BINARY_DIR@/HIPCC:$PATH
 hipcc.bin @CHIP_INCLUDES@ "$@"