merge aomp-dev into amd-staging

Author: z1-cciauto

srock-bin/patches/amd-staging/_TheRock.patch

@@ -1,8 +1,17 @@
 diff --git a/cmake/therock_subproject.cmake b/cmake/therock_subproject.cmake
-index 3985c872..d5ebc862 100644
+index 4edea369..4cc2d16b 100644
 --- a/cmake/therock_subproject.cmake
 +++ b/cmake/therock_subproject.cmake
-@@ -1429,6 +1429,7 @@ function(_therock_cmake_subproject_setup_toolchain
+@@ -23,7 +23,7 @@ set_property(GLOBAL PROPERTY THEROCK_DEFAULT_CMAKE_VARS
+   THEROCK_ROCM_LIBRARIES_SOURCE_DIR
+   THEROCK_ROCM_SYSTEMS_SOURCE_DIR
+   THEROCK_BUILD_TESTING
+-  THEROCK_ENABLE_LLVM_TESTS
++  THEROCK_BUILD_LLVM_TESTS
+   LLVM_LIT_ARGS
+   THEROCK_USE_SAFE_DEPENDENCY_PROVIDER
+   ROCM_SYMLINK_LIBS
+@@ -1466,6 +1466,7 @@ function(_therock_cmake_subproject_setup_toolchain
      string(APPEND _toolchain_contents "set(AMDGPU_TARGETS @_filtered_gpu_targets@ CACHE STRING \"From super-project\" FORCE)\n")
      string(APPEND _toolchain_contents "set(GPU_TARGETS @_filtered_gpu_targets@ CACHE STRING \"From super-project\" FORCE)\n")
      string(APPEND _toolchain_contents "set(CMAKE_HIP_ARCHITECTURES @_filtered_gpu_targets@ CACHE STRING \"From super-project\" FORCE)\n")
@@ -11,7 +20,7 @@ index 3985c872..d5ebc862 100644
 
    # General settings applicable to all toolchains.
 diff --git a/compiler/CMakeLists.txt b/compiler/CMakeLists.txt
-index eee0b5d5..dfabe601 100644
+index bf625919..31c4ceb5 100644
 --- a/compiler/CMakeLists.txt
 +++ b/compiler/CMakeLists.txt
 @@ -13,6 +13,10 @@ if(THEROCK_ENABLE_COMPILER)
@@ -25,16 +34,31 @@ index eee0b5d5..dfabe601 100644
 
    # Building Flang is very memory-intensive on systems with many cores. Allow
    # users to specify the level of concurrency for these tasks so they can
-@@ -74,6 +78,9 @@ if(THEROCK_ENABLE_COMPILER)
+@@ -73,7 +77,10 @@ if(THEROCK_ENABLE_COMPILER)
+       -DLIBCXXABI_ENABLE_STATIC=ON
 
        # Features
-       -DLLVM_INCLUDE_TESTS=${THEROCK_ENABLE_LLVM_TESTS}
-+      -DLLVM_BUILD_TESTS=${THEROCK_ENABLE_LLVM_TESTS}
-+      -DCLANG_INCLUDE_TESTS=${THEROCK_ENABLE_LLVM_TESTS}
+-      -DLLVM_INCLUDE_TESTS=${THEROCK_ENABLE_LLVM_TESTS}
++      -DLLVM_INCLUDE_TESTS=${THEROCK_BUILD_LLVM_TESTS}
++      -DLLVM_BUILD_TESTS=${THEROCK_BUILD_LLVM_TESTS}
++      -DCLANG_INCLUDE_TESTS=${THEROCK_BUILD_LLVM_TESTS}
 +      -DLLVM_LIT_ARGS='-vv --show-unsupported --show-xfail -j 16'
        -DLLVM_ENABLE_ZLIB=FORCE_ON
        -DLLVM_ENABLE_Z3_SOLVER=OFF
        -DLLVM_ENABLE_LIBXML2=OFF
+@@ -85,9 +92,9 @@ if(THEROCK_ENABLE_COMPILER)
+       -DLLVM_BUILD_LLVM_C_DYLIB=OFF
+ 
+       # Build optimizations
+-      -DLLVM_BUILD_EXAMPLES=${THEROCK_ENABLE_LLVM_TESTS}
+-      -DLLVM_INCLUDE_EXAMPLES=${THEROCK_ENABLE_LLVM_TESTS}
+-      -DLLVM_TOOL_LLVM_JITLINK_BUILD=${THEROCK_ENABLE_LLVM_TESTS}
++      -DLLVM_BUILD_EXAMPLES=${THEROCK_BUILD_LLVM_TESTS}
++      -DLLVM_INCLUDE_EXAMPLES=${THEROCK_BUILD_LLVM_TESTS}
++      -DLLVM_TOOL_LLVM_JITLINK_BUILD=${THEROCK_BUILD_LLVM_TESTS}
+ 
+       # Clang features.
+       -DCLANG_ENABLE_ARCMT=OFF
 @@ -95,6 +102,9 @@ if(THEROCK_ENABLE_COMPILER)
        -DCLANG_ENABLE_CLANGD=OFF
        -DCLANG_TIDY_ENABLE_STATIC_ANALYZER=OFF
@@ -46,7 +70,7 @@ index eee0b5d5..dfabe601 100644
        -DCLANG_TOOL_OFFLOAD_ARCH_BUILD=${THEROCK_CONDITION_IS_NON_WINDOWS}
        -DOPENMP_ENABLE_LIBOMPTARGET=${THEROCK_CONDITION_IS_NON_WINDOWS}
 diff --git a/compiler/artifact-amd-llvm.toml b/compiler/artifact-amd-llvm.toml
-index 6b3ba876..54bc1b14 100644
+index c74d02a9..7e0b24f3 100644
 --- a/compiler/artifact-amd-llvm.toml
 +++ b/compiler/artifact-amd-llvm.toml
 @@ -7,6 +7,7 @@ unmatched_exclude = [
@@ -58,10 +82,10 @@ index 6b3ba876..54bc1b14 100644
 
  # LLVM deviates from the defaults in some key ways:
 diff --git a/compiler/pre_hook_amd-llvm.cmake b/compiler/pre_hook_amd-llvm.cmake
-index f84f7f21..aa0af2c2 100644
+index 28dc936b..8fede131 100644
 --- a/compiler/pre_hook_amd-llvm.cmake
 +++ b/compiler/pre_hook_amd-llvm.cmake
-@@ -124,9 +124,9 @@ set(LLVM_EXTERNAL_PROJECTS "rocm-device-libs;spirv-llvm-translator" CACHE STRING
+@@ -128,9 +128,9 @@ set(LLVM_EXTERNAL_PROJECTS "rocm-device-libs;spirv-llvm-translator" CACHE STRING
  # options to manage this transition but they require knowing the clange resource
  # dir. In order to avoid drift, we just fixate that too. This can all be
  # removed in a future version.

srock-bin/srock_common_vars

@@ -181,7 +181,7 @@ _cmake_args=(-B build -GNinja
    -DTHEROCK_AMDGPU_FAMILIES=\'"$_gfamsemicolons"\'
    -DTHEROCK_AMDGPU_DIST_BUNDLE_NAME=srock
    -DTHEROCK_BACKGROUND_BUILD_JOBS=1
-   -DTHEROCK_ENABLE_LLVM_TESTS=1
+   -DTHEROCK_BUILD_LLVM_TESTS=1
    "${_cmake_enable[@]}"
    "$SROCK_THEROCK_DIR"
 )