Resolve conflicts

Author: stellaraccident

math-libs/BLAS/CMakeLists.txt

@@ -62,11 +62,14 @@ therock_cmake_subproject_declare(hipBLASLt
     -DHIPBLASLT_ENABLE_MARKER=OFF
     -DBUILD_CLIENTS_TESTS=${THEROCK_BUILD_TESTING}
     -DBUILD_CLIENTS_BENCHMARKS=${THEROCK_BUILD_TESTING}
+    # TODO(#376): rocRoller is broken
+    -DUSE_ROCROLLER=OFF
   COMPILER_TOOLCHAIN
     amd-hip
   BUILD_DEPS
     hipBLAS-common
     rocm-cmake
+    therock-boost
     therock-msgpack-cxx
   RUNTIME_DEPS
     hip-clr

patches/amd-mainline/hipBLASLt/0001-Update-find_package-for-msgpack-to-work-with-5.x-and.patch

@@ -1,7 +1,7 @@
-From e148639debe62686b3572b5aeccb50608464120a Mon Sep 17 00:00:00 2001
+From 28d221b97cf54db4b88bfbb923d6569a7065dd9f Mon Sep 17 00:00:00 2001
 From: Stella Laurenzo <stellaraccident@gmail.com>
 Date: Mon, 3 Feb 2025 20:28:58 -0800
-Subject: [PATCH 1/5] Update find_package for msgpack to work with 5.x and 6.x.
+Subject: [PATCH 1/7] Update find_package for msgpack to work with 5.x and 6.x.
 
 Adapted from: https://github.com/msgpack/msgpack-c/wiki/Q%26A#how-to-support-both-msgpack-c-c-version-5x-and-6x-
 
@@ -11,10 +11,10 @@ Note that 6.x also defines compile definitions that must be respected.
  1 file changed, 13 insertions(+), 15 deletions(-)
 
 diff --git a/tensilelite/Tensile/Source/lib/CMakeLists.txt b/tensilelite/Tensile/Source/lib/CMakeLists.txt
-index d055b635..a8a98690 100644
+index d6ad1df3..813f4848 100644
 --- a/tensilelite/Tensile/Source/lib/CMakeLists.txt
 +++ b/tensilelite/Tensile/Source/lib/CMakeLists.txt
-@@ -96,22 +96,20 @@ if(TENSILE_USE_LLVM OR TENSILE_USE_MSGPACK)
+@@ -105,22 +105,20 @@ if(TENSILE_USE_LLVM OR TENSILE_USE_MSGPACK)
  endif()
 
  if(TENSILE_USE_MSGPACK)
@@ -51,5 +51,5 @@ index d055b635..a8a98690 100644
 
  if(TENSILE_USE_LLVM)
 -- 
-2.34.1
+2.43.0
 

patches/amd-mainline/hipBLASLt/0002-Do-not-hard-code-hipBLASLt-to-find-tools-in-opt-rocm.patch

@@ -1,7 +1,7 @@
-From 0a1aa2f63c351b748af1ae3878ab29f24b6a4e28 Mon Sep 17 00:00:00 2001
+From aba1654c5317edcfcef22166f3e5073016627eeb Mon Sep 17 00:00:00 2001
 From: Stella Laurenzo <stellaraccident@gmail.com>
 Date: Fri, 7 Mar 2025 12:13:41 -0800
-Subject: [PATCH 2/8] Do not hard-code hipBLASLt to find tools in /opt/rocm and
+Subject: [PATCH 2/7] Do not hard-code hipBLASLt to find tools in /opt/rocm and
  propagate configure time PATH.
 
 * Makes gen_assembly.sh and compile_code_object.sh scripts fail on error vs silently succeeding (`set -e`). These scripts have a suspect design overall, but making them error on failure is a minimal thing that is needed.
@@ -126,5 +126,5 @@ index d542c584..1d57885f 100644
    )
 
 -- 
-2.49.0
+2.43.0
 

patches/amd-mainline/hipBLASLt/0003-Find-rocm_smi-via-config-files.patch

@@ -1,7 +1,7 @@
-From d150c267b4808eb0abab141116add579158d482d Mon Sep 17 00:00:00 2001
+From a50ba02dda81965d094aded79852b0d06fb5a8d6 Mon Sep 17 00:00:00 2001
 From: Marius Brehler <marius.brehler@amd.com>
 Date: Wed, 12 Mar 2025 22:39:56 +0000
-Subject: [PATCH 3/5] Find `rocm_smi` via config files
+Subject: [PATCH 3/7] Find `rocm_smi` via config files
 
 Use the config files provided by upstream instead of a custom finder.
 ---
@@ -11,7 +11,7 @@ Use the config files provided by upstream instead of a custom finder.
  delete mode 100644 tensilelite/Tensile/Source/cmake/FindROCmSMI.cmake
 
 diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt
-index 02ae47d3..6b662094 100755
+index 31a72fe8..96d908e4 100755
 --- a/clients/CMakeLists.txt
 +++ b/clients/CMakeLists.txt
 @@ -97,8 +97,8 @@ if( BUILD_CLIENTS_BENCHMARKS OR BUILD_CLIENTS_TESTS)
@@ -88,5 +88,5 @@ index a6fa375a..00000000
 -
 -#set(rocm_smi_root "${hip_LIB_INSTALL_DIR}/../../rocm_smi")
 -- 
-2.34.1
+2.43.0
 

patches/amd-mainline/hipBLASLt/0004-Fix-finding-BLAS-and-LAPACK.patch

@@ -1,7 +1,7 @@
-From c92ac8d8319a6820b3d30f6bef7d70a4bcc64571 Mon Sep 17 00:00:00 2001
+From 88f840418f8421862fb83411f8c2eeb85cc8800e Mon Sep 17 00:00:00 2001
 From: Marius Brehler <marius.brehler@amd.com>
 Date: Wed, 12 Mar 2025 22:41:27 +0000
-Subject: [PATCH 4/5] Fix finding BLAS and LAPACK
+Subject: [PATCH 4/7] Fix finding BLAS and LAPACK
 
 So far it is assumed that NETLIB BLAS and LAPACK are avilable without
 checking. If they are nore, the build fails when trying to link.
@@ -14,7 +14,7 @@ OpenBLAS.
  3 files changed, 7 insertions(+), 5 deletions(-)
 
 diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt
-index 6b662094..b24ca1c3 100755
+index 96d908e4..f69dee9f 100755
 --- a/clients/CMakeLists.txt
 +++ b/clients/CMakeLists.txt
 @@ -92,7 +92,9 @@ if( BUILD_CLIENTS_BENCHMARKS OR BUILD_CLIENTS_TESTS)
@@ -29,10 +29,10 @@ index 6b662094..b24ca1c3 100755
 
    # Find the package ROCmSMI
 diff --git a/clients/benchmarks/CMakeLists.txt b/clients/benchmarks/CMakeLists.txt
-index 99ec31f3..0d70d528 100644
+index e05b1f09..39aa4e8c 100644
 --- a/clients/benchmarks/CMakeLists.txt
 +++ b/clients/benchmarks/CMakeLists.txt
-@@ -76,9 +76,9 @@ endif()
+@@ -80,9 +80,9 @@ endif()
  # target_compile_options does not go to linker like CMAKE_CXX_FLAGS does, so manually add
  if (NOT WIN32)
    if (BUILD_CUDA)
@@ -45,10 +45,10 @@ index 99ec31f3..0d70d528 100644
    list( APPEND COMMON_LINK_LIBS "-lm -lstdc++fs")
 
 diff --git a/clients/gtest/CMakeLists.txt b/clients/gtest/CMakeLists.txt
-index cbedcfa4..eec47b6f 100644
+index 694670a3..64cd576a 100644
 --- a/clients/gtest/CMakeLists.txt
 +++ b/clients/gtest/CMakeLists.txt
-@@ -85,9 +85,9 @@ target_compile_options(hipblaslt-test PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${COMMON
+@@ -90,9 +90,9 @@ target_compile_options(hipblaslt-test PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${COMMON
  # target_compile_options does not go to linker like CMAKE_CXX_FLAGS does, so manually add
 
  if (BUILD_CUDA)
@@ -61,5 +61,5 @@ index cbedcfa4..eec47b6f 100644
 
  list( APPEND COMMON_LINK_LIBS "-lm -lstdc++fs")
 -- 
-2.34.1
+2.43.0
 

patches/amd-mainline/hipBLASLt/0005-Update-packaging-in-pip-venv-to-stabilize-setuptools.patch

@@ -1,15 +1,15 @@
-From 4311b6c3ec948bd819a3413d83435307378ccaa8 Mon Sep 17 00:00:00 2001
+From a6becad02a9019ebef81ca4a5f451cab3e36b9c9 Mon Sep 17 00:00:00 2001
 From: Scott Todd <scott.todd0@gmail.com>
 Date: Thu, 6 Mar 2025 15:17:08 -0800
-Subject: [PATCH 5/5] Update 'packaging' in pip venv to stabilize setuptools.
+Subject: [PATCH 5/7] Update 'packaging' in pip venv to stabilize setuptools.
 
 When using setuptools>=71.0.0 and packaging<22.0, setuptools may fail with `TypeError: canonicalize_version() got an unexpected keyword argument 'strip_trailing_zero'`.
 ---
  cmake/virtualenv.cmake | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/cmake/virtualenv.cmake b/cmake/virtualenv.cmake
-index 82bb6d94..a80fb337 100644
+index 7b4a78fe..96531ad2 100644
 --- a/cmake/virtualenv.cmake
 +++ b/cmake/virtualenv.cmake
 @@ -35,6 +35,10 @@ function(virtualenv_install)
@@ -24,5 +24,5 @@ index 82bb6d94..a80fb337 100644
        COMMAND ${VIRTUALENV_BIN_DIR}/${VIRTUALENV_PYTHON_EXENAME} -m pip install ${ARGN}
        COMMAND_ECHO STDOUT
 -- 
-2.34.1
+2.43.0
 

patches/amd-mainline/hipBLASLt/0006-Build-hipblas-sequence-on-non-Ubuntu-systems.patch

@@ -1,4 +1,4 @@
-From 6a0725acc8e9b74679904f77502019881857174e Mon Sep 17 00:00:00 2001
+From 294d4db2ad360dd6603cf7358d3410ad19f75e72 Mon Sep 17 00:00:00 2001
 From: Marius Brehler <marius.brehler@amd.com>
 Date: Tue, 18 Mar 2025 12:14:21 +0000
 Subject: [PATCH 6/7] Build `hipblas-sequence` on non-Ubuntu systems
@@ -8,7 +8,7 @@ Subject: [PATCH 6/7] Build `hipblas-sequence` on non-Ubuntu systems
  1 file changed, 30 insertions(+), 34 deletions(-)
 
 diff --git a/clients/benchmarks/CMakeLists.txt b/clients/benchmarks/CMakeLists.txt
-index 39aa4e8c..6b5532f5 100644
+index 39aa4e8c..1e0f8940 100644
 --- a/clients/benchmarks/CMakeLists.txt
 +++ b/clients/benchmarks/CMakeLists.txt
 @@ -118,42 +118,38 @@ add_executable( hipblaslt-bench-extop-matrixtransform client_extop_matrixtransfo
@@ -57,15 +57,15 @@ index 39aa4e8c..6b5532f5 100644
 +      if(NOT LLVM_FOUND)
 +          find_package(LLVM REQUIRED CONFIG)
 +      endif()
-+  endif()
+   endif()
 +  find_library(LLVMObjectYAML_LIBRARY
 +    NAMES LLVMObjectYAML
 +    PATHS ${LLVM_LIBRARY_DIR})
 +  if(LLVMObjectYAML_LIBRARY)
 +    target_link_libraries(hipblaslt-sequence PRIVATE LLVMObjectYAML )
 +  else()
 +    target_link_libraries(hipblaslt-sequence PRIVATE LLVM )
-   endif()
++  endif()
 +  target_include_directories(hipblaslt-sequence PRIVATE ${LLVM_INCLUDE_DIRS})
 +  set(ext_bench_list_all ${ext_bench_list_all} hipblaslt-sequence)
 +  set( HIPBLASLT_SEQUENCE_YAML "${PROJECT_BINARY_DIR}/staging/sequence.yaml")
@@ -85,5 +85,5 @@ index 39aa4e8c..6b5532f5 100644
 
  foreach( exe ${ext_bench_list_all} )
 -- 
-2.49.0
+2.43.0
 

patches/amd-mainline/hipBLASLt/0007-Disable-Boost-detection-and-RocRoller-support.patch

@@ -1,14 +1,15 @@
-From d62d29eaaab3346c619edc33dbec66db9139f2a3 Mon Sep 17 00:00:00 2001
-From: Scott Tsai <scottt.tw@gmail.com>
-Date: Tue, 8 Apr 2025 04:28:51 +0800
-Subject: [PATCH 8/8] tensilelite: make roc-smi binary optional during build
+From 121342dcded7994a5fdf19d3256b50ae86f92454 Mon Sep 17 00:00:00 2001
+From: Stella Laurenzo <stellaraccident@gmail.com>
+Date: Tue, 8 Apr 2025 14:34:29 -0700
+Subject: [PATCH 7/7] Skip clock reset if rocm-smi is not available.
 
+* Pinning clocks was already conditioned on this, so the cleanup logic should also be.
 ---
- tensilelite/Tensile/Common/GlobalParameters.py | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
+ tensilelite/Tensile/Common/GlobalParameters.py | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
 
 diff --git a/tensilelite/Tensile/Common/GlobalParameters.py b/tensilelite/Tensile/Common/GlobalParameters.py
-index 8ec5f326..5d38fec8 100644
+index 8ec5f326..58dd69f4 100644
 --- a/tensilelite/Tensile/Common/GlobalParameters.py
 +++ b/tensilelite/Tensile/Common/GlobalParameters.py
 @@ -549,7 +549,10 @@ def assignGlobalParameters(config, isaInfoMap: Dict[IsaVersion, IsaInfo]):
@@ -19,22 +20,25 @@ index 8ec5f326..5d38fec8 100644
 +    try:
 +        globalParameters["ROCmSMIPath"] = locateExe(globalParameters["ROCmBinPath"], "rocm-smi")
 +    except OSError:
-+        pass
++        printWarning("Could not find rocm-smi: features relying on it will be ignored")
      globalParameters["ROCmLdPath"] = locateExe(
          os.path.join(globalParameters["ROCmPath"], "llvm/bin"), "ld.lld"
      )
-@@ -625,8 +628,9 @@ def setupRestoreClocks():
+@@ -624,9 +627,12 @@ def setupRestoreClocks():
+ 
      def restoreClocks():
          if globalParameters["PinClocks"]:
++            # Clocks will only be pinned if rocm-smi is available, therefore
++            # we only need to restore if found.
              rsmi = globalParameters["ROCmSMIPath"]
 -            subprocess.call([rsmi, "-d", "0", "--resetclocks"])
 -            subprocess.call([rsmi, "-d", "0", "--setfan", "50"])
-+            if rsmi:
++            if rsmi is not None:
 +                subprocess.call([rsmi, "-d", "0", "--resetclocks"])
 +                subprocess.call([rsmi, "-d", "0", "--setfan", "50"])
 
      atexit.register(restoreClocks)
 
 -- 
-2.49.0
+2.43.0