commit: eddb3cba7ca1cfafc2bd97789b8b832031ee8079 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Fri Oct 17 09:42:00 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Oct 17 14:31:28 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eddb3cba
dev-util/Tensile: drop unused patches Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44218 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/Tensile-4.3.0-output-commands.patch | 23 ---------- .../Tensile/files/Tensile-5.4.2-use-ninja.patch | 21 ---------- .../Tensile-5.7.1-expand-isa-compatibility.patch | 49 ---------------------- .../Tensile-5.7.1-fix-msgpack-dependency.patch | 29 ------------- .../files/Tensile-6.1.1-ignore-asm-cap.patch | 11 ----- 5 files changed, 133 deletions(-) diff --git a/dev-util/Tensile/files/Tensile-4.3.0-output-commands.patch b/dev-util/Tensile/files/Tensile-4.3.0-output-commands.patch deleted file mode 100644 index be5a4db21429..000000000000 --- a/dev-util/Tensile/files/Tensile-4.3.0-output-commands.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --color -uprN orig/Tensile/cmake/TensileConfig.cmake Tensile-rocm-4.3.0/Tensile/cmake/TensileConfig.cmake ---- orig/Tensile/cmake/TensileConfig.cmake 2021-08-18 17:48:00.115478470 +0800 -+++ Tensile-rocm-4.3.0/Tensile/cmake/TensileConfig.cmake 2021-08-18 17:48:49.963478801 +0800 -@@ -234,6 +234,7 @@ function(TensileCreateLibraryFiles - COMMENT "Generating Tensile Libraries" - OUTPUT ${Tensile_EMBED_LIBRARY_SOURCE};${Tensile_MANIFEST_CONTENTS} - COMMAND ${CommandLine} -+ USES_TERMINAL - ) - - set("${Tensile_VAR_PREFIX}_ALL_FILES" ${Tensile_MANIFEST_CONTENTS} PARENT_SCOPE) -diff --color -uprN orig/Tensile/Common.py Tensile-rocm-4.3.0/Tensile/Common.py ---- orig/Tensile/Common.py 2021-08-18 17:48:00.075478470 +0800 -+++ Tensile-rocm-4.3.0/Tensile/Common.py 2021-08-18 17:48:23.287478624 +0800 -@@ -179,7 +179,7 @@ globalParameters["PrintTensorD"] = 0 - globalParameters["PrintTensorRef"] = 0 # Print reference tensor. 0x1=after init; 0x2=after copy-back; 0x3=both - globalParameters["PrintIndexAssignments"] = 0 # Print the tensor index assignment info - globalParameters["PrintWinnersOnly"] = False # Only print the solutions which become the fastest --globalParameters["PrintCodeCommands"] = False # print the commands used to generate the code objects (asm,link,hip-clang, etc) -+globalParameters["PrintCodeCommands"] = True # print the commands used to generate the code objects (asm,link,hip-clang, etc) - globalParameters["DumpTensors"] = False # If True, dump tensors to binary files instead of printing them. - - # TODO - remove this when NewClient is mainstream diff --git a/dev-util/Tensile/files/Tensile-5.4.2-use-ninja.patch b/dev-util/Tensile/files/Tensile-5.4.2-use-ninja.patch deleted file mode 100644 index f88bf00665cb..000000000000 --- a/dev-util/Tensile/files/Tensile-5.4.2-use-ninja.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: Tensile-rocm-5.4.2/Tensile/ClientExecutable.py -=================================================================== ---- Tensile-rocm-5.4.2.orig/Tensile/ClientExecutable.py -+++ Tensile-rocm-5.4.2/Tensile/ClientExecutable.py -@@ -44,6 +44,7 @@ class CMakeEnvironment: - args = ['cmake'] - args += ['-G', 'Ninja'] if (os.name == 'nt') else [] - args += itertools.chain.from_iterable([ ['-D{}={}'.format(key, value)] for key,value in self.options.items()]) -+ args += itertools.chain.from_iterable([ ['-G', 'Ninja'], [ '-D', 'CMAKE_EXPORT_COMPILE_COMMANDS=ON' ] ]) - args += [self.sourceDir] - args = [cmake_path(arg) for arg in args] - -@@ -53,7 +54,7 @@ class CMakeEnvironment: - subprocess.check_output(args, stderr=subprocess.STDOUT, cwd=Common.ensurePath(self.buildDir)) - - def build(self): -- args = [('ninja' if (os.name == "nt") else 'make'), f'-j{CPUThreadCount()}'] -+ args = [('ninja'), f'-j{CPUThreadCount()}'] - Common.print2(' '.join(args)) - with Common.ClientExecutionLock(): - # change to use check_output to force windows cmd block util command finish diff --git a/dev-util/Tensile/files/Tensile-5.7.1-expand-isa-compatibility.patch b/dev-util/Tensile/files/Tensile-5.7.1-expand-isa-compatibility.patch deleted file mode 100644 index ebfc537c5c4d..000000000000 --- a/dev-util/Tensile/files/Tensile-5.7.1-expand-isa-compatibility.patch +++ /dev/null @@ -1,49 +0,0 @@ -Allow Tensile to load the compatible kernels when running on -architectures compatible with those ISAs. - -Based on patch from Cordell Bloor <[email protected]> -https://salsa.debian.org/rocm-team/rocblas/-/blob/master/debian/patches/0012-expand-isa-compatibility.patch - ---- a/Tensile/Source/lib/source/hip/HipHardware.cpp -+++ b/Tensile/Source/lib/source/hip/HipHardware.cpp -@@ -24,6 +24,8 @@ - * - *******************************************************************************/ - -+#include <cstring> -+ - #include <Tensile/AMDGPU.hpp> - #include <Tensile/hip/HipHardware.hpp> - #include <Tensile/hip/HipUtils.hpp> -@@ -56,6 +58,31 @@ namespace Tensile - { - hipDeviceProp_t prop; - HIP_CHECK_EXC(hipGetDeviceProperties(&prop, deviceId)); -+ // coerce to compatible arch -+ switch(prop.gcnArch) -+ { -+ case 902: -+ case 909: -+ case 912: -+ prop.gcnArch = 900; -+ std::strcpy(prop.gcnArchName, "gfx900"); -+ break; -+ case 1011: -+ case 1012: -+ case 1013: -+ prop.gcnArch = 1010; -+ std::strcpy(prop.gcnArchName, "gfx1010"); -+ break; -+ case 1031: -+ case 1032: -+ case 1033: -+ case 1034: -+ case 1035: -+ case 1036: -+ prop.gcnArch = 1030; -+ std::strcpy(prop.gcnArchName, "gfx1030"); -+ break; -+ } - #if HIP_VERSION >= 50220730 - int hip_version; - HIP_CHECK_EXC(hipRuntimeGetVersion(&hip_version)); diff --git a/dev-util/Tensile/files/Tensile-5.7.1-fix-msgpack-dependency.patch b/dev-util/Tensile/files/Tensile-5.7.1-fix-msgpack-dependency.patch deleted file mode 100644 index f6f3f0e24c1a..000000000000 --- a/dev-util/Tensile/files/Tensile-5.7.1-fix-msgpack-dependency.patch +++ /dev/null @@ -1,29 +0,0 @@ -Gentoo uses "msgpack-cxx" as library name and adds important -MSGPACK_NO_BOOST compile definition when msgpack-cxx us installed with USE=-boost ---- a/Tensile/Source/lib/CMakeLists.txt -+++ b/Tensile/Source/lib/CMakeLists.txt -@@ -98,22 +98,9 @@ if(TENSILE_USE_LLVM OR TENSILE_USE_MSGPACK) - endif() - - if(TENSILE_USE_MSGPACK) -- find_package(msgpack REQUIRED) -+ find_package(msgpack-cxx REQUIRED) - target_compile_definitions(TensileHost PUBLIC -DTENSILE_MSGPACK=1) -- -- if(TARGET msgpackc-cxx) -- get_target_property(msgpack_inc msgpackc-cxx INTERFACE_INCLUDE_DIRECTORIES) -- elseif(TARGET msgpackc) -- get_target_property(msgpack_inc msgpackc INTERFACE_INCLUDE_DIRECTORIES) -- endif() -- -- if(DEFINED msgpack_inc) -- # include C++ headers manually -- # External header includes included as system files -- target_include_directories(TensileHost -- SYSTEM PRIVATE $<BUILD_INTERFACE:${msgpack_inc}> -- ) -- endif() -+ target_link_libraries(TensileHost PRIVATE msgpack-cxx) - endif() - - if(TENSILE_USE_LLVM) diff --git a/dev-util/Tensile/files/Tensile-6.1.1-ignore-asm-cap.patch b/dev-util/Tensile/files/Tensile-6.1.1-ignore-asm-cap.patch deleted file mode 100644 index b0ad3b276fba..000000000000 --- a/dev-util/Tensile/files/Tensile-6.1.1-ignore-asm-cap.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Tensile/Common.py 2024-11-09 20:38:11.186998794 -0000 -+++ b/Tensile/Common.py 2024-11-09 20:43:18.524804845 -0000 -@@ -2030,7 +2030,7 @@ - if len(compilerVer) >= 2: - ignoreCacheCheck = ignoreCacheCheck or \ - compilerVer[0] < 5 or \ -- (compilerVer[0] == 5 and compilerVer[1] <= 2) -+ (compilerVer[0] == 6 and compilerVer[1] <= 1) - - if not derivedAsmCaps["SupportedISA"] and CACHED_ASM_CAPS[isaVersion]["SupportedISA"]: - printWarning("Architecture {} not supported by ROCm {}".format(isaVersion, globalParameters['HipClangVersion']))
