From ca2dd8e45a136759f7334d31f7659e218a67a780 Mon Sep 17 00:00:00 2001 From: harsh-amd <149193359+harsh-amd@users.noreply.github.com> Date: Sat, 4 Jul 2026 21:13:34 -0700 Subject: [PATCH 1/8] Bump hotswap gfx1250 integration submodules --- compiler/amd-llvm | 2 +- rocm-systems | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/amd-llvm b/compiler/amd-llvm index aa451e1fe6a..1ee349ce87d 160000 --- a/compiler/amd-llvm +++ b/compiler/amd-llvm @@ -1 +1 @@ -Subproject commit aa451e1fe6a793394d6733051b1778633063ae96 +Subproject commit 1ee349ce87d4cd1838c0a73dfb2eb149226d428b diff --git a/rocm-systems b/rocm-systems index 435195a1d73..8e1ee991ebe 160000 --- a/rocm-systems +++ b/rocm-systems @@ -1 +1 @@ -Subproject commit 435195a1d732e8e615bd885aa206dc8e9683ea11 +Subproject commit 8e1ee991ebea976c5a473624482538f5628af33c From 414931dfa2b8213044b9331ec65fadcb795ca56b Mon Sep 17 00:00:00 2001 From: harsh-amd <149193359+harsh-amd@users.noreply.github.com> Date: Sat, 4 Jul 2026 21:51:18 -0700 Subject: [PATCH 2/8] Bump amd-llvm for COMGR hotswap include compatibility --- compiler/amd-llvm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/amd-llvm b/compiler/amd-llvm index 1ee349ce87d..a0071fe4574 160000 --- a/compiler/amd-llvm +++ b/compiler/amd-llvm @@ -1 +1 @@ -Subproject commit 1ee349ce87d4cd1838c0a73dfb2eb149226d428b +Subproject commit a0071fe457479467fca0a90a27b83451833162c7 From a40aa27d136b9416e5d5987d5140581c18a4e6b8 Mon Sep 17 00:00:00 2001 From: harsh-amd <149193359+harsh-amd@users.noreply.github.com> Date: Sat, 4 Jul 2026 22:07:35 -0700 Subject: [PATCH 3/8] Export bundled sqlite include path --- third-party/sysdeps/common/sqlite3/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/third-party/sysdeps/common/sqlite3/CMakeLists.txt b/third-party/sysdeps/common/sqlite3/CMakeLists.txt index e8b7b13855b..b0f8fa563a9 100644 --- a/third-party/sysdeps/common/sqlite3/CMakeLists.txt +++ b/third-party/sysdeps/common/sqlite3/CMakeLists.txt @@ -33,6 +33,8 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) "-DSQLITE3_VERSION=${SQLITE3_VERSION}" INSTALL_DESTINATION lib/rocm_sysdeps + INTERFACE_INCLUDE_DIRS + lib/rocm_sysdeps/include INTERFACE_LINK_DIRS lib/rocm_sysdeps/lib INTERFACE_PKG_CONFIG_DIRS From ac84b79fe585891223b1647a60bf47dcb1c29b89 Mon Sep 17 00:00:00 2001 From: harsh-amd <149193359+harsh-amd@users.noreply.github.com> Date: Sun, 5 Jul 2026 06:40:15 -0700 Subject: [PATCH 4/8] Bump amd-llvm for COMGR hotswap sled scoping --- compiler/amd-llvm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/amd-llvm b/compiler/amd-llvm index a0071fe4574..4fe37e2ab0c 160000 --- a/compiler/amd-llvm +++ b/compiler/amd-llvm @@ -1 +1 @@ -Subproject commit a0071fe457479467fca0a90a27b83451833162c7 +Subproject commit 4fe37e2ab0cb24b34b135b12f6b93d84394fde7b From 4885965897734330734455ef7f8e222014607a7e Mon Sep 17 00:00:00 2001 From: harsh-amd <149193359+harsh-amd@users.noreply.github.com> Date: Sun, 5 Jul 2026 06:49:08 -0700 Subject: [PATCH 5/8] Use bundled OpenMP for rocBLAS clients --- math-libs/BLAS/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/math-libs/BLAS/CMakeLists.txt b/math-libs/BLAS/CMakeLists.txt index b9020e91fb9..9440fe1dcc6 100644 --- a/math-libs/BLAS/CMakeLists.txt +++ b/math-libs/BLAS/CMakeLists.txt @@ -189,6 +189,12 @@ set(rocBLAS_extra_cmake_args) if(THEROCK_BUILD_TESTING) list(APPEND rocBLAS_extra_cmake_args -DROCBLAS_CLIENTS_REFERENCE_ILP64=ON) endif() +if(NOT WIN32) + list(APPEND rocBLAS_extra_cmake_args + "-DOpenMP_DIR=${_toolchain_dir}/lib/cmake/openmp" + "-DHIP_CLANG_ROOT=${_toolchain_dir}" + ) +endif() # Disable rocBLAS samples on Windows due to use of deprecated # in client_utility.cpp with MSVC. From 7b68b7f4c2f9acd3393e99bc45c00a798410c9ba Mon Sep 17 00:00:00 2001 From: harsh-amd <149193359+harsh-amd@users.noreply.github.com> Date: Sun, 5 Jul 2026 06:59:28 -0700 Subject: [PATCH 6/8] Use bundled OpenMP for sparse clients --- math-libs/BLAS/CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/math-libs/BLAS/CMakeLists.txt b/math-libs/BLAS/CMakeLists.txt index 9440fe1dcc6..bc6cb20bb45 100644 --- a/math-libs/BLAS/CMakeLists.txt +++ b/math-libs/BLAS/CMakeLists.txt @@ -258,6 +258,13 @@ if(THEROCK_ENABLE_SPARSE) # rocSPARSE ############################################################################## set(_sparse_subproject_names) + set(_sparse_extra_cmake_args) + if(NOT WIN32) + list(APPEND _sparse_extra_cmake_args + "-DOpenMP_DIR=${_toolchain_dir}/lib/cmake/openmp" + "-DHIP_CLANG_ROOT=${_toolchain_dir}" + ) + endif() therock_cmake_subproject_declare(rocSPARSE EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_LIBRARIES_SOURCE_DIR}/projects/rocsparse" @@ -271,6 +278,7 @@ if(THEROCK_ENABLE_SPARSE) -DBUILD_CLIENTS_TESTS=${THEROCK_BUILD_TESTING} -DBUILD_CLIENTS_BENCHMARKS=${THEROCK_BUILD_TESTING} -DBUILD_CLIENTS_SAMPLES=OFF + ${_sparse_extra_cmake_args} CMAKE_INCLUDES therock_explicit_finders.cmake COMPILER_TOOLCHAIN @@ -311,6 +319,7 @@ if(THEROCK_ENABLE_SPARSE) -DBUILD_CLIENTS_TESTS=${THEROCK_BUILD_TESTING} -DBUILD_CLIENTS_BENCHMARKS=${THEROCK_BUILD_TESTING} -DBUILD_CLIENTS_SAMPLES=OFF + ${_sparse_extra_cmake_args} COMPILER_TOOLCHAIN amd-hip BUILD_DEPS From 4d8424a2fb6f6d934810a57ea621169b1053821b Mon Sep 17 00:00:00 2001 From: harsh-amd <149193359+harsh-amd@users.noreply.github.com> Date: Sun, 5 Jul 2026 07:04:47 -0700 Subject: [PATCH 7/8] Use bundled OpenMP for BLAS clients --- math-libs/BLAS/CMakeLists.txt | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/math-libs/BLAS/CMakeLists.txt b/math-libs/BLAS/CMakeLists.txt index bc6cb20bb45..7a576877051 100644 --- a/math-libs/BLAS/CMakeLists.txt +++ b/math-libs/BLAS/CMakeLists.txt @@ -7,6 +7,13 @@ # here without worrying about build deps. therock_cmake_subproject_dist_dir(_blas_hack_hip_dir hip-clr) cmake_path(APPEND _blas_hack_hip_dir lib/llvm OUTPUT_VARIABLE _toolchain_dir) +set(_blas_openmp_toolchain_cmake_args) +if(NOT WIN32) + list(APPEND _blas_openmp_toolchain_cmake_args + "-DOpenMP_DIR=${_toolchain_dir}/lib/cmake/openmp" + "-DHIP_CLANG_ROOT=${_toolchain_dir}" + ) +endif() # Most libraries need to depend on the profiler, but is conditionally only used # on Posix. @@ -189,12 +196,7 @@ set(rocBLAS_extra_cmake_args) if(THEROCK_BUILD_TESTING) list(APPEND rocBLAS_extra_cmake_args -DROCBLAS_CLIENTS_REFERENCE_ILP64=ON) endif() -if(NOT WIN32) - list(APPEND rocBLAS_extra_cmake_args - "-DOpenMP_DIR=${_toolchain_dir}/lib/cmake/openmp" - "-DHIP_CLANG_ROOT=${_toolchain_dir}" - ) -endif() +list(APPEND rocBLAS_extra_cmake_args ${_blas_openmp_toolchain_cmake_args}) # Disable rocBLAS samples on Windows due to use of deprecated # in client_utility.cpp with MSVC. @@ -258,13 +260,6 @@ if(THEROCK_ENABLE_SPARSE) # rocSPARSE ############################################################################## set(_sparse_subproject_names) - set(_sparse_extra_cmake_args) - if(NOT WIN32) - list(APPEND _sparse_extra_cmake_args - "-DOpenMP_DIR=${_toolchain_dir}/lib/cmake/openmp" - "-DHIP_CLANG_ROOT=${_toolchain_dir}" - ) - endif() therock_cmake_subproject_declare(rocSPARSE EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_LIBRARIES_SOURCE_DIR}/projects/rocsparse" @@ -278,7 +273,7 @@ if(THEROCK_ENABLE_SPARSE) -DBUILD_CLIENTS_TESTS=${THEROCK_BUILD_TESTING} -DBUILD_CLIENTS_BENCHMARKS=${THEROCK_BUILD_TESTING} -DBUILD_CLIENTS_SAMPLES=OFF - ${_sparse_extra_cmake_args} + ${_blas_openmp_toolchain_cmake_args} CMAKE_INCLUDES therock_explicit_finders.cmake COMPILER_TOOLCHAIN @@ -319,7 +314,7 @@ if(THEROCK_ENABLE_SPARSE) -DBUILD_CLIENTS_TESTS=${THEROCK_BUILD_TESTING} -DBUILD_CLIENTS_BENCHMARKS=${THEROCK_BUILD_TESTING} -DBUILD_CLIENTS_SAMPLES=OFF - ${_sparse_extra_cmake_args} + ${_blas_openmp_toolchain_cmake_args} COMPILER_TOOLCHAIN amd-hip BUILD_DEPS @@ -366,6 +361,7 @@ if(THEROCK_ENABLE_SPARSE) -DHIPSPARSELT_ENABLE_SAMPLES=OFF -DHIPSPARSELT_ENABLE_FETCH=OFF -DHIPSPARSELT_ENABLE_THEROCK=ON + ${_blas_openmp_toolchain_cmake_args} COMPILER_TOOLCHAIN amd-hip BUILD_DEPS @@ -515,6 +511,7 @@ therock_cmake_subproject_declare(hipBLAS -DBUILD_CLIENTS_BENCHMARKS=${THEROCK_BUILD_TESTING} -DBUILD_CLIENTS_SAMPLES=OFF -DLINK_BLIS=OFF + ${_blas_openmp_toolchain_cmake_args} COMPILER_TOOLCHAIN amd-hip BUILD_DEPS From 706a8a952e402367895badf6ec05d68745785c07 Mon Sep 17 00:00:00 2001 From: harsh-amd <149193359+harsh-amd@users.noreply.github.com> Date: Sun, 5 Jul 2026 07:08:36 -0700 Subject: [PATCH 8/8] Limit OpenMP config hints to BLAS clients --- math-libs/BLAS/CMakeLists.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/math-libs/BLAS/CMakeLists.txt b/math-libs/BLAS/CMakeLists.txt index 7a576877051..4bf63216ef6 100644 --- a/math-libs/BLAS/CMakeLists.txt +++ b/math-libs/BLAS/CMakeLists.txt @@ -7,11 +7,17 @@ # here without worrying about build deps. therock_cmake_subproject_dist_dir(_blas_hack_hip_dir hip-clr) cmake_path(APPEND _blas_hack_hip_dir lib/llvm OUTPUT_VARIABLE _toolchain_dir) +set(_blas_hip_clang_root_cmake_args) +if(NOT WIN32) + list(APPEND _blas_hip_clang_root_cmake_args + "-DHIP_CLANG_ROOT=${_toolchain_dir}" + ) +endif() set(_blas_openmp_toolchain_cmake_args) if(NOT WIN32) list(APPEND _blas_openmp_toolchain_cmake_args "-DOpenMP_DIR=${_toolchain_dir}/lib/cmake/openmp" - "-DHIP_CLANG_ROOT=${_toolchain_dir}" + ${_blas_hip_clang_root_cmake_args} ) endif() @@ -273,7 +279,7 @@ if(THEROCK_ENABLE_SPARSE) -DBUILD_CLIENTS_TESTS=${THEROCK_BUILD_TESTING} -DBUILD_CLIENTS_BENCHMARKS=${THEROCK_BUILD_TESTING} -DBUILD_CLIENTS_SAMPLES=OFF - ${_blas_openmp_toolchain_cmake_args} + ${_blas_hip_clang_root_cmake_args} CMAKE_INCLUDES therock_explicit_finders.cmake COMPILER_TOOLCHAIN @@ -361,7 +367,7 @@ if(THEROCK_ENABLE_SPARSE) -DHIPSPARSELT_ENABLE_SAMPLES=OFF -DHIPSPARSELT_ENABLE_FETCH=OFF -DHIPSPARSELT_ENABLE_THEROCK=ON - ${_blas_openmp_toolchain_cmake_args} + ${_blas_hip_clang_root_cmake_args} COMPILER_TOOLCHAIN amd-hip BUILD_DEPS