Promote till commit 'efce2f77c4b5a1b9a2c16f33b7b9062faf09b007'

Author: satyanveshd

.azuredevops/rocm-ci.yml

@@ -8,25 +8,27 @@ resources:
     type: github
     endpoint: ROCm
     name: ROCm/HIP
-    ref: develop
+    ref: amd-staging
   - repository: hipother_repo
     type: github
     endpoint: ROCm
     name: ROCm/hipother
-    ref: develop
+    ref: amd-staging
   pipelines:
   - pipeline: hip_pipeline
     source: \HIP
     trigger:
       branches:
         include:
-        - develop
+        - amd-staging
+        - amd-mainline
   - pipeline: hipother_pipeline
     source: \hipother
     trigger:
       branches:
         include:
-        - develop
+        - amd-staging
+        - amd-mainline
 
 variables:
 - group: common
@@ -36,7 +38,8 @@ trigger:
   batch: true
   branches:
     include:
-    - develop
+    - amd-staging
+    - amd-mainline
   paths:
     exclude:
     - CODEOWNERS
@@ -47,7 +50,8 @@ pr:
   autoCancel: true
   branches:
     include:
-    - develop
+    - amd-staging
+    - amd-mainline
   paths:
     exclude:
     - CODEOWNERS

CHANGELOG.md

