Merge branch 'amd-staging' into amd-master-next

Promote till commit '7c5afff964beb6dd13ad4d7e261f5c89a44a3acc'

Change-Id: Iad7c19905721ab58b838011bdee21e5a7619b233

Author: mangupta

.gitattributes

@@ -0,0 +1,19 @@
+# Set the default behavior, in case people don't have core.autolf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to have LF line endings on checkout.
+*.c text eol=lf
+*.cpp text eol=lf
+*.cc text eol=lf
+*.h text eol=lf
+*.hpp text eol=lf
+*.txt text eol=lf
+
+# auto remove white space
+*.cpp filter=trimspace
+*.c filter=trimspace
+*.h filter=trimspacecpp
+*.hpp filter=trimspace
+*.md filter=trimspace
+

CMakeLists.txt

@@ -33,8 +33,6 @@ project(hip)
 #      cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH="$ROCclr_DIR/build;/opt/rocm/" -DCMAKE_INSTALL_PREFIX=</where/to/install/hip> ..
 #  If you don't specify CMAKE_INSTALL_PREFIX, hip-rocclr runtime will be installed to "/opt/rocm/hip".
 
-set(BUILD_SHARED_LIBS ON  CACHE BOOL "Build shared library (.so) or static lib (.a) ")
-
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 #############################
@@ -50,6 +48,12 @@ else()
   set(_pchStatus 0)
 endif()
 
+# With HIP project split plan, for interim puropose it is REQUIRED to pass
+# HIP_AMD_BACKEND_SOURCE_DIR=<hipamd source dir> as cmake variable_
+if(NOT DEFINED HIP_AMD_BACKEND_SOURCE_DIR)
+  message(FATAL_ERROR "HIP_AMD_BACKEND_SOURCE_DIR not defined ")
+endif()
+
 #############################
 # Setup config generation
 #############################
@@ -63,6 +67,8 @@ endmacro()
 #############################
 # Setup version information
 #############################
+# hipconfig is a perl script and is not trivially invokable on Windows.
+if(NOT WIN32)
 # Determine HIP_BASE_VERSION
 set(ENV{HIP_PATH} "")
 execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bin/hipconfig --version
@@ -72,11 +78,13 @@ string(REPLACE "." ";" VERSION_LIST ${HIP_BASE_VERSION})
 list(GET VERSION_LIST 0 HIP_VERSION_MAJOR)
 list(GET VERSION_LIST 1 HIP_VERSION_MINOR)
 set(HIP_VERSION_GITDATE 0)
+endif()
 
 find_package(Git)
 
 # FIXME: Two different version strings used.
-if(GIT_FOUND)
+# Below we use UNIX commands, not compatible with Windows.
+if(GIT_FOUND AND (NOT WIN32))
   # get date information based on UTC
   # use the last two digits of year + week number + day in the week as HIP_VERSION_GITDATE
   # use the commit date, instead of build date
@@ -210,25 +218,6 @@ message(STATUS "HIP Compiler: " ${HIP_COMPILER})
 add_to_config(_buildInfo HIP_RUNTIME)
 add_to_config(_buildInfo HIP_COMPILER)
 
-############  If HIP_PLATFORM is amd, HSA_PATH has to be defined ##################
-
-if(HIP_PLATFORM STREQUAL "amd")
-    # Determine HSA_PATH
-    if(NOT DEFINED HSA_PATH)
-        if(NOT DEFINED ENV{HSA_PATH})
-            set(HSA_PATH "/opt/rocm/hsa" CACHE PATH "Path to which HSA runtime has been installed")
-        else()
-            set(HSA_PATH $ENV{HSA_PATH} CACHE PATH "Path to which HSA runtime has been installed")
-        endif()
-    endif()
-    if(IS_ABSOLUTE ${HSA_PATH} AND EXISTS ${HSA_PATH} AND IS_DIRECTORY ${HSA_PATH})
-        message(STATUS "Looking for HSA runtime in: " ${HSA_PATH})
-    else()
-        message(FATAL_ERROR "Don't know where to find HSA runtime. Please specify absolute path using -DHSA_PATH")
-    endif()
-endif()
-message(STATUS "HSA runtime in: " ${HSA_PATH})
-
 # Set default build type
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
@@ -280,6 +269,13 @@ if (BUILD_HIPIFY_CLANG)
     add_subdirectory(hipify-clang)
 endif()
 
+# Workaround for current versioning logic not being compatible with Windows
+if(WIN32)
+  set(HIP_VERSION_MAJOR 0)
+  set(HIP_VERSION_MINOR 0)
+  set(HIP_VERSION_GITDATE 0)
+endif()
+
 # Generate hip_version.h
 set(_versionInfoHeader
 "// Auto-generated by cmake\n
@@ -295,11 +291,8 @@ set(_versionInfoHeader
 file(WRITE "${PROJECT_BINARY_DIR}/include/hip/hip_version.h" ${_versionInfoHeader})
 
 if(HIP_RUNTIME STREQUAL "rocclr")
-    add_subdirectory(rocclr)
-
-    set(HIP_ROCclr_BUILD_FLAGS "${HIP_ROCclr_BUILD_FLAGS} -fPIC ${ROCclr_CXX_FLAGS} -I${HSA_PATH}/include")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HIP_ROCclr_BUILD_FLAGS}")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HIP_ROCclr_BUILD_FLAGS}")
+  set(HIP_COMMON_DIR ${PROJECT_SOURCE_DIR})
+  add_subdirectory(${HIP_AMD_BACKEND_SOURCE_DIR} src/hipamd)
 endif()
 
 # Generate .hipInfo
