From 1c669b3028e884340628e2324f68900b2e283f19 Mon Sep 17 00:00:00 2001
From: Aaron Enye Shi <enye.shi@gmail.com>
Date: Thu, 7 May 2020 17:28:07 +0000
Subject: [PATCH] SWDEV-234954 - Fix hipconfig on Windows

Before setting the HIP_RUNTIME and HIP_COMPILER variables, first check the environment if these are set. We should prioritize the environment settings. For windows, it will be set, and also explicitly call perl when invoking hipconfig.

Change-Id: I89ad267285239e6d8a897dc681c4af5906e7b9d8


[ROCm/clr commit: c70a32c5a7d26122e8fab366e9cc3805ba37041f]
---
 projects/clr/hipamd/bin/hipcc     | 16 ++++++++++++----
 projects/clr/hipamd/bin/hipconfig | 11 +++++++++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/projects/clr/hipamd/bin/hipcc b/projects/clr/hipamd/bin/hipcc
index 171eddef5c..b346be60e2 100755
--- a/projects/clr/hipamd/bin/hipcc
+++ b/projects/clr/hipamd/bin/hipcc
@@ -123,12 +123,20 @@ sub delete_temp_dirs {
 
 #---
 #HIP_PLATFORM controls whether to use hcc (AMD) or nvcc as the platform:
-$HIP_PLATFORM= `$HIP_PATH/bin/hipconfig --platform` // "hcc";
-$HIP_VERSION= `$HIP_PATH/bin/hipconfig --version`;
 #HIP_COMPILER controls whether to use hcc, clang or nvcc for compilation:
-$HIP_COMPILER= `$HIP_PATH/bin/hipconfig --compiler`;
 #HIP_RUNTIME controls whether to use HCC, ROCclr, or NVCC as the runtime:
-$HIP_RUNTIME= `$HIP_PATH/bin/hipconfig --runtime`;
+if ($isWindows) {
+    # Windows cannot run perl natively, so hipcc will explicitly call perl
+    $HIP_PLATFORM= `perl $HIP_PATH/bin/hipconfig --platform`;
+    $HIP_VERSION= `perl $HIP_PATH/bin/hipconfig --version`;
+    $HIP_COMPILER= `perl $HIP_PATH/bin/hipconfig --compiler`;
+    $HIP_RUNTIME= `perl $HIP_PATH/bin/hipconfig --runtime`;
+} else {
+    $HIP_PLATFORM= `$HIP_PATH/bin/hipconfig --platform`;
+    $HIP_VERSION= `$HIP_PATH/bin/hipconfig --version`;
+    $HIP_COMPILER= `$HIP_PATH/bin/hipconfig --compiler`;
+    $HIP_RUNTIME= `$HIP_PATH/bin/hipconfig --runtime`;
+}
 
 # If using ROCclr runtime, need to find HIP_ROCclr_HOME
 if (defined $HIP_RUNTIME and $HIP_RUNTIME eq "ROCclr" and !defined $HIP_ROCclr_HOME) {
diff --git a/projects/clr/hipamd/bin/hipconfig b/projects/clr/hipamd/bin/hipconfig
index ecd1449b2e..d26851f0db 100755
--- a/projects/clr/hipamd/bin/hipconfig
+++ b/projects/clr/hipamd/bin/hipconfig
@@ -85,6 +85,8 @@ $CUDA_PATH=$ENV{'CUDA_PATH'} // '/usr/local/cuda';
 $HCC_HOME=$ENV{'HCC_HOME'} // "$ROCM_PATH/hcc";
 $HSA_PATH=$ENV{'HSA_PATH'} // "$ROCM_PATH/hsa";
 $HIP_CLANG_PATH=$ENV{'HIP_CLANG_PATH'} // "$ROCM_PATH/llvm/bin";
+# HIP_ROCclr_HOME is used by Windows builds
+$HIP_ROCclr_HOME=$ENV{'HIP_ROCclr_HOME'};
 
 #---
 #HIP_PLATFORM controls whether to use NVCC or HCC for compilation:
@@ -92,8 +94,9 @@ $HIP_PLATFORM=$ENV{'HIP_PLATFORM'};
 # Read .hipInfo
 my %hipInfo = ();
 parse_config_file("$HIP_PATH/lib/.hipInfo", \%hipInfo);
-$HIP_COMPILER = $hipInfo{'HIP_COMPILER'} // "hcc";
-$HIP_RUNTIME = $hipInfo{'HIP_RUNTIME'} // "HCC";
+# Prioritize Env first, otherwise use the hipInfo config file
+$HIP_COMPILER = $ENV{'HIP_COMPILER'} // $hipInfo{'HIP_COMPILER'} // "hcc";
+$HIP_RUNTIME = $ENV{'HIP_RUNTIME'} // $hipInfo{'HIP_RUNTIME'} // "HCC";
 
 if (not defined $HIP_PLATFORM) {
     if (can_run("$HCC_HOME/bin/hcc") or can_run("hcc")) {
@@ -112,6 +115,10 @@ if ($HIP_COMPILER eq "hcc") {
     $CPP_CONFIG = " -D__HIP_PLATFORM_HCC__=  -I$HIP_PATH/include -I$HCC_HOME/include -I$HSA_PATH/include";
 }
 if ($HIP_COMPILER eq "clang") {
+    # Windows does not have clang at linux default path
+    if (defined $HIP_ROCclr_HOME and (-e "$HIP_ROCclr_HOME/bin/clang" or -e "$HIP_ROCclr_HOME/bin/clang.exe")) {
+        $HIP_CLANG_PATH = "$HIP_ROCclr_HOME/bin";
+    }
     $HIP_CLANG_VERSION = `$HIP_CLANG_PATH/clang++ --version`;
     $HIP_CLANG_VERSION=~/.*clang version ([^ ]+).*/;
     $HIP_CLANG_VERSION=$1;