@@ -2,6 +2,41 @@
 
 Full documentation for HIP is available at [rocm.docs.amd.com](https://rocm.docs.amd.com/projects/HIP/en/latest/index.html)
 
+## HIP 6.3 for ROCm 6.3
+
+### Changed
+
+* Un-deprecated HIP APIs
+    - `hipHostAlloc`
+    - `hipFreeHost`
+
+* New HIP APIs
+    - `hipGraphExecGetFlags`  returns the flags on executable graph.
+    - `hipGraphNodeSetParams`  updates parameters of a created node.
+    - `hipGraphExecNodeSetParams`  updates parameters of a created node on executable graph.
+    - `hipDrvGraphMemcpyNodeGetParams`  gets a memcpy node's parameters.
+    - `hipDrvGraphMemcpyNodeSetParams`  sets a memcpy node's parameters.
+    - `hipDrvGraphAddMemFreeNode`  creates a memory free node and adds it to a graph.
+    - `hipDrvGraphExecMemcpyNodeSetParams`  sets the parameters for a memcpy node in the given graphExec.
+    - `hipDrvGraphExecMemsetNodeSetParams`  sets the parameters for a memset node in the given graphExec.
+    - `hipExtHostAlloc` preserves the functionality of `hipHostMalloc`.
+
+### Resolved issues
+
+
+- The `_sync()` version of crosslane builtins such as `shfl_sync()`,
+  `__all_sync()` and `__any_sync()`, continue to be hidden behind the
+  preprocessor macro `HIP_ENABLE_WARP_SYNC_BUILTINS`, and will be enabled
+  unconditionally in the next ROCm release.
+
+## HIP 6.2.41134 for ROCm 6.2.1
+
+### Resolved issues
+
+* Soft hang when use AMD_SERIALIZE_KERNEL.
+* Memory leak in hipIpcCloseMemHandle.
+
+
 ## HIP 6.2 (For ROCm 6.2)
 
 ### Added
@@ -14,6 +49,12 @@ Full documentation for HIP is available at [rocm.docs.amd.com](https://rocm.docs
     - `hipGetFuncBySymbol` returns the pointer to device entry function that matches entry function symbolPtr.
     - `hipStreamBeginCaptureToGraph` begins graph capture on a stream to an existing graph.
     - `hipGraphInstantiateWithParams`  creates an executable graph from a graph.
+    - `hipMemcpyAtoA`  copies from one 1D array to another.
+    - `hipMemcpyDtoA`  copies from device memory to a 1D array.
+    - `hipMemcpyAtoD`  copies from one 1D array to device memory.
+    - `hipMemcpyAtoHAsync`  copies from one 1D array to host memory.
+    - `hipMemcpyHtoAAsync`  copies from host memory to a 1D array.
+    - `hipMemcpy2DArrayToArray`  copies data between host and device.
 
 - Added a new flag `integrated` support in device property
 
@@ -24,13 +65,12 @@ Full documentation for HIP is available at [rocm.docs.amd.com](https://rocm.docs
 - Added initial support for 8-bit floating point datatype in `amd_hip_fp8.h`. These are accessible via `#include <hip/hip_fp8.h>`
 - Add UUID support for environment variable `HIP_VISIBLE_DEVICES`.
 
-### Fixed
+### Resolved issues
 - Stream capture support in HIP graph.
 Prohibited and unhandled operations are fixed during stream capture in HIP runtime.
 - Fix undefined symbol error for hipTexRefGetArray & hipTexRefGetBorderColor.
 
 ## HIP 6.1 (For ROCm 6.1)
-### Optimizations
 
 ### Added
 - New environment variable HIP_LAUNCH_BLOCKING
@@ -41,7 +81,7 @@ The default value is 0 (disable), kernel will execute normally as defined in the
 ### Changed
 - HIPRTC now assumes WGP mode for gfx10+. CU mode can be enabled by passing `-mcumode` to the compile options from `hiprtcCompileProgram`.
 
-### Fixed
+### Resolved issues
 - HIP complex vector type multiplication and division operations.
 On AMD platform, some duplicated complex operators are removed to avoid compilation failures.
 In HIP, hipFloatComplex and hipDoubleComplex are defined as complex data types,
@@ -53,12 +93,8 @@ Any application uses complex multiplication and division operations, need to rep
 
     Note: These complex operations are equivalent to corresponding types/functions on NVIDIA platform.
 
-### Known Issues
-
 ## HIP 6.0 (For ROCm 6.0)
 
-### Optimizations
-
 ### Added
 - Addition of hipExtGetLastError
   - AMD backend specific API, to return error code from last HIP API called from the active host thread
@@ -112,7 +148,7 @@ This header exists alongside the older bfloat16 header in`amd_hip_bfloat16.h` wh
     - hipGraphicsGLRegisterImage
 - With ROCm 6.0, the HIP version is 6.0. As the HIP runtime binary suffix is updated in every major ROCm release, in ROCm 6.0, the new filename is libamdhip64.so.6. Furthermore, in ROCm 6.0 release, the libamdhip64.so.5 binary from ROCm 5.7 is made available to maintain binary backward compatibility with ROCm 5.x.
 
-### Changes Impacting Backward Compatibility
+### Changed Impacting Backward Compatibility
 - Data types for members in HIP_MEMCPY3D structure are changed from "unsigned int" to "size_t".
 - The value of the flag hipIpcMemLazyEnablePeerAccess is changed to “0x01”, which was previously defined as “0”.
 - Some device property attributes are not currently support in HIP runtime, in order to maintain consistency, the following related enumeration names are changed in hipDeviceAttribute_t
@@ -125,13 +161,7 @@ This header exists alongside the older bfloat16 header in`amd_hip_bfloat16.h` wh
 - hipArray_t replaces hipArray*, as the pointer to array.
     - This allows hipMemcpyAtoH and hipMemcpyHtoA to have the correct array type which is equivalent to coresponding CUDA driver APIs.
 
-### Fixed
-- Kernel launch maximum dimension validation is added specifically on gridY and gridZ in the HIP API hipModule-LaunchKernel. As a result,when hipGetDeviceAttribute is called for the value of hipDeviceAttributeMaxGrid-Dim, the behavior on the AMD platform is equivalent to NVIDIA.
-- The HIP stream synchronisation behaviour is changed in internal stream functions, in which a flag "wait" is added and set when the current stream is null pointer while executing stream synchronisation on other explicitly created streams. This change avoids blocking of execution on null/default stream.
-The change won't affect usage of applications, and makes them behave the same on the AMD platform as NVIDIA.
-- Error handling behavior on unsupported GPU is fixed, HIP runtime will log out error message, instead of creating signal abortion error which is invisible to developers but continued kernel execution process. This is for the case when developers compile any application via hipcc, setting the option --offload-arch with GPU ID which is different from the one on the system.
-
-### Deprecated And Removed
+### Removed
 - Deprecated Heterogeneous Compute (HCC) symbols and flags are removed from the HIP source code, including,
     - Build options on obsolete HCC_OPTIONS was removed from cmake.
     - Micro definitions are removed.
@@ -152,6 +182,12 @@ The change won't affect usage of applications, and makes them behave the same on
 - Deprecated HIT based tests are removed from HIP project
 - Catch tests are available [hip-tests] (https://github.com/ROCm/hip-tests) project
 
+### Resolved issues
+- Kernel launch maximum dimension validation is added specifically on gridY and gridZ in the HIP API hipModule-LaunchKernel. As a result,when hipGetDeviceAttribute is called for the value of hipDeviceAttributeMaxGrid-Dim, the behavior on the AMD platform is equivalent to NVIDIA.
+- The HIP stream synchronisation behaviour is changed in internal stream functions, in which a flag "wait" is added and set when the current stream is null pointer while executing stream synchronisation on other explicitly created streams. This change avoids blocking of execution on null/default stream.
+The change won't affect usage of applications, and makes them behave the same on the AMD platform as NVIDIA.
+- Error handling behavior on unsupported GPU is fixed, HIP runtime will log out error message, instead of creating signal abortion error which is invisible to developers but continued kernel execution process. This is for the case when developers compile any application via hipcc, setting the option --offload-arch with GPU ID which is different from the one on the system.
+
 ### Known Issues
 - Dynamically loaded HIP runtime library references incorrect version of hipDeviceGetProperties and hipChooseDevice APIs
 
@@ -161,13 +197,11 @@ As a workaround, while compiling with ROCm 6.0, use the string "hipDeviceGetProp
 
 ## HIP 5.7.1 (For ROCm 5.7.1)
 
-### Fixed
+### Resolved issues
 - hipPointerGetAttributes API returns the correct HIP memory type as hipMemoryTypeManaged for managed memory.
 
 ## HIP 5.7 (For ROCm 5.7)
 
-### Optimizations
-
 ### Added
 - Added meta_group_size/rank for getting the number of tiles and rank of a tile in the partition
 - Added new APIs supporting Windows only, under development on Linux
@@ -184,15 +218,11 @@ As a workaround, while compiling with ROCm 6.0, use the string "hipDeviceGetProp
 
     - hipMipmappedArrayGetLevel for getting a mipmapped array on a mipmapped level
 
-### Changed
-
-### Fixed
-
 ### Known Issues
 - HIP memory type enum values currently don't support equivalent value to cudaMemoryTypeUnregistered, due to HIP functionality backward compatibility.
 - HIP API hipPointerGetAttributes could return invalid value in case the input memory pointer was not allocated through any HIP API on device or host.
 
-### Upcoming changes in ROCm 6.0 release
+### Upcoming changes
 - Removal of gcnarch from hipDeviceProp_t structure
 - Addition of new fields in hipDeviceProp_t structure
   - maxTexture1D
@@ -218,17 +248,14 @@ As a workaround, while compiling with ROCm 6.0, use the string "hipDeviceGetProp
 - Remove hiparray* and make it opaque with hipArray_t
 
 ## HIP 5.6.1 (For ROCm 5.6.1)
-### Fixed
+
+### Resolved issues
 - Enabled xnack+ check in HIP catch2 tests hang while tests execution
 - Memory leak when code object files are loaded/unloaded via hipModuleLoad/hipModuleUnload APIs
-- Fixed a crash happening while using hipGraphAddMemFreeNode
+- Resolved an issue of crash while using hipGraphAddMemFreeNode
 
 ## HIP 5.6 (For ROCm 5.6)
 
-### Optimizations
-- Consolidation of hipamd, rocclr and OpenCL projects in clr
-- Optimized lock for graph global capture mode
-
 ### Added
 - Added hipRTC support for amd_hip_fp16
 - Added hipStreamGetDevice implementation to get the device assocaited with the stream
@@ -243,7 +270,11 @@ As a workaround, while compiling with ROCm 6.0, use the string "hipDeviceGetProp
 - Consolidation of hipamd, ROCclr, and OpenCL repositories into a single repository called clr. Instructions are updated to build HIP from sources in the HIP Installation guide
 - Removed hipBusBandwidth and hipCommander samples from hip-tests
 
-### Fixed
+### Optimized
+- Consolidation of hipamd, rocclr and OpenCL projects in clr
+- Optimized lock for graph global capture mode
+
+### Resolved issues
 - Fixed regression in hipMemCpyParam3D when offset is applied
 
 ### Known Issues
@@ -252,7 +283,7 @@ As a workaround, while compiling with ROCm 6.0, use the string "hipDeviceGetProp
 - hipSetDevice and hipSetDeviceFlags APIs return hipErrorInvalidDevice instead of hipErrorNoDevice, on a system without GPU
 - Known memory leak when code object files are loaded/unloaded via hipModuleLoad/hipModuleUnload APIs. Issue will be fixed in future release
 
-### Upcoming changes in future release
+### Upcoming changes
 - Removal of gcnarch from hipDeviceProp_t structure
 - Addition of new fields in hipDeviceProp_t structure
   - maxTexture1D

CMakeLists.txt

@@ -41,13 +41,21 @@ endif()
 # Build steps
 #############
 if(CLR_BUILD_HIP)
+  if (UNIX)
+    set(HIPCC_EXECUTABLE "hipcc")
+    set(HIPCONFIG_EXECUTABLE "hipconfig")
+  else()
+    set(HIPCC_EXECUTABLE "hipcc.exe")
+    set(HIPCONFIG_EXECUTABLE "hipconfig.exe")
+  endif()
+
     # Set default HIPCC_BIN_DIR to /opt/rocm/bin
     if(NOT DEFINED HIPCC_BIN_DIR AND UNIX)
         set(HIPCC_BIN_DIR "/opt/rocm/bin" CACHE STRING "Default hipcc directory on linux.")
     endif()
     message(STATUS "HIPCC Binary Directory: ${HIPCC_BIN_DIR}")
 
-    if(NOT EXISTS ${HIPCC_BIN_DIR}/hipconfig)
+    if(NOT EXISTS ${HIPCC_BIN_DIR}/${HIPCONFIG_EXECUTABLE})
         message(FATAL_ERROR "Please pass hipcc/build or hipcc/bin using -DHIPCC_BIN_DIR.")
     endif()
 
@@ -56,10 +64,9 @@ if(CLR_BUILD_HIP)
         message(FATAL_ERROR "Please pass HIP using -DHIP_COMMON_DIR. HIP_COMMON_DIR is incorrect")
     endif()
     # Determine HIP_PLATFORM
-    set(__HIPCONFIG_EXECUTABLE__ ${HIPCC_BIN_DIR}/hipconfig)
     if(NOT DEFINED HIP_PLATFORM)
         if(NOT DEFINED ENV{HIP_PLATFORM})
-            execute_process(COMMAND ${__HIPCONFIG_EXECUTABLE__} --platform
+            execute_process(COMMAND ${HIPCC_BIN_DIR}/${HIPCONFIG_EXECUTABLE} --platform
                 OUTPUT_VARIABLE HIP_PLATFORM
                 OUTPUT_STRIP_TRAILING_WHITESPACE)
         else()

CONTRIBUTING.md

@@ -23,7 +23,7 @@ Please use the [GitHub Issue](https://github.com/ROCm/clr/issues) tab to notify
 
 ## Acceptance Criteria ##
 
-clr is Common Language Runtime contains C++ codes for the implementation of HIP runtime APIs on the AMD platform.
+clr Compute Language Runtime contains C++ codes for the implementation of HIP runtime APIs on the AMD platform.
 Bug fixes and performance are both important goals in clr. Because of this, when a pull request is created, the owner of the repository will review, and put it in automated testing to make sure,
 * The change will build on various OS platforms (Ubuntu, RHEL, etc.)
 * The build package will install and run the code on different GPU architectures (MI-series, Radeon series cards, etc.),
@@ -38,7 +38,7 @@ clr contains three parts of codes,
 
 - `opencl` - contains implementation of OpenCL on the AMD platform.
 
-- `rocclr` - contains common runtime used in HIP and OpenCL, which includes
+- `rocclr` - contains compute runtime used in HIP and OpenCL, which includes
    - `include`, header files,
    - `device`, implementation of GPU device related interfaces to the backend support,
    - `cimpiler`, implementation of interfaces with compiler,

README.md

@@ -1,12 +1,12 @@
 # AMD CLR - Compute Language Runtimes
 
-AMD CLR (Common Language Runtime) contains source codes for AMD's compute languages runtimes: `HIP` and `OpenCL™`.
+AMD CLR (Compute Language Runtime) contains source codes for AMD's compute languages runtimes: `HIP` and `OpenCL™`.
 
 ## Project Organisation
 
 - `hipamd` - contains implementation of `HIP` language on AMD platform. It is hosted at [ROCm/clr/hipamd](https://github.com/ROCm/clr/tree/develop/hipamd)
 - `opencl` - contains implementation of [OpenCL™](https://www.khronos.org/opencl/) on AMD platform. Now it is hosted at [ROCm/clr/opencl](https://github.com/ROCm/clr/tree/develop/opencl)
-- `rocclr` - contains common runtime used in `HIP` and `OpenCL™`. This is hosted at [ROCm/clr/rocclr](https://github.com/ROCm/clr/tree/develop/rocclr)
+- `rocclr` - contains compute runtime used in `HIP` and `OpenCL™`. This is hosted at [ROCm/clr/rocclr](https://github.com/ROCm/clr/tree/develop/rocclr)
 
 ## How to build/install
 
@@ -56,7 +56,7 @@ To run `hip-tests` please go to the repository and follow the steps.
 
 ## Release notes
 
-HIP provides release notes in [CLR change log](https://github.com/ROCm/clr/blob/develop/CHANGELOG.md), which has the records of changes in each release.
+HIP provides release notes in [CLR change log](./CHANGELOG.md), which has the records of changes in each release.
 
 ## Disclaimer
 

hipamd/CMakeLists.txt

@@ -66,7 +66,13 @@ message(STATUS "HIP_COMMON_DIR found at ${HIP_COMMON_DIR}")
 message(STATUS "HIPNV_DIR found at ${HIPNV_DIR}")
 set(HIP_COMMON_INCLUDE_DIR ${HIP_COMMON_DIR}/include)
 set(HIP_COMMON_BIN_DIR ${HIP_COMMON_DIR}/bin)
-set(__HIPCONFIG_EXECUTABLE__ ${HIP_COMMON_DIR}/bin/hipconfig)
+if (WIN32)
+  set(HIPCC_EXECUTABLE "hipcc.exe")
+  set(HIPCONFIG_EXECUTABLE "hipconfig.exe")
+else()
+  set(HIPCC_EXECUTABLE "hipcc")
+  set(HIPCONFIG_EXECUTABLE "hipconfig")
+endif()
 
 #############################
 # Setup config generation
@@ -390,25 +396,16 @@ install(FILES ${PROJECT_BINARY_DIR}/include/hip/hip_version.h
 if (NOT ${HIPCC_BIN_DIR} STREQUAL "")
   file(TO_CMAKE_PATH "${HIPCC_BIN_DIR}" HIPCC_BIN_DIR)
   if(EXISTS ${HIPCC_BIN_DIR})
-    set(hipcc_bin ${HIPCC_BIN_DIR}/hipcc.bin)
-    set(hipconfig_bin ${HIPCC_BIN_DIR}/hipconfig.bin)
-    if(WIN32)
-      set(hipcc_bin ${hipcc_bin}.exe)
-      set(hipconfig_bin ${hipconfig_bin}.exe)
+    install(PROGRAMS ${HIPCC_BIN_DIR}/${HIPCC_EXECUTABLE} DESTINATION bin)
+    install(PROGRAMS ${HIPCC_BIN_DIR}/${HIPCONFIG_EXECUTABLE} DESTINATION bin)
+    install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.pl DESTINATION bin)
+    install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.pl DESTINATION bin)
+    install(PROGRAMS ${HIPCC_BIN_DIR}/hipvars.pm DESTINATION bin)
+
+    if(NOT UNIX)
+      install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.bat DESTINATION bin)
+      install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin)
     endif()
-    if(EXISTS ${hipcc_bin} AND EXISTS ${hipconfig_bin})
-      install(PROGRAMS ${hipcc_bin} DESTINATION bin)
-      install(PROGRAMS ${hipconfig_bin} DESTINATION bin)
-    endif()
-  endif()
-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc DESTINATION bin)
-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig DESTINATION bin)
-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.pl DESTINATION bin)
-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.pl DESTINATION bin)
-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipvars.pm DESTINATION bin)
-  if(WIN32)
-    install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.bat DESTINATION bin)
-    install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin)
   endif()
 endif()
 
@@ -425,7 +422,7 @@ configure_package_config_file(
     )
 
 configure_package_config_file(
-      hip-config-amd.cmake
+      hip-config-amd.cmake.in
       ${CMAKE_CURRENT_BINARY_DIR}/hip-config-amd.cmake
       INSTALL_DESTINATION ${CONFIG_PACKAGE_INSTALL_DIR}
       PATH_VARS LIB_INSTALL_DIR INCLUDE_INSTALL_DIR BIN_INSTALL_DIR