From b664ce3985d8a17bec867aba2ed26a5638738b44 Mon Sep 17 00:00:00 2001
From: cjatin <jatin.chaudhary@amd.com>
Date: Tue, 27 Apr 2021 14:51:50 +0530
Subject: [PATCH] SWDEV-277903 - Add HIP_ROCCLR_HOME under HIP_PLATFORM==amd

Change-Id: I00e156eb0a51f505300e288af59a0cf39b606e26


[ROCm/hip commit: a717608f9351d1a8ce6edf9019de67639ef4d15e]
---
 projects/hip/bin/hipcc | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/projects/hip/bin/hipcc b/projects/hip/bin/hipcc
index a74c79ec10..e4c7c9c5fb 100755
--- a/projects/hip/bin/hipcc
+++ b/projects/hip/bin/hipcc
@@ -110,17 +110,16 @@ $HIP_VERSION    =   $hipvars::HIP_VERSION;
 $HSA_PATH       =   $hipvars::HSA_PATH;
 $HIP_ROCCLR_HOME =   $hipvars::HIP_ROCCLR_HOME;
 
-# If using ROCclr runtime, need to find HIP_ROCCLR_HOME
-
-if (!defined $DEVICE_LIB_PATH and -e "$HIP_ROCCLR_HOME/lib/bitcode") {
-    $DEVICE_LIB_PATH = "$HIP_ROCCLR_HOME/lib/bitcode";
-}
-$HIP_INCLUDE_PATH = "$HIP_ROCCLR_HOME/include";
-if (!defined $HIP_LIB_PATH) {
-    $HIP_LIB_PATH = "$HIP_ROCCLR_HOME/lib";
-}
-
 if ($HIP_PLATFORM eq "amd") {
+  # If using ROCclr runtime, need to find HIP_ROCCLR_HOME
+  if (!defined $DEVICE_LIB_PATH and -e "$HIP_ROCCLR_HOME/lib/bitcode") {
+    $DEVICE_LIB_PATH = "$HIP_ROCCLR_HOME/lib/bitcode";
+  }
+  $HIP_INCLUDE_PATH = "$HIP_ROCCLR_HOME/include";
+  if (!defined $HIP_LIB_PATH) {
+    $HIP_LIB_PATH = "$HIP_ROCCLR_HOME/lib";
+  }
+
   if (!defined $DEVICE_LIB_PATH) {
     if (-e "$ROCM_PATH/amdgcn/bitcode") {
       $DEVICE_LIB_PATH = "$ROCM_PATH/amdgcn/bitcode";