Merge branch 'amd-develop' into amd-master

Change-Id: I6c2d41bb1903f67a7d6fc288f1285ddfcc5a0407

CMakeLists.txt

@@ -175,15 +175,18 @@ if(HIP_PLATFORM STREQUAL "hcc")
         src/hip_memory.cpp
         src/hip_peer.cpp
         src/hip_stream.cpp
-        src/hip_module.cpp)
+        src/hip_module.cpp
+        src/env.cpp)
 
     set(SOURCE_FILES_DEVICE
         src/device_util.cpp
         src/hip_ldg.cpp
         src/hip_fp16.cpp
-        src/device_functions.cpp)
+        src/device_functions.cpp
+        src/math_functions.cpp)
 
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -L${HCC_HOME}/lib -lmcwamp -Wl,-Bsymbolic -Wl,-rpath ${HCC_HOME}/lib")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --amdgpu-target=gfx701 --amdgpu-target=gfx801 --amdgpu-target=gfx802 --amdgpu-target=gfx803")
     add_library(hip_hcc SHARED ${SOURCE_FILES_RUNTIME})
     target_link_libraries(hip_hcc c++ c++abi hc_am)
     add_library(hip_hcc_static STATIC ${SOURCE_FILES_RUNTIME})
@@ -216,7 +219,7 @@ add_custom_target(doc COMMAND HIP_PATH=${CMAKE_CURRENT_SOURCE_DIR} doxygen ${CMA
 # Install hip_hcc if platform is hcc
 if(HIP_PLATFORM STREQUAL "hcc")
     install(TARGETS hip_hcc_static hip_hcc hip_device DESTINATION lib)
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/hip_ir.ll DESTINATION lib)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/hip_hc.ll ${CMAKE_CURRENT_SOURCE_DIR}/src/hip_hc_gfx803.ll DESTINATION lib)
 
     # Install .hipInfo
     install(FILES ${PROJECT_BINARY_DIR}/.hipInfo DESTINATION lib)

CONTRIBUTING.md

@@ -126,7 +126,7 @@ Differences or limitations of HIP APIs as compared to CUDA APIs should be clearl
 
 - All HIP environment variables should begin with the keyword HIP_
     Environment variables should be long enough to describe their purpose but short enough so they can be remembered - perhaps 10-20 characters, with 3-4 parts separated by underscores.
-    To see the list of current environment variables, along with their values, set HIP_PRINT_ENV and run any hip applications on ROCM platform .
+    To see the list of current environment variables, along with their values, set HIP_PRINT_ENV and run any hip applications on ROCm platform .
     HIPCC or other tools may support additional environment variables which should follow the above convention.  
 
 

INSTALL.md

@@ -22,14 +22,14 @@ HIP code can be developed either on AMD ROCm platform using hcc compiler, or a C
 
 ## AMD-hcc
 
-* Install the [rocm](http://gpuopen.com/getting-started-with-boltzmann-components-platforms-installation/) packages.  Rocm will install all of the necessary components, including the kernel driver, runtime software, HCC compiler, and HIP.
+* Install the [rocm](http://gpuopen.com/getting-started-with-boltzmann-components-platforms-installation/) packages.  ROCm will install all of the necessary components, including the kernel driver, runtime software, HCC compiler, and HIP.
 
 * Default paths and environment variables:
 
    * By default HIP looks for hcc in /opt/rocm/hcc (can be overridden by setting HCC_HOME environment variable)
    * By default HIP looks for HSA in /opt/rocm/hsa (can be overridden by setting HSA_PATH environment variable) 
    * By default HIP is installed into /opt/rocm/hip (can be overridden by setting HIP_PATH environment variable).
-   * Optionally, consider adding /opt/rocm/bin to your path to make it easier to use the tools.
+   * Optionally, consider adding /opt/rocm/bin to your PATH to make it easier to use the tools.
 
 
 ## NVIDIA-nvcc
@@ -96,7 +96,7 @@ The native GCN target is included with upstream LLVM, and has also been integrat
 Binary packages for the direct-to-isa package are included with the [rocm](http://gpuopen.com/getting-started-with-boltzmann-components-platforms-installation/) package. 
 Alternatively, this sections describes how to build it from source: 
 
-1. Install the rocm packages as described above.
+1. Install the ROCm packages as described above.
 2. Follow the instructions [here](https://github.com/RadeonOpenCompute/HCC-Native-GCN-ISA/wiki)
    * In the make step for HCC, we recommend setting -DCMAKE_INSTALL_PREFIX.  
    * Set HCC_HOME environment variable before compiling HIP program to point to the native compiler:

bin/hccgenco.sh

@@ -46,17 +46,15 @@ done
 printf "\nint main(){}\n" >> $hipgenisa_main
 
 $HIP_PATH/bin/hipcc $hipgenisa_files -o $hipgenisa_dir/a.out
-mv dump.* $hipgenisa_dir
-$ROCM_PATH/hcc-lc/bin/llvm-mc -arch=amdgcn -mcpu=$ROCM_TARGET -filetype=obj $hipgenisa_dir/dump.isa -o $hipgenisa_dir/dump.o
-$ROCM_PATH/llvm/bin/clang -target amdgcn--amdhsa $hipgenisa_dir/dump.o -o $hipgenisa_dir/dump.co
+mv dump* $hipgenisa_dir
 
 map_sym=""
-kernels=$(objdump -t $hipgenisa_dir/dump.co | grep grid_launch_parm | sed 's/ \+/ /g; s/\t/ /g' | cut -d" " -f6)
+kernels=$(objdump -t $hipgenisa_dir/dump-fiji.hsaco | grep grid_launch_parm | sed 's/ \+/ /g; s/\t/ /g' | cut -d" " -f6)
 for mangled_sym in $kernels; do
-  real_sym=$(c++filt $(c++filt _$mangled_sym | cut -d: -f3 | sed 's/_functor//g') | cut -d\( -f1)
+  real_sym=$(c++filt $(c++filt $mangled_sym | cut -d: -f3 | sed 's/_functor//g') | cut -d\( -f1)
   map_sym="--redefine-sym $mangled_sym=$real_sym $map_sym"
 done
-objcopy -F elf64-little $map_sym $hipgenisa_dir/dump.co $OUTPUT_FILE
+objcopy -F elf64-little $map_sym $hipgenisa_dir/dump-fiji.hsaco $OUTPUT_FILE
 
 rm $hipgenisa_files
 rm -r $hipgenisa_dir

bin/hipcc

@@ -70,6 +70,11 @@ if ($verbose & 0x2) {
 # set if user explicitly requests -stdlib=libc++. (else we default to libstdc++ for better interop with g++):
 $setStdLib = 0;  # TODO - set to 0
 
+$target_gfx701 = 0;
+$target_gfx801 = 0;
+$target_gfx802 = 0;
+$target_gfx803 = 0;
+
 if ($HIP_PLATFORM eq "hcc") {
     $HSA_PATH=$ENV{'HSA_PATH'} // "/opt/rocm/hsa";
 
@@ -129,20 +134,6 @@ if ($HIP_PLATFORM eq "hcc") {
     }
     $HIPLDFLAGS .= " -L$HSA_PATH/lib -L$ROCM_PATH/lib -lhsa-runtime64 -lhc_am -lhsakmt";
 
-    # Handle ROCm target platform
-    if ($ROCM_TARGET eq "fiji") {
-        $HIPLDFLAGS .= " -amdgpu-target=AMD:AMDGPU:8:0:3";
-    }
-    if ($ROCM_TARGET eq "carrizo") {
-        $HIPLDFLAGS .= " -amdgpu-target=AMD:AMDGPU:8:0:1";
-    }
-    if ($ROCM_TARGET eq "hawaii") {
-        $HIPLDFLAGS .= " -amdgpu-target=AMD:AMDGPU:7:0:1";
-    }
-    if ($ROCM_TARGET eq "polaris") {
-        $HIPLDFLAGS .= " -amdgpu-target=AMD:AMDGPU:8:0:3";
-    }
-
     # Add trace marker library:
     # TODO - once we cleanly separate the HIP API headers from HIP library headers this logic should move to CMakebuild option - apps do not need to see the marker library.
     if ($HIP_ATP_MARKER) {
@@ -222,7 +213,8 @@ if($HIP_PLATFORM eq "hcc"){
 
 if(($HIP_PLATFORM eq "hcc")){
     $EXPORT_LL=" ";
-    $ENV{HCC_EXTRA_LIBRARIES}="$HIP_PATH/lib/hip_ir.ll\n";
+    $ENV{HCC_EXTRA_LIBRARIES}="$HIP_PATH/lib/hip_hc.ll\n";
+    $ENV{HIP_HC_IR_FILE}="";
 }
 
 if($HIP_PLATFORM eq "nvcc"){
@@ -261,6 +253,22 @@ foreach $arg (@ARGV)
         $HIPCXXFLAGS .= " -stdlib=libc++";
         $setStdLib = 1;
     }
+    if($arg eq '--amdgpu-target=gfx701')
+    {
+       $target_gfx701 = 1;
+    }
+    if($arg eq '--amdgpu-target=gfx801')
+    {
+       $target_gfx801 = 1;
+    }
+    if($arg eq '--amdgpu-target=gfx802')
+    {
+       $target_gfx802 = 1;
+    }
+    if($arg eq '--amdgpu-target=gfx803')
+    {
+       $target_gfx803 = 1;
+    }
     if(($trimarg eq '-stdlib=libstdc++') and ($setStdLib eq 0))
     {
         $HIPCXXFLAGS .= " -stdlib=libstdc++";
@@ -322,6 +330,36 @@ foreach $arg (@ARGV)
     $toolArgs .= " $arg" unless $swallowArg;
 }
 
+if($HIP_PLATFORM eq "hcc"){
+
+    $ENV{HCC_EXTRA_LIBRARIES}="$HIP_PATH/lib/hip_hc.ll\n";
+
+    # Handle ROCm target platform
+    if ($target_gfx701 eq 1) {
+        $HIPLDFLAGS .= " --amdgpu-target=gfx701";
+        $HIPCXXFLAGS .= " -D__HIP_ARCH_GFX701__=1 ";
+    }
+    if ($target_gfx801 eq 1) {
+        $HIPLDFLAGS .= " --amdgpu-target=gfx801";
+        $HIPCXXFLAGS .= " -D__HIP_ARCH_GFX801__=1 ";
+    }
+    if ($target_gfx802 eq 1) {
+        $HIPLDFLAGS .= " --amdgpu-target=gfx802";
+        $HIPCXXFLAGS .= " -D__HIP_ARCH_GFX802__=1 ";
+    }
+    if ($target_gfx803 eq 1) {
+        $HIPLDFLAGS .= " --amdgpu-target=gfx803";
+        $HIPCXXFLAGS .= " -D__HIP_ARCH_GFX803__=1 ";
+        $ENV{HCC_EXTRA_LIBRARIES_GFX803}="$HIP_PATH/lib/hip_hc_gfx803.ll\n";
+    }
+    if ($target_gfx701 eq 0 and $target_gfx801 eq 0 and $target_gfx802 eq 0 and $target_gfx803 eq 0)
+    {
+        $HIPLDFLAGS .= " --amdgpu-target=gfx701 --amdgpu-target=gfx801 --amdgpu-target=gfx802 --amdgpu-target=gfx803";
+        $ENV{HCC_EXTRA_LIBRARIES_GFX803}="$HIP_PATH/lib/hip_hc_gfx803.ll\n";
+    }
+
+}
+
 if ($hasC and $HIP_PLATFORM eq 'nvcc') {
     $HIPCXXFLAGS .= " -x cu";
 }
@@ -374,7 +412,8 @@ if ($printHipVersion) {
 }
 if ($runCmd) {
     if ($HIP_PLATFORM 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") && die ();
+        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'};
     }
     system ("$CMD") and die ();
 }