From d29a0979053ff52339e6878be8ea4ac4bdf52d08 Mon Sep 17 00:00:00 2001
From: Maneesh Gupta <maneesh.gupta@amd.com>
Date: Tue, 14 Mar 2017 14:25:34 +0530
Subject: [PATCH] hipcc: Support targets specified via HCC_AMDGPU_TARGET

Change-Id: I69fda40d9f666325d377f4b4335e7ee693069214
---
 hipamd/bin/hipcc | 84 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 55 insertions(+), 29 deletions(-)

diff --git a/hipamd/bin/hipcc b/hipamd/bin/hipcc
index bd6ce9b4e4..7179517f7b 100755
--- a/hipamd/bin/hipcc
+++ b/hipamd/bin/hipcc
@@ -23,8 +23,8 @@ use File::Basename;
 # HSA_PATH  : Path to HSA dir (default /opt/rocm/hsa).  Used on AMD platforms only.
 
 if(scalar @ARGV == 0){
-print "No Arguments passed, exiting ...\n";
-exit(-1);
+    print "No Arguments passed, exiting ...\n";
+    exit(-1);
 }
 
 #---
@@ -190,18 +190,18 @@ if ($verbose & 0x4) {
 # Handle code object generation
 my $ISACMD="";
 if($HIP_PLATFORM eq "hcc"){
-  $ISACMD .= "set ROCM_PATH=$ROCM_PATH && set ROCM_TARGET=$ROCM_TARGET && $HIP_PATH/bin/hccgenco.sh ";
-  if($ARGV[0] eq "--genco"){
-    foreach $isaarg (@ARGV[1..$#ARGV]){
-      $ISACMD .= " ";
-      $ISACMD .= $isaarg;
+    $ISACMD .= "set ROCM_PATH=$ROCM_PATH && set ROCM_TARGET=$ROCM_TARGET && $HIP_PATH/bin/hccgenco.sh ";
+    if($ARGV[0] eq "--genco"){
+        foreach $isaarg (@ARGV[1..$#ARGV]){
+            $ISACMD .= " ";
+            $ISACMD .= $isaarg;
+        }
+        if ($verbose & 0x1) {
+            print "hipcc-cmd: ", $ISACMD, "\n";
+        }
+        system($ISACMD) and die();
+        exit(0);
     }
-    if ($verbose & 0x1) {
-      print "hipcc-cmd: ", $ISACMD, "\n";
-    }
-    system($ISACMD) and die();
-    exit(0);
-  }
 }
 
 if(($HIP_PLATFORM eq "hcc")){
@@ -211,18 +211,18 @@ if(($HIP_PLATFORM eq "hcc")){
 }
 
 if($HIP_PLATFORM eq "nvcc"){
-  $ISACMD .= "$HIP_PATH/bin/hipcc -ptx ";
-  if($ARGV[0] eq "--genco"){
-    foreach $isaarg (@ARGV[1..$#ARGV]){
-      $ISACMD .= " ";
-      $ISACMD .= $isaarg;
+    $ISACMD .= "$HIP_PATH/bin/hipcc -ptx ";
+    if($ARGV[0] eq "--genco"){
+        foreach $isaarg (@ARGV[1..$#ARGV]){
+            $ISACMD .= " ";
+            $ISACMD .= $isaarg;
+        }
+        if ($verbose & 0x1) {
+            print "hipcc-cmd: ", $ISACMD, "\n";
+        }
+        system($ISACMD) and die();
+        exit(0);
     }
-    if ($verbose & 0x1) {
-      print "hipcc-cmd: ", $ISACMD, "\n";
-    }
-    system($ISACMD) and die();
-    exit(0);
-  }
 }
 
 my $toolArgs = "";  # arguments to pass to the hcc or nvcc tool
@@ -248,24 +248,25 @@ foreach $arg (@ARGV)
     }
     if($arg eq '--amdgpu-target=gfx701')
     {
-       $target_gfx701 = 1;
+        $target_gfx701 = 1;
     }
     if($arg eq '--amdgpu-target=gfx801')
     {
-       $target_gfx801 = 1;
+        $target_gfx801 = 1;
     }
     if($arg eq '--amdgpu-target=gfx802')
     {
-       $target_gfx802 = 1;
+        $target_gfx802 = 1;
     }
     if($arg eq '--amdgpu-target=gfx803')
     {
-       $target_gfx803 = 1;
+        $target_gfx803 = 1;
     }
     if($arg eq '--amdgpu-target=gfx900')
     {
-       $target_gfx900 = 1;
+        $target_gfx900 = 1;
     }
+
     if(($trimarg eq '-stdlib=libstdc++') and ($setStdLib eq 0))
     {
         $HIPCXXFLAGS .= $HCC_WA_FLAGS;
@@ -325,6 +326,29 @@ foreach $arg (@ARGV)
     }
     $toolArgs .= " $arg" unless $swallowArg;
 }
+foreach my $target (split(/,/, $ENV{HCC_AMDGPU_TARGET}))
+{
+    if($target eq 'gfx701')
+    {
+        $target_gfx701 = 1;
+    }
+    if($target eq 'gfx801')
+    {
+        $target_gfx801 = 1;
+    }
+    if($target eq 'gfx802')
+    {
+        $target_gfx802 = 1;
+    }
+    if($target eq 'gfx803')
+    {
+        $target_gfx803 = 1;
+    }
+    if($target eq 'gfx900')
+    {
+        $target_gfx900 = 1;
+    }
+}
 
 if($HIP_PLATFORM eq "hcc"){
 
@@ -416,3 +440,5 @@ if ($runCmd) {
     }
     system ("$CMD") and die ();
 }
+
+# vim: ts=4:sw=4:expandtab:smartindent