Merge branch 'amd-develop' into amd-master

Change-Id: I393d1a8c7c5cdb2ca63098bf81ff9b98ea5e7b16

CMakeLists.txt

@@ -68,9 +68,10 @@ if(HIP_PLATFORM STREQUAL "hcc")
     endif()
     if(IS_ABSOLUTE ${HCC_HOME} AND EXISTS ${HCC_HOME} AND IS_DIRECTORY ${HCC_HOME})
         execute_process(COMMAND ${HCC_HOME}/bin/hcc --version
-            COMMAND cut -d\  -f9
             OUTPUT_VARIABLE HCC_VERSION
             OUTPUT_STRIP_TRAILING_WHITESPACE)
+        string(REGEX REPLACE ".*based on HCC " "" HCC_VERSION ${HCC_VERSION})
+        string(REGEX REPLACE " .*" "" HCC_VERSION ${HCC_VERSION})
         message(STATUS "Looking for HCC in: " ${HCC_HOME} ". Found version: " ${HCC_VERSION})
     else()
         message(FATAL_ERROR "Don't know where to find HCC. Please specify abolute path using -DHCC_HOME")
@@ -159,7 +160,7 @@ if(HIP_PLATFORM STREQUAL "hcc")
 
     # Add remaining flags
     execute_process(COMMAND ${HCC_HOME}/bin/hcc-config --cxxflags OUTPUT_VARIABLE HCC_CXX_FLAGS)
-    set(HIP_HCC_BUILD_FLAGS "${HIP_HCC_BUILD_FLAGS} -fPIC ${HCC_CXX_FLAGS} -I${HSA_PATH}/include -I/opt/rocm/libhsakmt/include")
+    set(HIP_HCC_BUILD_FLAGS "${HIP_HCC_BUILD_FLAGS} -fPIC ${HCC_CXX_FLAGS} -I${HSA_PATH}/include")
 
     # Set compiler and compiler flags
     set(CMAKE_CXX_COMPILER "${HCC_HOME}/bin/hcc")
@@ -367,22 +368,28 @@ endif()
 # Testing steps
 #############################
 # Target: test