@@ -329,16 +322,20 @@ install(FILES ${PROJECT_BINARY_DIR}/.hipVersion DESTINATION bin)
 execute_process(COMMAND test ${CMAKE_INSTALL_PREFIX} -ef ${CMAKE_CURRENT_SOURCE_DIR}
     RESULT_VARIABLE INSTALL_SOURCE)
 if(NOT ${INSTALL_SOURCE} EQUAL 0)
-    if(HIP_RUNTIME STREQUAL "rocclr")
-        install(DIRECTORY rocclr DESTINATION .)
+    # Exclude .bat files on Linux.
+    if(WIN32)
+      install(DIRECTORY bin DESTINATION . USE_SOURCE_PERMISSIONS)
+    else()
+      install(DIRECTORY bin DESTINATION . USE_SOURCE_PERMISSIONS
+              PATTERN *.bat EXCLUDE)
     endif()
-    install(DIRECTORY bin DESTINATION . USE_SOURCE_PERMISSIONS)
 
     # The following two lines will be removed after upstream updation
     install(CODE "MESSAGE(\"Removing ${CMAKE_INSTALL_PREFIX}/include\")")
     install(CODE "file(REMOVE_RECURSE ${CMAKE_INSTALL_PREFIX}/include)")
 
     install(DIRECTORY include DESTINATION .)
+    install(DIRECTORY ${HIP_AMD_BACKEND_SOURCE_DIR}/include/hip/ DESTINATION include/hip/)
     install(DIRECTORY cmake DESTINATION .)
 endif()
 
@@ -354,6 +351,8 @@ install(FILES ${PROJECT_BINARY_DIR}/include/hip/hip_version.h
 #############################
 # hip-config
 #############################
+# Packaging invokes UNIX commands, which are not available on Windows.
+if(NOT WIN32)
 include(CMakePackageConfigHelpers)
 
 configure_package_config_file(
@@ -460,6 +459,7 @@ endif()
 if(POLICY CMP0037)
     cmake_policy(POP)
 endif()
+endif()
 
 #############################
 # Code analysis
@@ -485,16 +485,20 @@ endif()
 #############################
 # Testing steps
 #############################
+# HIT is not compatible with Windows
+if(NOT WIN32)
 set(HIP_ROOT_DIR ${CMAKE_CURRENT_BINARY_DIR})
 set(HIP_SRC_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 if(HIP_PLATFORM STREQUAL "nvidia")
     execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/include" "${HIP_ROOT_DIR}/include" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
 endif()
+execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_AMD_BACKEND_SOURCE_DIR}/include/hip/" "${HIP_ROOT_DIR}/include/hip/" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
 execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/cmake" "${HIP_ROOT_DIR}/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_ROOT_DIR}/bin" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
 endif()
 if(HIP_CATCH_TEST EQUAL "1")
+    enable_testing()
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tests/catch)
 else()
     if(${RUN_HIT} EQUAL 0)
@@ -505,6 +509,7 @@ 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()
 endif()
+endif()
 
 #############################
 # Code analysis

README.md

@@ -29,20 +29,20 @@ The HIP repository maintains several branches. The branches that are of importan
 
 HIP releases are typically naming convention for each ROCM release to help differentiate them.
 
-* rocm x.yy: These are the stable releases based on the ROCM release. 
+* rocm x.yy: These are the stable releases based on the ROCM release.
   This type of release is typically made once a month.*
 
 ## More Info:
 - [Installation](INSTALL.md)
 - [HIP FAQ](docs/markdown/hip_faq.md)
 - [HIP Kernel Language](docs/markdown/hip_kernel_language.md)
-- [HIP Runtime API (Doxygen)](http://rocm-developer-tools.github.io/HIP)
+- [HIP Runtime API (Doxygen)](https://github.com/RadeonOpenCompute/ROCm)
 - [HIP Porting Guide](docs/markdown/hip_porting_guide.md)
 - [HIP Porting Driver Guide](docs/markdown/hip_porting_driver_api.md)
 - [HIP Programming Guide](docs/markdown/hip_programming_guide.md)
 - [HIP Logging ](docs/markdown/hip_logging.md)
 - [HIP Debugging ](docs/markdown/hip_debugging.md)
-- [Code Object tooling ] (docs/markdown/obj_tooling.md)
+- [Code Object tooling ](docs/markdown/obj_tooling.md)
 - [HIP Terminology](docs/markdown/hip_terms2.md) (including Rosetta Stone of GPU computing terms across CUDA/HIP/OpenCL)
 - [HIPIFY](https://github.com/ROCm-Developer-Tools/HIPIFY/blob/master/README.md)
 - Supported CUDA APIs: