merge amd-staging into amd-mainline

Change-Id: Ib5c9a0abbe1c3ee82c9bd08a7f25d8cf84449875

.azuredevops/rocm-ci.yml

@@ -0,0 +1,40 @@
+resources:
+  repositories:
+  - repository: pipelines_repo
+    type: github
+    endpoint: ROCm
+    name: ROCm/ROCm
+
+variables:
+- group: common
+- template: /.azuredevops/variables-global.yml@pipelines_repo
+
+trigger:
+  batch: true
+  branches:
+    include:
+    - amd-staging
+  paths:
+    exclude:
+    - .github
+    - docs
+    - '.*.y*ml'
+    - '*.md'
+    - LICENSE.txt
+
+pr:
+  autoCancel: true
+  branches:
+    include:
+    - amd-staging
+  paths:
+    exclude:
+    - .github
+    - docs
+    - '.*.y*ml'
+    - '*.md'
+    - LICENSE.txt
+  drafts: false
+
+jobs:
+  - template: ${{ variables.CI_COMPONENT_PATH }}/HIPIFY.yml@pipelines_repo

.github/CODEOWNERS

@@ -1,6 +1,7 @@
 * @searlmc1 @emankov
 
 # Documentation files
-docs/* @ROCm/rocm-documentation
-*.md @ROCm/rocm-documentation
-*.rst @ROCm/rocm-documentation
+docs/ @ROCm/rocm-documentation @searlmc1 @emankov
+*.md @ROCm/rocm-documentation @searlmc1 @emankov
+*.rst @ROCm/rocm-documentation @searlmc1 @emankov
+.readthedocs.yaml @ROCm/rocm-documentation @searlmc1 @emankov

.readthedocs.yaml

@@ -15,4 +15,4 @@ python:
 build:
    os: ubuntu-22.04
    tools:
-      python: "3.8"
+      python: "3.10"

CHANGELOG.md

@@ -3,12 +3,26 @@
 Documentation for HIPIFY is available at
 [https://rocmdocs.amd.com/projects/HIPIFY/en/latest/](https://rocmdocs.amd.com/projects/HIPIFY/en/latest/).
 
+## HIPIFY for ROCm 6.2.0
+
+### Additions
+
+* CUDA 12.4.1 support
+* cuDNN 9.1.1 support
+* LLVM 18.1.6 support
+* Full `hipBLASLt` support
+
+### Fixes
+
+* Apply `reinterpret_cast` for an explicit conversion between `pointer-to-function` and `pointer-to-object`;
+  affected functions: `hipFuncGetAttributes`, `hipFuncSetAttribute`, `hipFuncSetCacheConfig`, `hipFuncSetSharedMemConfig`, `hipLaunchKernel`, and `hipLaunchCooperativeKernel`
+
 ## HIPIFY for ROCm 6.1.2
 
 ### Additions
 
-* LLVM 18.1.2 support
 * cuDNN 9.0.0 support
+* LLVM 18.1.2 support
 * New options:
   * `--clang-resource-directory` to specify the clang resource path - the path to the parent folder for the `include` folder that
     contains `__clang_cuda_runtime_wrapper.h` and other header files used during the hipification process

docs/hipify-clang.rst

@@ -8,7 +8,7 @@
 hipify-clang
 **************************************************************************
 
-``hipify-clang`` is a Clang-based tool for translating CUDA sources into HIP sources.
+``hipify-clang`` is a Clang-based tool for translating NVIDIA CUDA sources into HIP sources.
 
 It translates CUDA source into an Abstract Syntax Tree (AST), which is traversed by transformation
 matchers. After applying all the matchers, the output HIP source is produced.
@@ -37,7 +37,7 @@ Dependencies
 
 * `LLVM+Clang <http://releases.llvm.org>`_ of at least version
   `4.0.0 <http://releases.llvm.org/download.html#4.0.0>`_; the latest stable and recommended release:
-  `18.1.5 <https://github.com/llvm/llvm-project/releases/tag/llvmorg-18.1.5>`_.
+  `18.1.6 <https://github.com/llvm/llvm-project/releases/tag/llvmorg-18.1.6>`_.
 
 * `CUDA <https://developer.nvidia.com/cuda-downloads>`_ of at least version
   `7.0 <https://developer.nvidia.com/cuda-toolkit-70>`_, the latest supported version is
@@ -177,7 +177,8 @@ Dependencies
       `18.1.2 <https://github.com/llvm/llvm-project/releases/tag/llvmorg-18.1.2>`_,
       `18.1.3 <https://github.com/llvm/llvm-project/releases/tag/llvmorg-18.1.3>`_,
       `18.1.4 <https://github.com/llvm/llvm-project/releases/tag/llvmorg-18.1.4>`_,
-      `18.1.5 <https://github.com/llvm/llvm-project/releases/tag/llvmorg-18.1.5>`_ :sup:`4`
+      `18.1.5 <https://github.com/llvm/llvm-project/releases/tag/llvmorg-18.1.5>`_,
+      `18.1.6 <https://github.com/llvm/llvm-project/releases/tag/llvmorg-18.1.6>`_ :sup:`4`
     - `12.3.2 <https://developer.nvidia.com/cuda-downloads>`_ :sup:`4`
     - **Latest stable config**
     - **Latest stable config**
@@ -224,7 +225,7 @@ Dependencies
 In most cases, you can get a suitable version of ``LLVM+Clang`` with your package manager. However, you can also
 `download a release archive <http://releases.llvm.org/>`_ and build or install it. In case of multiple versions of ``LLVM`` installed, set
 `CMAKE_PREFIX_PATH <https://cmake.org/cmake/help/latest/variable/CMAKE_PREFIX_PATH.html>`_ so that
-``CMake`` can find the desired version of ``LLVM``. For example, ``-DCMAKE_PREFIX_PATH=D:\LLVM\18.1.5\dist``.
+``CMake`` can find the desired version of ``LLVM``. For example, ``-DCMAKE_PREFIX_PATH=D:\LLVM\18.1.6\dist``.
 
 Usage
 ============================================================
@@ -257,7 +258,7 @@ header files used during the hipification process:
 
 .. code:: shell
 
-  ./hipify-clang square.cu --cuda-path=/usr/local/cuda-12.3 --clang-resource-directory=/usr/llvm/18.1.5/dist/lib/clang/18
+  ./hipify-clang square.cu --cuda-path=/usr/local/cuda-12.3 --clang-resource-directory=/usr/llvm/18.1.6/dist/lib/clang/18
 
 For more information, refer to the `Clang manual for compiling CUDA <https://llvm.org/docs/CompileCudaWithLLVM.html#compiling-cuda-code>`_.
 
@@ -394,7 +395,7 @@ To ensure LLVM being found or in case of multiple LLVM instances, specify the pa
 
 .. code-block:: bash
 
-  -DCMAKE_PREFIX_PATH=/usr/llvm/18.1.5/dist
+  -DCMAKE_PREFIX_PATH=/usr/llvm/18.1.6/dist
 
 On Windows, specify the following option for CMake in the first place:
 ``-G "Visual Studio 17 2022"``. 
@@ -468,7 +469,7 @@ LLVM <= 9.0.1
 LLVM >= 10.0.0
 -----------------
 
-1. Download `LLVM project <https://github.com/llvm/llvm-project/releases/tag/llvmorg-18.1.5>`_ sources.
+1. Download `LLVM project <https://github.com/llvm/llvm-project/releases/tag/llvmorg-18.1.6>`_ sources.
 
 2. Build `LLVM project <http://llvm.org/docs/CMake.html>`_:
 
@@ -570,13 +571,13 @@ LLVM >= 10.0.0
 
      .. code-block:: bash
 
-      python /usr/llvm/18.1.5/llvm-project/llvm/utils/lit/setup.py install
+      python /usr/llvm/18.1.6/llvm-project/llvm/utils/lit/setup.py install
       
      **Windows**:
 
      .. code-block:: shell
 
-      python D:/LLVM/18.1.5/llvm-project/llvm/utils/lit/setup.py install
+      python D:/LLVM/18.1.6/llvm-project/llvm/utils/lit/setup.py install
 
      In case of errors similar to ``ModuleNotFoundError: No module named 'setuptools'``, upgrade the ``setuptools`` package:
 
@@ -590,23 +591,23 @@ LLVM >= 10.0.0
 
      .. code-block:: bash
 
-      -DLLVM_EXTERNAL_LIT=/usr/llvm/18.1.5/build/bin/llvm-lit
+      -DLLVM_EXTERNAL_LIT=/usr/llvm/18.1.6/build/bin/llvm-lit
 
      **Windows**:
 
      .. code-block:: shell
 
-      -DLLVM_EXTERNAL_LIT=D:/LLVM/18.1.5/build/Release/bin/llvm-lit.py
+      -DLLVM_EXTERNAL_LIT=D:/LLVM/18.1.6/build/Release/bin/llvm-lit.py
 
    * ``FileCheck``:
 
      **Linux**:
 
-     Copy from ``/usr/llvm/18.1.5/build/bin/`` to ``CMAKE_INSTALL_PREFIX/dist/bin``.
+     Copy from ``/usr/llvm/18.1.6/build/bin/`` to ``CMAKE_INSTALL_PREFIX/dist/bin``.
 
      **Windows**:
 
-     Copy from ``D:/LLVM/18.1.5/build/Release/bin`` to ``CMAKE_INSTALL_PREFIX/dist/bin``.
+     Copy from ``D:/LLVM/18.1.6/build/Release/bin`` to ``CMAKE_INSTALL_PREFIX/dist/bin``.
 
      Alternatively, specify the path to ``FileCheck`` in the ``CMAKE_INSTALL_PREFIX`` option.
 
@@ -633,8 +634,8 @@ On Linux, the following configurations are tested:
 
 * Ubuntu 14: LLVM 4.0.0 - 7.1.0, CUDA 7.0 - 9.0, cuDNN 5.0.5 - 7.6.5
 * Ubuntu 16-19: LLVM 8.0.0 - 14.0.6, CUDA 7.0 - 10.2, cuDNN 5.1.10 - 8.0.5
-* Ubuntu 20-21: LLVM 9.0.0 - 18.1.5, CUDA 7.0 - 12.3.2, cuDNN 5.1.10 - 9.1.1
-* Ubuntu 22-23: LLVM 13.0.0 - 18.1.5, CUDA 7.0 - 12.3.2, cuDNN 8.0.5 - 9.1.1
+* Ubuntu 20-21: LLVM 9.0.0 - 18.1.6, CUDA 7.0 - 12.3.2, cuDNN 5.1.10 - 9.1.1
+* Ubuntu 22-23: LLVM 13.0.0 - 18.1.6, CUDA 7.0 - 12.3.2, cuDNN 8.0.5 - 9.1.1
 
 Minimum build system requirements for the above configurations:
 
@@ -652,11 +653,11 @@ Here's how to build ``hipify-clang`` with testing support on ``Ubuntu 23.10.01``
   -DHIPIFY_CLANG_TESTS=ON \
   -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_INSTALL_PREFIX=../dist \
-  -DCMAKE_PREFIX_PATH=/usr/llvm/18.1.5/dist \
+  -DCMAKE_PREFIX_PATH=/usr/llvm/18.1.6/dist \
   -DCUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-12.3.2 \
   -DCUDA_DNN_ROOT_DIR=/usr/local/cudnn-9.1.1 \
   -DCUDA_CUB_ROOT_DIR=/usr/local/cub-2.1.0 \
-  -DLLVM_EXTERNAL_LIT=/usr/llvm/18.1.5/build/bin/llvm-lit \
+  -DLLVM_EXTERNAL_LIT=/usr/llvm/18.1.6/build/bin/llvm-lit \
   ../hipify
 
 The corresponding successful output is:
@@ -680,11 +681,11 @@ The corresponding successful output is:
   --    - Test  hipify-clang : ON
   --    - Is part of HIP SDK : OFF
   -- Found ZLIB: /usr/lib/x86_64-linux-gnu/libz.so (found version "1.2.13")
-  -- Found LLVM 18.1.5:
-  --    - CMake module path  : /usr/llvm/18.1.5/dist/lib/cmake/llvm
-  --    - Clang include path : /usr/llvm/18.1.5/dist/include
-  --    - LLVM Include path  : /usr/llvm/18.1.5/dist/include
-  --    - Binary path        : /usr/llvm/18.1.5/dist/bin
+  -- Found LLVM 18.1.6:
+  --    - CMake module path  : /usr/llvm/18.1.6/dist/lib/cmake/llvm
+  --    - Clang include path : /usr/llvm/18.1.6/dist/include
+  --    - LLVM Include path  : /usr/llvm/18.1.6/dist/include
+  --    - Binary path        : /usr/llvm/18.1.6/dist/bin
   -- Linker detection: GNU ld
   -- ---- The below configuring for hipify-clang testing only ----
   -- Found Python: /usr/bin/python3.12 (found version "3.12.3") found components: Interpreter 
@@ -719,7 +720,7 @@ The corresponding successful output is:
   Running HIPify regression tests
   ===============================================================
   CUDA 12.3.107 - will be used for testing
-  LLVM 18.1.5 - will be used for testing
+  LLVM 18.1.6 - will be used for testing
   x86_64 - Platform architecture
   Linux 6.5.0-15-generic - Platform OS
   64 - hipify-clang binary bitness
@@ -813,7 +814,7 @@ Tested configurations:
     - ``2019.16.11.29, 2022.17.7.1``
     - ``3.27.3``
     - ``3.11.4``
-  * - ``17.0.1`` :sup:`6` - ``18.1.5`` :sup:`7`
+  * - ``17.0.1`` :sup:`6` - ``18.1.6`` :sup:`7`
     - ``7.0 - 12.3.2``
     - ``8.0.5  - 9.1.1``
     - ``2019.16.11.35, 2022.17.9.6``
@@ -849,12 +850,12 @@ Building with testing support using ``Visual Studio 17 2022`` on ``Windows 11``:
   -DHIPIFY_CLANG_TESTS=ON \
   -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_INSTALL_PREFIX=../dist \
-  -DCMAKE_PREFIX_PATH=D:/LLVM/18.1.5/dist \
+  -DCMAKE_PREFIX_PATH=D:/LLVM/18.1.6/dist \
   -DCUDA_TOOLKIT_ROOT_DIR="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.3" \
   -DCUDA_SDK_ROOT_DIR="C:/ProgramData/NVIDIA Corporation/CUDA Samples/v12.3" \
   -DCUDA_DNN_ROOT_DIR=D:/CUDA/cuDNN/9.1.1 \
   -DCUDA_CUB_ROOT_DIR=D:/CUDA/CUB/cub-2.1.0 \
-  -DLLVM_EXTERNAL_LIT=D:/LLVM/18.1.5/build/Release/bin/llvm-lit.py \
+  -DLLVM_EXTERNAL_LIT=D:/LLVM/18.1.6/build/Release/bin/llvm-lit.py \
   ../hipify
 
 The corresponding successful output is:
@@ -878,15 +879,15 @@ The corresponding successful output is:
   --    - Build hipify-clang : ON
   --    - Test  hipify-clang : ON
   --    - Is part of HIP SDK : OFF
-  -- Found LLVM 18.1.5:
-  --    - CMake module path  : D:/LLVM/18.1.5/dist/lib/cmake/llvm
-  --    - Clang include path : D:/LLVM/18.1.5/dist/include
-  --    - LLVM Include path  : D:/LLVM/18.1.5/dist/include
-  --    - Binary path        : D:/LLVM/18.1.5/dist/bin
+  -- Found LLVM 18.1.6:
+  --    - CMake module path  : D:/LLVM/18.1.6/dist/lib/cmake/llvm
+  --    - Clang include path : D:/LLVM/18.1.6/dist/include
+  --    - LLVM Include path  : D:/LLVM/18.1.6/dist/include
+  --    - Binary path        : D:/LLVM/18.1.6/dist/bin
   -- ---- The below configuring for hipify-clang testing only ----
   -- Found Python: C:/Users/TT/AppData/Local/Programs/Python/Python312/python.exe (found version "3.12.3") found components: Interpreter
   -- Found lit: C:/Users/TT/AppData/Local/Programs/Python/Python312/Scripts/lit.exe
-  -- Found FileCheck: D:/LLVM/18.1.5/dist/bin/FileCheck.exe
+  -- Found FileCheck: D:/LLVM/18.1.6/dist/bin/FileCheck.exe
   -- Initial CUDA to configure:
   --    - CUDA Toolkit path  : C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.3
   --    - CUDA Samples path  : C:/ProgramData/NVIDIA Corporation/CUDA Samples/v12.3

docs/hipify-perl.rst

@@ -14,7 +14,7 @@ hipify-perl
 
 - Ease of use
 
-- No checks for input source CUDA code for correctness required
+- No checks for input source NVIDIA CUDA code for correctness required
 
 - No dependency on third party tools, including CUDA
 

docs/index.rst

@@ -5,10 +5,10 @@
 .. _index:
 
 =====================
-HIPIFY Documentation
+HIPIFY documentation
 =====================
 
-``hipify-clang`` and ``hipify-perl`` are tools that automatically translate CUDA source code into portable HIP C++.
+``hipify-clang`` and ``hipify-perl`` are tools that automatically translate NVIDIA CUDA source code into portable HIP C++.
 
 .. note::
 

docs/sphinx/_toc.yml.in

@@ -13,17 +13,17 @@ subtrees:
   - file: supported_apis
     subtrees:
     - entries:
-      - file: tables/CUDA_Runtime_API_functions_supported_by_HIP
+      - file: tables/CUDA_Runtime_API_functions_supported_by_HIP     
       - file: tables/CUDA_Driver_API_functions_supported_by_HIP
       - file: tables/cuComplex_API_supported_by_HIP
       - file: tables/CUDA_Device_API_supported_by_HIP
       - file: tables/CUDA_RTC_API_supported_by_HIP
       - file: tables/CUBLAS_API_supported_by_HIP
-      - file: tables/CURAND_API_supported_by_HIP
-      - file: tables/CUDNN_API_supported_by_HIP
-      - file: tables/CUFFT_API_supported_by_HIP
       - file: tables/CUSPARSE_API_supported_by_HIP
       - file: tables/CUSOLVER_API_supported_by_HIP
+      - file: tables/CURAND_API_supported_by_HIP      
+      - file: tables/CUFFT_API_supported_by_HIP
+      - file: tables/CUDNN_API_supported_by_HIP     
       - file: tables/CUB_API_supported_by_HIP
 - caption: About
   entries:

docs/sphinx/requirements.in

@@ -1 +1 @@
-rocm-docs-core==0.38.1
+rocm-docs-core==1.4.0