merge amd-mainline into release/rocm-rel-6.1

[SWDEV-424205][P3] hipconvertinplace-perl.sh fails to run [SWDEV-446809][P2][ROCm QA][Mainline][G][QR] Observed "error: no member named 'vector' in namespace 'std'" compilation error in hipify-clang test Change-Id: I8e4e5123ec13a671220c0d163fbb03c80806a482
ROCm · Feb 23, 2024 · 467fb48 · 467fb48
2 parents 6583ae5 + 6422f44
commit 467fb48
Show file tree

Hide file tree

Showing 32 changed files with 1,661 additions and 1,117 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -139,7 +139,7 @@ if (NOT HIPIFY_CLANG_TESTS_ONLY)
 
   if(MSVC)
     target_link_libraries(hipify-clang PRIVATE version)
-    target_compile_options(hipify-clang PRIVATE ${STD} /Od /GR- /EHs- /EHc-)
+    target_compile_options(hipify-clang PRIVATE ${STD} /Od /GR- /EHs- /EHc- /MP)
     if((LLVM_PACKAGE_VERSION VERSION_EQUAL "18.0.0" OR LLVM_PACKAGE_VERSION VERSION_GREATER "18.0.0") AND MSVC_VERSION VERSION_GREATER "1919")
       target_compile_options(hipify-clang PRIVATE /Zc:preprocessor)
     endif()

diff --git a/bin/hipconvertinplace-perl.sh b/bin/hipconvertinplace-perl.sh
@@ -12,7 +12,7 @@
 # (this is useful for testing improvements to the hipify-perl toolset).
 
 SCRIPT_DIR="$(dirname "$(realpath "$0")")"
-PRIV_SCRIPT_DIR="$SCRIPT_DIR/../../libexec/hipify"
+PRIV_SCRIPT_DIR="$SCRIPT_DIR/../libexec/hipify"
 SEARCH_DIR=$1
 shift
 $SCRIPT_DIR/hipify-perl -inplace -print-stats "$@" `$PRIV_SCRIPT_DIR/findcode.sh $SEARCH_DIR`
diff --git a/bin/hipconvertinplace.sh b/bin/hipconvertinplace.sh
@@ -7,7 +7,7 @@
 # preserves the existing directory structure.
 
 SCRIPT_DIR="$(dirname "$(realpath "$0")")"
-PRIV_SCRIPT_DIR="$SCRIPT_DIR/../../libexec/hipify"
+PRIV_SCRIPT_DIR="$SCRIPT_DIR/../libexec/hipify"
 SEARCH_DIR=$1
 
 hipify_args=''

diff --git a/bin/hipexamine-perl.sh b/bin/hipexamine-perl.sh
@@ -7,7 +7,7 @@
 
 
 SCRIPT_DIR="$(dirname "$(realpath "$0")")"
-PRIV_SCRIPT_DIR="$SCRIPT_DIR/../../libexec/hipify"
+PRIV_SCRIPT_DIR="$SCRIPT_DIR/../libexec/hipify"
 SEARCH_DIR=$1
 shift
 $SCRIPT_DIR/hipify-perl -no-output -print-stats "$@" `$PRIV_SCRIPT_DIR/findcode.sh $SEARCH_DIR`
diff --git a/bin/hipexamine.sh b/bin/hipexamine.sh
@@ -5,7 +5,7 @@
 # Generate CUDA->HIP conversion statistics for all the code files in the specified directory.
 
 SCRIPT_DIR="$(dirname "$(realpath "$0")")"
-PRIV_SCRIPT_DIR="$SCRIPT_DIR/../../libexec/hipify"
+PRIV_SCRIPT_DIR="$SCRIPT_DIR/../libexec/hipify"
 SEARCH_DIR=$1
 
 hipify_args=''

diff --git a/bin/hipify-perl b/bin/hipify-perl
diff --git a/docs/hipify-clang.md b/docs/hipify-clang.md
@@ -426,7 +426,7 @@ CMake 3.16.8, GNU C/C++ 9.2, Python 2.7.
 
 Recommended build system requirements:
 