-set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/hip_tests)
-configure_file(tests/hip_tests.txt ${BUILD_DIR}/CMakeLists.txt @ONLY)
-if(POLICY CMP0037)
-    cmake_policy(PUSH)
-    cmake_policy(SET CMP0037 OLD)
+set(HIP_PATH ${CMAKE_INSTALL_PREFIX})
+set(HIP_SRC_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/cmake" "${HIP_PATH}/cmake" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
+if(${RUN_HIT} EQUAL 0)
+    execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/bin" "${HIP_PATH}/bin" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
 endif()
-add_custom_target(install_for_test COMMAND "${CMAKE_COMMAND}" --build . --target install
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-execute_process(COMMAND getconf _NPROCESSORS_ONLN OUTPUT_VARIABLE DASH_JAY OUTPUT_STRIP_TRAILING_WHITESPACE)
-add_custom_target(test COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} .
-    COMMAND make -j ${DASH_JAY}
-    COMMAND make test
-    WORKING_DIRECTORY ${BUILD_DIR}
-    DEPENDS install_for_test)
-if(POLICY CMP0037)
-    cmake_policy(POP)
+if(${RUN_HIT} EQUAL 0)
+    set(CMAKE_MODULE_PATH "${HIP_PATH}/cmake" ${CMAKE_MODULE_PATH})
+    include(${HIP_SRC_PATH}/tests/hit/HIT.cmake)
+
+    # Add tests
+    include_directories(${HIP_SRC_PATH}/tests/src)
+    hit_add_directory_recursive(${HIP_SRC_PATH}/tests/src "directed_tests")
+
+    # Add top-level tests to build_tests
+    add_custom_target(build_tests DEPENDS directed_tests)
+
+    # Add custom target: check
+    add_custom_target(check COMMAND "${CMAKE_COMMAND}" --build . --target test DEPENDS build_tests)
+else()
+    message(STATUS "Testing targets will not be available. To enable them please ensure that the HIP installation directory is writeable. Use -DCMAKE_INSTALL_PREFIX to specify a suitable location")
 endif()
 
+
 # vim: ts=4:sw=4:expandtab:smartindent

bin/hipcc

@@ -80,8 +80,11 @@ if ($HIP_PLATFORM eq "hcc") {
 
     $HCC_HOME=$ENV{'HCC_HOME'} // $hipConfig{'HCC_HOME'} // "/opt/rocm/hcc";
 
-    $HCC_VERSION=`${HCC_HOME}/bin/hcc --version | cut -d" " -f9 | tr -d "\n"`;
-    $HCC_VERSION_MAJOR=`${HCC_HOME}/bin/hcc --version | cut -d" " -f9 | cut -d"." -f1 | tr -d "\n"`;
+    $HCC_VERSION=`${HCC_HOME}/bin/hcc --version`;
+    $HCC_VERSION=~/.*based on HCC ([^ ]+).*/;
+    $HCC_VERSION=$1;
+    $HCC_VERSION_MAJOR=$HCC_VERSION;
+    $HCC_VERSION_MAJOR=~s/\..*//;
 
     $ROCM_PATH=$ENV{'ROCM_PATH'} // "/opt/rocm";
 
@@ -92,7 +95,7 @@ if ($HIP_PLATFORM eq "hcc") {
 
     # HCC* may be used to compile src/hip_hcc.o (and also feed the HIPCXXFLAGS below)
     $HCC = "$HCC_HOME/bin/hcc";
-    $HCCFLAGS = "-hc -I$HCC_HOME/include ";
+    $HCCFLAGS = "-hc  -D__HIPCC__ -I$HCC_HOME/include ";
 
     $HIPCC=$HCC;
     $HIPCXXFLAGS = $HCCFLAGS;

bin/hipcc_cmake_linker_helper

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+SOURCE="${BASH_SOURCE[0]}"
+HIP_PATH="$( command cd -P "$( dirname "$SOURCE" )/.." && pwd )"
+HCC_HOME=$1 $HIP_PATH/bin/hipcc "${@:2}"

cmake/FindHIP.cmake

@@ -105,6 +105,25 @@ if(UNIX AND NOT APPLE AND NOT CYGWIN)
     endif()
     mark_as_advanced(HIP_HIPCONFIG_EXECUTABLE)
 
+    # Find HIPCC_CMAKE_LINKER_HELPER executable
+    find_program(
+        HIP_HIPCC_CMAKE_LINKER_HELPER
+        NAMES hipcc_cmake_linker_helper
+        PATHS
+        "${HIP_ROOT_DIR}"
+        ENV ROCM_PATH
+        ENV HIP_PATH
+        /opt/rocm
+        /opt/rocm/hip
+        PATH_SUFFIXES bin
+        NO_DEFAULT_PATH
+        )
+    if(NOT HIP_HIPCC_CMAKE_LINKER_HELPER)
+        # Now search in default paths
+        find_program(HIP_HIPCC_CMAKE_LINKER_HELPER hipcc_cmake_linker_helper)
+    endif()
+    mark_as_advanced(HIP_HIPCC_CMAKE_LINKER_HELPER)
+
     if(HIP_HIPCONFIG_EXECUTABLE AND NOT HIP_VERSION)
         # Compute the version
         execute_process(
@@ -178,6 +197,21 @@ hip_find_helper_file(run_make2cmake cmake)
 hip_find_helper_file(run_hipcc cmake)
 ###############################################################################
 
+###############################################################################
+# MACRO: Reset compiler flags
+###############################################################################
+macro(HIP_RESET_FLAGS)
+    unset(HIP_HIPCC_FLAGS)
+    unset(HIP_HCC_FLAGS)
+    unset(HIP_NVCC_FLAGS)
+    foreach(config ${_hip_configuration_types})
+        string(TOUPPER ${config} config_upper)
+        unset(HIP_HIPCC_FLAGS_${config_upper})
+        unset(HIP_HCC_FLAGS_${config_upper})
+        unset(HIP_NVCC_FLAGS_${config_upper})
+    endforeach()
+endmacro()
+
 ###############################################################################
 # MACRO: Separate the options from the sources
 ###############################################################################
@@ -481,7 +515,10 @@ macro(HIP_ADD_EXECUTABLE hip_target)
     HIP_GET_SOURCES_AND_OPTIONS(_sources _cmake_options _hipcc_options _hcc_options _nvcc_options ${ARGN})
     HIP_PREPARE_TARGET_COMMANDS(${hip_target} OBJ _generated_files _source_files ${_sources} HIPCC_OPTIONS ${_hipcc_options} HCC_OPTIONS ${_hcc_options} NVCC_OPTIONS ${_nvcc_options})
     list(REMOVE_ITEM _sources ${_source_files})
-    set(CMAKE_HIP_LINK_EXECUTABLE "${HIP_HIPCC_EXECUTABLE} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET>")
+    if("x${HCC_HOME}" STREQUAL "x")
+        set(HCC_HOME "/opt/rocm/hcc")
+    endif()
+    set(CMAKE_HIP_LINK_EXECUTABLE "${HIP_HIPCC_CMAKE_LINKER_HELPER} ${HCC_HOME} <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET>")
     add_executable(${hip_target} ${_cmake_options} ${_generated_files} ${_sources})
     set_target_properties(${hip_target} PROPERTIES LINKER_LANGUAGE HIP)
 endmacro()

cmake/FindHIP/run_hipcc.cmake

@@ -26,6 +26,7 @@ set(HIP_HIPCONFIG_EXECUTABLE "@HIP_HIPCONFIG_EXECUTABLE@") #path
 set(HIP_HOST_COMPILER "@HIP_HOST_COMPILER@") # path
 set(CMAKE_COMMAND "@CMAKE_COMMAND@") # path
 set(HIP_run_make2cmake "@HIP_run_make2cmake@") # path
+set(HCC_HOME "@HCC_HOME@") #path
 
 @HIP_HOST_FLAGS@
 @_HIP_HIPCC_FLAGS@
@@ -42,6 +43,9 @@ execute_process(COMMAND ${HIP_HIPCONFIG_EXECUTABLE} --platform OUTPUT_VARIABLE H
 if(NOT host_flag)
     set(__CC ${HIP_HIPCC_EXECUTABLE})
     if(HIP_PLATFORM STREQUAL "hcc")
+        if(NOT "x${HCC_HOME}" STREQUAL "x")
+            set(ENV{HCC_HOME} ${HCC_HOME})
+        endif()
         set(__CC_FLAGS ${HIP_HIPCC_FLAGS} ${HIP_HCC_FLAGS} ${HIP_HIPCC_FLAGS_${build_configuration}} ${HIP_HCC_FLAGS_${build_configuration}})
     else()
         set(__CC_FLAGS ${HIP_HIPCC_FLAGS} ${HIP_NVCC_FLAGS} ${HIP_HIPCC_FLAGS_${build_configuration}} ${HIP_NVCC_FLAGS_${build_configuration}})