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

for ROCm HIP 6.1.1

Change-Id: I6381e0474db2003501aae5d7faf08145da701e1c

Author: emankov

CHANGELOG.md

@@ -3,6 +3,20 @@
 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.1.1
+
+### Additions
+
+* LLVM 18.1.2 support
+* cuDNN 9.0.0 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
+
+### Fixes
+
+* Clang resource files used during hipification are now searchable and also can be specified by the `--clang-resource-directory` option
+
 ## HIPIFY for ROCm 6.1.0
 
 ### Additions
@@ -13,11 +27,11 @@ Documentation for HIPIFY is available at
 * Full `hipSOLVER` support
 * Full `rocSPARSE` support
 * New options:
-  * `--amap` to hipify as much as possible, ignoring '--default-preprocessor' behavior
+  * `--amap` to hipify as much as possible, ignoring `--default-preprocessor` behavior
 
 ### Fixes
 
-* Do not rewrite tokens in code blocks skipped by Preprocessor (under the '--default-preprocessor' option)
+* Code blocks skipped by the Preprocessor are not hipified anymore under the `--default-preprocessor` option
 
 ## HIPIFY for ROCm 6.0.2
 
@@ -53,7 +67,7 @@ Documentation for HIPIFY is available at
   * In separate files: `hipify-clang --md --doc-format=full --doc-roc=separate`
   * In one file: `hipify-clang --md --doc-format=full --doc-roc=joint`
 * New options:
-  * `--use-hip-data-types` (Use 'hipDataType' instead of 'hipblasDatatype_t' or 'rocblas_datatype')
+  * `--use-hip-data-types` (Use `hipDataType` instead of `hipblasDatatype_t` or `rocblas_datatype`)
   * `--doc-roc=\<value\>` (ROC documentation generation: `skip` (default), `separate`, and `joint`; the
     `--md` or `--csv` option must be included)
 

CMakeLists.txt

@@ -161,7 +161,7 @@ if (NOT HIPIFY_CLANG_TESTS_ONLY)
   else()
     set(LIB_CLANG_RES ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH})
   endif()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -DHIPIFY_CLANG_RES=\\\"${LLVM_LIBRARY_DIRS}/clang/${LIB_CLANG_RES}\\\" ${addr_var}")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -DLIB_CLANG_RES=${LIB_CLANG_RES} ${addr_var}")
 
   set(INSTALL_PATH_DOC_STRING "hipify-clang Installation Path")
   if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
@@ -193,6 +193,9 @@ if (NOT HIPIFY_CLANG_TESTS_ONLY)
       PATTERN "complex"
       PATTERN "new"
       PATTERN "ppc_wrappers" EXCLUDE
+      PATTERN "omp-tools.h" EXCLUDE
+      PATTERN "omp.h" EXCLUDE
+      PATTERN "ompt.h" EXCLUDE
       PATTERN "openmp_wrappers" EXCLUDE)
   endif()
 
@@ -244,6 +247,8 @@ if(HIPIFY_CLANG_TESTS OR HIPIFY_CLANG_TESTS_ONLY)
 
   message(STATUS "---- The below configuring for hipify-clang testing only ----")
 
+  set (HIPIFY_CLANG_RES "${LLVM_LIBRARY_DIRS}/clang/${LIB_CLANG_RES}")
+
   if(${CMAKE_VERSION} VERSION_LESS "3.27.0")
     find_package(PythonInterp 2.7 REQUIRED)
   else()
@@ -342,16 +347,20 @@ if(HIPIFY_CLANG_TESTS OR HIPIFY_CLANG_TESTS_ONLY)
     ${CMAKE_CURRENT_BINARY_DIR}/tests/lit.site.cfg
     @ONLY)
 
+  if(NOT LIT_ARGS)
+    set(LIT_ARGS -v)
+  endif()
+
   if(HIPIFY_CLANG_TESTS_ONLY)
     add_lit_testsuite(test-hipify "Running HIPIFY regression tests"
       ${CMAKE_CURRENT_LIST_DIR}/tests
       PARAMS site_config=${CMAKE_CURRENT_BINARY_DIR}/tests/lit.site.cfg
-      ARGS -v)
+      ARGS ${LIT_ARGS})
   else()
     add_lit_testsuite(test-hipify "Running HIPIFY regression tests"
       ${CMAKE_CURRENT_LIST_DIR}/tests
       PARAMS site_config=${CMAKE_CURRENT_BINARY_DIR}/tests/lit.site.cfg
-      ARGS -v
+      ARGS ${LIT_ARGS}
       DEPENDS hipify-clang)
   endif()
 

README.md

@@ -3,26 +3,6 @@
 HIPIFY is a set of tools that you can use to automatically translate CUDA source code into portable
 [HIP](https://github.com/ROCm/HIP) C++.
 
-## Table of contents
-
-<!-- toc -->
-
-* [hipify-clang](./docs/hipify-clang.md#hipify-clang)
-  * [Dependencies](./docs/hipify-clang.md#hipify-clang-dependencies)
-  * [Usage](./docs/hipify-clang.md#hipify-clang-usage)
-  * [Building](./docs/hipify-clang.md#hipify-clang-building)
-  * [Testing](./docs/hipify-clang.md#hipify-clang-testing)
-    * [Linux](./docs/hipify-clang.md#hipify-clang-linux-testing)
-    * [Windows](./docs/hipify-clang.md#hipify-clang-windows-testing)
-* [hipify-perl](./docs/hipify-perl.md#hipify-perl)
-  * [Usage](./docs/hipify-perl.md#hipify-perl-usage)
-  * [Building](./docs/hipify-perl.md#hipify-perl-building)
-* Related: [hipify_torch](https://github.com/ROCmSoftwarePlatform/hipify_torch)
-* [Supported CUDA APIs](./docs/supported_apis.md#supported-cuda-apis)
-* [Documentation](#documentation)
-
-<!-- tocstop -->
-
 ## Documentation
 
 Documentation for HIPIFY is available at