-CMake 3.28.1, GNU C/C++ 13.2, Python 3.11.6.
+CMake 3.28.3, GNU C/C++ 13.2, Python 3.12.2.
 
 Here is an example of building `hipify-clang` with testing support on `Ubuntu 23.10.01`:
 
@@ -470,7 +470,7 @@ cmake
 --    - Binary path        : /usr/llvm/17.0.6/dist/bin
 -- Linker detection: GNU ld
 -- ---- The below configuring for hipify-clang testing only ----
--- Found Python: /usr/bin/python3.11 (found version "3.11.6") found components: Interpreter 
+-- Found Python: /usr/bin/python3.12 (found version "3.12.2") found components: Interpreter 
 -- Found lit: /usr/local/bin/lit
 -- Found FileCheck: /GIT/LLVM/trunk/dist/FileCheck
 -- Initial CUDA to configure:
@@ -506,7 +506,7 @@ LLVM 17.0.6 - will be used for testing
 x86_64 - Platform architecture
 Linux 6.5.0-15-generic - Platform OS
 64 - hipify-clang binary bitness
-64 - python 3.11.6 binary bitness
+64 - python 3.12.2 binary bitness
 ===============================================================
 -- Testing: 102 tests, 12 threads --
 Testing Time: 6.70s
@@ -532,8 +532,8 @@ Total Discovered Tests: 102
 | 14.0.0 - 14.0.6 | 7.0 - 11.7.1 | 8.0.5  - 8.4.1 | 2017.15.9.57*, 2019.16.11.17, 2022.17.2.6 | 3.24.0          | 3.10.6        |
 | 15.0.0 - 15.0.7 | 7.0 - 11.8.0 | 8.0.5  - 8.8.1 | 2019.16.11.25, 2022.17.5.2                | 3.26.0          | 3.11.2        |
 | 16.0.0 - 16.0.6 | 7.0 - 12.2.2 | 8.0.5  - 8.9.5 | 2019.16.11.29, 2022.17.7.1                | 3.27.3          | 3.11.4        |
-| 17.0.1** 17.0.6 | 7.0 - 12.3.2 | 8.0.5  - 8.9.7 | 2019.16.11.32, 2022.17.8.3                | 3.28.1          | 3.12.1        |
-| 19.0.0git       | 7.0 - 12.3.2 | 8.0.5  - 8.9.7 | 2019.16.11.32, 2022.17.8.3                | 3.28.1          | 3.12.1        |
+| 17.0.1** 17.0.6 | 7.0 - 12.3.2 | 8.0.5  - 8.9.7 | 2019.16.11.34, 2022.17.9.0                | 3.28.3          | 3.12.2        |
+| 19.0.0git       | 7.0 - 12.3.2 | 8.0.5  - 8.9.7 | 2019.16.11.34, 2022.17.9.0                | 3.28.3          | 3.12.2        |
 
 `*` LLVM 14.x.x is the latest major release supporting Visual Studio 2017.
 To build LLVM 14.x.x correctly by Visual Studio 2017, `-DLLVM_FORCE_USE_OLD_TOOLCHAIN=ON` should be added to a corresponding CMake command line.
@@ -586,7 +586,7 @@ cmake
 --    - LLVM Include path  : D:/LLVM/17.0.6/dist/include
 --    - Binary path        : D:/LLVM/17.0.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.0") found components: Interpreter
+-- Found Python: C:/Users/TT/AppData/Local/Programs/Python/Python312/python.exe (found version "3.12.2") found components: Interpreter
 -- Found lit: C:/Users/TT/AppData/Local/Programs/Python/Python312/Scripts/lit.exe
 -- Found FileCheck: D:/LLVM/17.0.6/dist/bin/FileCheck.exe
 -- Initial CUDA to configure:

diff --git a/docs/sphinx/requirements.in b/docs/sphinx/requirements.in
@@ -1 +1 @@
-rocm-docs-core==0.34.0
+rocm-docs-core==0.34.2
diff --git a/docs/sphinx/requirements.txt b/docs/sphinx/requirements.txt
@@ -26,7 +26,7 @@ charset-normalizer==3.1.0
     # via requests
 click==8.1.3
     # via sphinx-external-toc
-cryptography==42.0.0
+cryptography==42.0.2
     # via pyjwt
 deprecated==1.2.13
     # via pygithub
@@ -100,7 +100,7 @@ requests==2.31.0
     # via
     #   pygithub
     #   sphinx
-rocm-docs-core==0.34.0
+rocm-docs-core==0.34.2
     # via -r requirements.in
 smmap==5.0.0
     # via gitdb

diff --git a/docs/supported_apis.md b/docs/supported_apis.md
@@ -1,16 +1,18 @@
 # Supported CUDA APIs
 
-- [Runtime API](tables/CUDA_Runtime_API_functions_supported_by_HIP.md)
-- [Driver API](tables/CUDA_Driver_API_functions_supported_by_HIP.md)
-- [cuComplex API](tables/cuComplex_API_supported_by_HIP.md)
-- [Device API](tables/CUDA_Device_API_supported_by_HIP.md)
-- [RTC API](tables/CUDA_RTC_API_supported_by_HIP.md)
-- [cuBLAS](tables/CUBLAS_API_supported_by_HIP.md)
-- [cuRAND](tables/CURAND_API_supported_by_HIP.md)
-- [cuDNN](tables/CUDNN_API_supported_by_HIP.md)
-- [cuFFT](tables/CUFFT_API_supported_by_HIP.md)
-- [cuSPARSE](tables/CUSPARSE_API_supported_by_HIP.md)
-- [cuSOLVER](tables/CUSOLVER_API_supported_by_HIP.md)
-- [CUB](tables/CUB_API_supported_by_HIP.md)
+|      **CUDA**   | **HIP**                                                              |   **ROC**      |        **HIP & ROC**        |
+|:----------------|:---------------------------------------------------------------------|:---------------|:----------------------------|
+| Runtime API     | [HIP API](tables/CUDA_Runtime_API_functions_supported_by_HIP.md)     |       |        |
+| Driver API      | [HIP API](tables/CUDA_Driver_API_functions_supported_by_HIP.md)      |       |        |
+| Complex API     | [HIP API](tables/cuComplex_API_supported_by_HIP.md)                  |       |        |
+| Device API      | [HIP Device API](tables/CUDA_Device_API_supported_by_HIP.md)         |       |        |
+| RTC API         | [HIP RTC API](tables/CUDA_RTC_API_supported_by_HIP.md)               |       |        |
+| BLAS API        | [HIP BLAS API](tables/CUBLAS_API_supported_by_HIP.md)                | [ROC BLAS API](tables/CUBLAS_API_supported_by_ROC.md)     | [HIP + ROC BLAS API](tables/CUBLAS_API_supported_by_HIP_and_ROC.md)     |
+| SPARSE API      | [HIP SPARSE API](tables/CUSPARSE_API_supported_by_HIP.md)            | [ROC SPARSE API](tables/CUSPARSE_API_supported_by_ROC.md) | [HIP + ROC SPARSE API](tables/CUSPARSE_API_supported_by_HIP_and_ROC.md) |
+| SOLVER API      | [HIP SOLVER API](tables/CUSOLVER_API_supported_by_HIP.md)            |       |        |
+| RAND API        | [HIP RAND API](tables/CURAND_API_supported_by_HIP.md)                |       |        |
+| FFT API         | [HIP FFT API](tables/CUFFT_API_supported_by_HIP.md)                  |       |        |
+| DNN API         | [HIP DNN API](tables/CUDNN_API_supported_by_HIP.md)                  |       |        |
+| CUB API         | [HIP CUB API](tables/CUB_API_supported_by_HIP.md)                    |       |        |
 
 To generate the above documentation with the actual information about all supported CUDA APIs in Markdown format, run `hipify-clang --md` with or without specifying the output directory (`-o`).