AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update hipcc to use HIP_COMPILER variable" into amd-master-next

Browse Source 
[ROCm/hip commit: d69ccdee27]
This commit is contained in:
Aaron En Ye Shi
2020-04-30 17:31:33 -04:00
committed by Gerrit Code Review
parent 7540dbc29c 318a527d31
commit cd1c9827e7
1 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/hip/bin/hipcc
+38 -33
View File
@@ -20,13 +20,15 @@ use Cwd 'abs_path';
# If HIP_PLATFORM is not set hipcc will attempt auto-detect based on if nvcc is found. # If HIP_PLATFORM is not set hipcc will attempt auto-detect based on if nvcc is found.
# #
# Other environment variable controls: # Other environment variable controls:
# HIP_PATH : Path to HIP directory, default is one dir level above location of this script # HIP_PATH : Path to HIP directory, default is one dir level above location of this script.
# CUDA_PATH : Path to CUDA SDK (default /usr/local/cuda). Used on NVIDIA platforms only. # CUDA_PATH : Path to CUDA SDK (default /usr/local/cuda). Used on NVIDIA platforms only.
# HCC_HOME : Path to HCC SDK (defaults to ../../hcc relative to this # HCC_HOME : Path to HCC SDK (defaults to ../../hcc relative to this
# script's abs_path). Used on AMD platforms only. # script's abs_path). Used on AMD platforms only.
# HSA_PATH : Path to HSA dir (defaults to ../../hsa relative to abs_path # HSA_PATH : Path to HSA dir (defaults to ../../hsa relative to abs_path
# of this script). Used on AMD platforms only. # of this script). Used on AMD platforms only.
# HIP_VDI_HOME : Path to HIP/VDI directory. Used on AMD platforms only. # HIP_VDI_HOME : Path to HIP/VDI directory. Used on AMD platforms only.
# HIP_CLANG_PATH : Path to HIP-Clang (default to ../../llvm/bin relative to this
# script's abs_path). Used on AMD platforms only.
if(scalar @ARGV == 0){ if(scalar @ARGV == 0){
print "No Arguments passed, exiting ...\n"; print "No Arguments passed, exiting ...\n";
@@ -120,11 +122,13 @@ sub delete_temp_dirs {
} }
#--- #---
#HIP_PLATFORM controls whether to use NVCC or HCC for compilation: #HIP_PLATFORM controls whether to use hcc (AMD) or nvcc as the platform:
$HIP_PLATFORM= `$HIP_PATH/bin/hipconfig --platform` // "hcc"; $HIP_PLATFORM= `$HIP_PATH/bin/hipconfig --platform` // "hcc";
$HIP_VERSION= `$HIP_PATH/bin/hipconfig --version`; $HIP_VERSION= `$HIP_PATH/bin/hipconfig --version`;
$HIP_COMPILER= $hipConfig{'HIP_COMPILER'}; #HIP_COMPILER controls whether to use hcc, clang or nvcc for compilation:
$HIP_RUNTIME= $hipConfig{'HIP_RUNTIME'}; $HIP_COMPILER= `$HIP_PATH/bin/hipconfig --compiler`;
#HIP_RUNTIME controls whether to use HCC, VDI, or NVCC as the runtime:
$HIP_RUNTIME= `$HIP_PATH/bin/hipconfig --runtime`;
# If using VDI runtime, need to find HIP_VDI_HOME # If using VDI runtime, need to find HIP_VDI_HOME
if (defined $HIP_RUNTIME and $HIP_RUNTIME eq "VDI" and !defined $HIP_VDI_HOME) { if (defined $HIP_RUNTIME and $HIP_RUNTIME eq "VDI" and !defined $HIP_VDI_HOME) {
@@ -151,8 +155,7 @@ if (defined $HIP_VDI_HOME) {
} }
} }
if (defined $HIP_COMPILER and $HIP_COMPILER eq "clang") { if (defined $HIP_COMPILER and $HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") {
$HIP_PLATFORM = "clang";
if (!defined $HIP_CLANG_PATH) { if (!defined $HIP_CLANG_PATH) {
$HIP_CLANG_PATH = "$ROCM_PATH/llvm/bin"; $HIP_CLANG_PATH = "$ROCM_PATH/llvm/bin";
} }
@@ -164,6 +167,8 @@ if (defined $HIP_COMPILER and $HIP_COMPILER eq "clang") {
if ($verbose & 0x2) { if ($verbose & 0x2) {
print ("HIP_PATH=$HIP_PATH\n"); print ("HIP_PATH=$HIP_PATH\n");
print ("HIP_PLATFORM=$HIP_PLATFORM\n"); print ("HIP_PLATFORM=$HIP_PLATFORM\n");
print ("HIP_COMPILER=$HIP_COMPILER\n");
print ("HIP_RUNTIME=$HIP_RUNTIME\n");
} }
# set if user explicitly requests -stdlib=libc++. (else we default to libstdc++ for better interop with g++): # set if user explicitly requests -stdlib=libc++. (else we default to libstdc++ for better interop with g++):
@@ -171,7 +176,7 @@ $setStdLib = 0; # TODO - set to 0
$default_amdgpu_target = 1; $default_amdgpu_target = 1;
if ($HIP_PLATFORM eq "clang") { if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") {
$HIPCC="$HIP_CLANG_PATH/clang++"; $HIPCC="$HIP_CLANG_PATH/clang++";
# If $HIPCC clang++ is not compiled, use clang instead # If $HIPCC clang++ is not compiled, use clang instead
@@ -228,7 +233,7 @@ if ($HIP_PLATFORM eq "clang") {
$HIPCFLAGS .= " -D__HIP_VDI__"; $HIPCFLAGS .= " -D__HIP_VDI__";
} }
} elsif ($HIP_PLATFORM eq "hcc") { } elsif ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "hcc") {
$HIP_INCLUDE_PATH = "$HIP_PATH/include"; $HIP_INCLUDE_PATH = "$HIP_PATH/include";
if (! defined $HIP_LIB_PATH) { if (! defined $HIP_LIB_PATH) {
$HIP_LIB_PATH = "$HIP_PATH/lib"; $HIP_LIB_PATH = "$HIP_PATH/lib";
@@ -331,6 +336,7 @@ if ($HIP_PLATFORM eq "clang") {
$HIPLDFLAGS = " -Wno-deprecated-gpu-targets -lcuda -lcudart -L$CUDA_PATH/lib64"; $HIPLDFLAGS = " -Wno-deprecated-gpu-targets -lcuda -lcudart -L$CUDA_PATH/lib64";
} else { } else {
printf ("error: unknown HIP_PLATFORM = '$HIP_PLATFORM'"); printf ("error: unknown HIP_PLATFORM = '$HIP_PLATFORM'");
printf (" or HIP_COMPILER = '$HIP_COMPILER'");
exit (-1); exit (-1);
} }
@@ -346,7 +352,7 @@ my $hasC = 0; # options contain a c-style file
my $hasCXX = 0; # options contain a cpp-style file (NVCC must force recognition as GPU file) my $hasCXX = 0; # options contain a cpp-style file (NVCC must force recognition as GPU file)
my $hasCU = 0; # options contain a cu-style file (HCC must force recognition as GPU file) my $hasCU = 0; # options contain a cu-style file (HCC must force recognition as GPU file)
my $hasHIP = 0; # options contain a hip-style file (HIP-Clang must pass offloading options) my $hasHIP = 0; # options contain a hip-style file (HIP-Clang must pass offloading options)
my $needHipHcc = ($HIP_PLATFORM eq 'hcc'); # set if we need to link hip_hcc.o from src tree. (some builds, ie cmake, provide their own) my $needHipHcc = ($HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'hcc'); # set if we need to link hip_hcc.o from src tree. (some builds, ie cmake, provide their own)
my $printHipVersion = 0; # print HIP version my $printHipVersion = 0; # print HIP version
my $printCXXFlags = 0; # print HIPCXXFLAGS my $printCXXFlags = 0; # print HIPCXXFLAGS
my $printLDFlags = 0; # print HIPLDFLAGS my $printLDFlags = 0; # print HIPLDFLAGS
@@ -370,7 +376,7 @@ if ($verbose & 0x4) {
# Handle code object generation # Handle code object generation
my $ISACMD=""; my $ISACMD="";
if($HIP_PLATFORM eq "hcc"){ if($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "hcc"){
$ISACMD .= "$HIP_PATH/bin/lpl "; $ISACMD .= "$HIP_PATH/bin/lpl ";
if($ARGV[0] eq "--genco"){ if($ARGV[0] eq "--genco"){
foreach $isaarg (@ARGV[1..$#ARGV]){ foreach $isaarg (@ARGV[1..$#ARGV]){
@@ -385,7 +391,7 @@ if($HIP_PLATFORM eq "hcc"){
} }
} }
if(($HIP_PLATFORM eq "hcc")){ if(($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "hcc")){
$ENV{HCC_EXTRA_LIBRARIES}="\n"; $ENV{HCC_EXTRA_LIBRARIES}="\n";
} }
@@ -446,7 +452,7 @@ foreach $arg (@ARGV)
$targetsStr .= substr($arg, length($targetOpt)); $targetsStr .= substr($arg, length($targetOpt));
$default_amdgpu_target = 0; $default_amdgpu_target = 0;
# hip-clang does not accept --amdgpu-target= options. # hip-clang does not accept --amdgpu-target= options.
if ($HIP_PLATFORM eq 'clang') { if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") {
$swallowArg = 1; $swallowArg = 1;
} }
} }
@@ -459,7 +465,7 @@ foreach $arg (@ARGV)
$coFormatv3 = 0; $coFormatv3 = 0;
} }
if (($arg =~ /--genco/) and $HIP_PLATFORM eq 'clang' ) { if (($arg =~ /--genco/) and $HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'clang' ) {
$arg = "--cuda-device-only"; $arg = "--cuda-device-only";
} }
@@ -512,7 +518,7 @@ foreach $arg (@ARGV)
## hip-clang in command line. ## hip-clang in command line.
## ToDo: Remove this after hip-clang switch to lto and lld is able to ## ToDo: Remove this after hip-clang switch to lto and lld is able to
## handle clang-offload-bundler bundles. ## handle clang-offload-bundler bundles.
if ($arg =~ m/^-Wl,@/ and $HIP_PLATFORM eq 'clang') { if ($arg =~ m/^-Wl,@/ and $HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'clang') {
my $file = substr $arg, 5; my $file = substr $arg, 5;
open my $in, "<:encoding(utf8)", $file or die "$file: $!"; open my $in, "<:encoding(utf8)", $file or die "$file: $!";
my $new_arg = ""; my $new_arg = "";
@@ -568,13 +574,12 @@ foreach $arg (@ARGV)
close $out; close $out;
$arg = "$new_arg -Wl,\@$new_file"; $arg = "$new_arg -Wl,\@$new_file";
} elsif (($arg =~ m/\.a$/ || $arg =~ m/\.lo$/) && } elsif (($arg =~ m/\.a$/ || $arg =~ m/\.lo$/) &&
$HIP_PLATFORM eq 'clang') { $HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'clang') {
## process static library for hip-clang ## process static library for hip-clang
## extract object files from static library and pass them directly to ## extract object files from static library and pass them directly to
## hip-clang. ## hip-clang.
## ToDo: Remove this after hip-clang switch to lto and lld is able to ## ToDo: Remove this after hip-clang switch to lto and lld is able to
## handle clang-offload-bundler bundles. ## handle clang-offload-bundler bundles.
my $new_arg = ""; my $new_arg = "";
my $tmpdir = get_temp_dir (); my $tmpdir = get_temp_dir ();
my $libFile = $arg; my $libFile = $arg;
@@ -661,7 +666,7 @@ foreach $arg (@ARGV)
} }
elsif ((($arg =~ /\.cu$/ or $arg =~ /\.cuh$/) and $HIP_COMPILE_CXX_AS_HIP ne '0') or ($arg =~ /\.hip$/)) { elsif ((($arg =~ /\.cu$/ or $arg =~ /\.cuh$/) and $HIP_COMPILE_CXX_AS_HIP ne '0') or ($arg =~ /\.hip$/)) {
$needCXXFLAGS = 1; $needCXXFLAGS = 1;
if ($HIP_COMPILER eq "clang") { if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") {
$hasHIP = 1; $hasHIP = 1;
$toolArgs .= " -x hip"; $toolArgs .= " -x hip";
} else { } else {
@@ -675,7 +680,7 @@ foreach $arg (@ARGV)
$prevArg = $arg; $prevArg = $arg;
} }
if($HIP_PLATFORM eq "hcc" or $HIP_PLATFORM eq "clang"){ if($HIP_PLATFORM eq "hcc"){
# No AMDGPU target specified at commandline. So look for HCC_AMDGPU_TARGET # No AMDGPU target specified at commandline. So look for HCC_AMDGPU_TARGET
if($default_amdgpu_target eq 1) { if($default_amdgpu_target eq 1) {
if (defined $ENV{HCC_AMDGPU_TARGET}) { if (defined $ENV{HCC_AMDGPU_TARGET}) {
@@ -692,7 +697,7 @@ if($HIP_PLATFORM eq "hcc" or $HIP_PLATFORM eq "clang"){
# Parse the targets collected in targetStr and set corresponding compiler options. # Parse the targets collected in targetStr and set corresponding compiler options.
my @targets = split(',', $targetsStr); my @targets = split(',', $targetsStr);
if($HIP_PLATFORM eq "hcc") { if($HIP_COMPILER eq "hcc") {
$GPU_ARCH_OPT = " --amdgpu-target="; $GPU_ARCH_OPT = " --amdgpu-target=";
} else { } else {
$GPU_ARCH_OPT = " --cuda-gpu-arch="; $GPU_ARCH_OPT = " --cuda-gpu-arch=";
@@ -708,7 +713,7 @@ if($HIP_PLATFORM eq "hcc" or $HIP_PLATFORM eq "clang"){
$GPU_ARCH_ARG = $GPU_ARCH_OPT . $val; $GPU_ARCH_ARG = $GPU_ARCH_OPT . $val;
$HIPLDARCHFLAGS .= $GPU_ARCH_ARG; $HIPLDARCHFLAGS .= $GPU_ARCH_ARG;
$HIPCXXFLAGS .= $archMacro; $HIPCXXFLAGS .= $archMacro;
if ($HIP_PLATFORM eq 'clang' and $hasHIP) { if ($HIP_COMPILER eq 'clang' and $hasHIP) {
$HIPCXXFLAGS .= $GPU_ARCH_ARG; $HIPCXXFLAGS .= $GPU_ARCH_ARG;
} }
@@ -729,7 +734,7 @@ if($HIP_PLATFORM eq "hcc" or $HIP_PLATFORM eq "clang"){
# hcc defaults to v2, so we need to convert to the appropriate flag # hcc defaults to v2, so we need to convert to the appropriate flag
# hip-clang defaults to v3, so we don't need to do anything # hip-clang defaults to v3, so we don't need to do anything
if ($coFormatv3 and $HIP_PLATFORM eq 'hcc') { if ($coFormatv3 and $HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'hcc') {
$HIPLDFLAGS .= " -mcode-object-v3"; $HIPLDFLAGS .= " -mcode-object-v3";
$HIPCXXFLAGS .= " -mcode-object-v3"; $HIPCXXFLAGS .= " -mcode-object-v3";
} }
@@ -737,7 +742,7 @@ if ($coFormatv3 and $HIP_PLATFORM eq 'hcc') {
if ($hasCXX and $HIP_PLATFORM eq 'nvcc') { if ($hasCXX and $HIP_PLATFORM eq 'nvcc') {
$HIPCXXFLAGS .= " -x cu"; $HIPCXXFLAGS .= " -x cu";
} }
if ($hasCU and $HIP_PLATFORM eq 'hcc') { if ($hasCU and $HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'hcc') {
$HIPCXXFLAGS .= " -x c++"; $HIPCXXFLAGS .= " -x c++";
} }
@@ -746,17 +751,17 @@ if ($buildDeps and $HIP_PLATFORM eq 'nvcc') {
$HIPCFLAGS .= " -M -D__CUDACC__"; $HIPCFLAGS .= " -M -D__CUDACC__";
} }
if ($buildDeps and $HIP_PLATFORM eq 'clang') { if ($buildDeps and $HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'clang') {
$HIPCXXFLAGS .= " --cuda-host-only"; $HIPCXXFLAGS .= " --cuda-host-only";
} }
# Add --hip-link only if it is compile only and -fgpu-rdc is on. # Add --hip-link only if it is compile only and -fgpu-rdc is on.
if ($rdc and !$compileOnly and $HIP_PLATFORM eq 'clang') { if ($rdc and !$compileOnly and $HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'clang') {
$HIPLDFLAGS .= " --hip-link"; $HIPLDFLAGS .= " --hip-link";
$HIPLDFLAGS .= $HIPLDARCHFLAGS; $HIPLDFLAGS .= $HIPLDARCHFLAGS;
} }
if ($setStdLib eq 0 and $HIP_PLATFORM eq 'hcc') if ($setStdLib eq 0 and $HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'hcc')
{ {
$HIPCXXFLAGS .= $HCC_WA_FLAGS; $HIPCXXFLAGS .= $HCC_WA_FLAGS;
} }
@@ -774,7 +779,7 @@ if ($needHipHcc) {
# Reason is that NVCC uses the file extension to determine whether to compile in CUDA mode or # Reason is that NVCC uses the file extension to determine whether to compile in CUDA mode or
# pass-through CPP mode. # pass-through CPP mode.
if ($HIP_PLATFORM eq "clang") { if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") {
# Set default optimization level to -O3 for hip-clang. # Set default optimization level to -O3 for hip-clang.
if ($optArg eq "") { if ($optArg eq "") {
$HIPCXXFLAGS .= " -O3"; $HIPCXXFLAGS .= " -O3";
@@ -849,7 +854,7 @@ if ($printLDFlags) {
print $HIPLDFLAGS; print $HIPLDFLAGS;
} }
if ($runCmd) { if ($runCmd) {
if ($HIP_PLATFORM eq "hcc" and exists($hipConfig{'HCC_VERSION'}) and $HCC_VERSION ne $hipConfig{'HCC_VERSION'}) { if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "hcc" and exists($hipConfig{'HCC_VERSION'}) and $HCC_VERSION ne $hipConfig{'HCC_VERSION'}) {
print ("HIP ($HIP_PATH) was built using hcc $hipConfig{'HCC_VERSION'}, but you are using $HCC_HOME/hcc with version $HCC_VERSION from hipcc. Please rebuild HIP including cmake or update HCC_HOME variable.\n") ; print ("HIP ($HIP_PATH) was built using hcc $hipConfig{'HCC_VERSION'}, but you are using $HCC_HOME/hcc with version $HCC_VERSION from hipcc. Please rebuild HIP including cmake or update HCC_HOME variable.\n") ;
die unless $ENV{'HIP_IGNORE_HCC_VERSION'}; die unless $ENV{'HIP_IGNORE_HCC_VERSION'};
} }