From 5262693da036ee623327e4f00141b7a2da33c2b6 Mon Sep 17 00:00:00 2001
From: Ioannis Assiouras <Ioannis.Assiouras@amd.com>
Date: Mon, 7 Aug 2023 19:33:00 +0100
Subject: [PATCH] SWDEV-415849 - Revert "SWDEV-386448 - Remove setting of
 HIP_CLANG_ROOT, HIP_PATH and ROCM_PATH in hip-config.cmake"

This reverts commit 24f1368ad34b5dc40aa85619514d40d0f88413bf.

HIP_PATH is still needed on windows as amd_build.py injects
depedency to HIP_PATH variable in hip-targets.cmake

Change-Id: I57d9aff3e8046a7381affaf5adc5b130d5702190
---
 CHANGELOG.md                |  2 +-
 hipamd/hip-config-amd.cmake | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7125223be4..ccf3eb238d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ Full documentation for HIP is available at [docs.amd.com](https://docs.amd.com/)
 ### Added
 
 ### Changed
-- find_package(hip) does not set HIP_CLANG_ROOT, HIP_PATH and ROCM_PATH cmake variables anymore
+
 ### Fixed
 
 ### Known Issues
diff --git a/hipamd/hip-config-amd.cmake b/hipamd/hip-config-amd.cmake
index 657134509e..0eafe0e69d 100755
--- a/hipamd/hip-config-amd.cmake
+++ b/hipamd/hip-config-amd.cmake
@@ -23,6 +23,40 @@ if(NOT DEFINED HIP_CLANG_NUM_PARALLEL_JOBS)
   set(HIP_CLANG_NUM_PARALLEL_JOBS 1)
 endif()
 
+# Windows Specific Definition here:
+if(WIN32)
+  if(DEFINED ENV{HIP_PATH})
+    file(TO_CMAKE_PATH "$ENV{HIP_PATH}" HIP_PATH)
+  elseif(DEFINED ENV{HIP_DIR})
+    file(TO_CMAKE_PATH "$ENV{HIP_DIR}" HIP_DIR)
+  else()
+    # using the HIP found
+    set(HIP_PATH ${PACKAGE_PREFIX_DIR})
+  endif()
+else()
+  # Linux
+  # If HIP is not installed under ROCm, need this to find HSA assuming HSA is under ROCm
+  if(DEFINED ENV{ROCM_PATH})
+    set(ROCM_PATH "$ENV{ROCM_PATH}")
+  endif()
+
+  # set a default path for ROCM_PATH
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH ${PACKAGE_PREFIX_DIR})
+  endif()
+
+endif()
+
+if(WIN32)
+  # Using SDK folder
+  file(TO_CMAKE_PATH "${HIP_PATH}" HIP_CLANG_ROOT)
+  if (NOT EXISTS "${HIP_CLANG_ROOT}/bin/clang.exe")
+    # if using install folder
+    file(TO_CMAKE_PATH "${HIP_PATH}/../lc" HIP_CLANG_ROOT)
+  endif()
+else()
+  set(HIP_CLANG_ROOT "${ROCM_PATH}/llvm")
+endif()
 if(NOT HIP_CXX_COMPILER)
   set(HIP_CXX_COMPILER ${CMAKE_CXX_COMPILER})
 endif()