gentoo auto-resync : 07:01:2025 - 06:41:06

5 files changed, 168 insertions, 5 deletions

diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest
index 30736727cf3d..64bdf7f875a0 100644
--- a/dev-util/Tensile/Manifest
+++ b/dev-util/Tensile/Manifest
@@ -13,15 +13,18 @@ AUX Tensile-5.7.1-gentoopath.patch 2284 BLAKE2B 36f55d7eefe595395c108671d55a07cb
 AUX Tensile-6.0.2-expand-isa-compatibility.patch 1355 BLAKE2B daf73107efc31a4585c44627de3d2de8f6ba390da1ea47aea0f87613e11ca0c6332b2e8b9935d67c1c10b80bb373c33eff3d4d73f33500d7eea2c00a7bb02c86 SHA512 5e624082eac08f940cb01d4c33664c34eb0d79ec6a66ffe82700c6e4edc931c95ed5e990d2cfbfa66497c35a85a63620c06ad0dd3202476211bf723327b52545
 AUX Tensile-6.1.1-fix-msgpack-dependency.patch 1221 BLAKE2B 8b3b1f2b94f0a5dfb5e4f4e973410a536c2d3bb306b7d0669fdf2d47d85ce54e2f34eb009843b99234f8bfdd42f20eb940c52db23a8099169d949bb4e3decf1b SHA512 02ca22defae159f13da6e717a94e2708c476012ed370ab46df54f529ae31079b5700afeed7b68a0f63a1d763edfb9ea2898b4ccc98de4fcf540e161aa06c3fbf
 AUX Tensile-6.1.1-ignore-asm-cap.patch 636 BLAKE2B 77421fa2ca2f3ecb088b7510375a705d8de1235fc98d9b6cc493feda8c3f24537cf5c80d9b91f7357f63d3d2b763e6ab53530068c41d6353d782cc76247b0039 SHA512 00869f06e1038b5d930cf452bce8c23d8a2089d3e70b50caf7682c5296b91f11c6b2a5d0758f8006723a6a0ac782f59f24b4aeab1ffbf922976a28dbca50fa93
+AUX Tensile-6.3.0-use-ninja.patch 855 BLAKE2B d6261c72b4db84fe40f083034bcc473b7e0a63d9169e15cf5a06a6b7d055f80c80a0acb87e95a85392490636b25a2c6a348590199a8657b42ad56325ed68cede SHA512 4a238566a83fd3cb1781ed053d45eeb2bf37eb050a029556cec1c9164cf5b61a835a73f9f2a1dd5adc8e63911e9fffeaa887f9e2ef28653e537b9ae19f8d619d
 AUX Tensile-change-cmake-name-for-msgpack-cxx-6-release.patch 422 BLAKE2B 791a8041667c29f2cd06d036e6f54530fc88ac4afff9bd2f3f5dd6ab3a6daa6b52ba7459c156e12dae02bd918f740d1e1d22bd6bc7e26bd14269a5ffd877aa13 SHA512 a738be31fd735bf3d8ff17d844771e6113f9868c1d73f1eecd75e1ecfb5d04c743c9463a1e599712b9bc0d7877d8d90fa38fbc7a266add8b61e7fb575693eb4f
 DIST Tensile-5.0.2-PR1419.patch.gz 43754 BLAKE2B 3b1d7333ed0115f77816806e7735e25d897dbae3f7a40ece61d655c8f016d9d1c804b586b4e0e75661e20c517f5937a61d5ead25a545f0ce2e4a178bcbb3e7be SHA512 0154d8e14d335f4ecd86e5db335289f8662cede7e5d4b93bf6c56d8e48c1d7d0457271c078c9abbbca1f4aa91f028f6ce6a89efb783ba0207d0f39fd5de8a42c
 DIST rocm-Tensile-5.1.3.tar.gz 14357517 BLAKE2B 7c5881cc2b1d25db39f54a99f9f0a08395a5f7a58deebe74d9868e8f7044db5ae2f3907196adf16dc6abeba0f1f47f5cce5c8900891276daff8e4ad614cf3b94 SHA512 4405cb6de65c1da1fd93910fc901402a24e996ff04eccadf483c25d8eb518e03ea9bbf00e372dd5fe377696e71c39355603095f3c5fc1e26d311ed15d8e3b734
 DIST rocm-Tensile-5.4.2.tar.gz 14413805 BLAKE2B ca1c13785164439f6fe83f16b36b7a0b06a63b70b9f0741d77b0fff98f38d1e1c7e9a54ef61897e6eb0a4eaf52ec9e5f14f42a7e6fd657f26306afa3de0c74a2 SHA512 d99736a202c7353979e732941199b4b20e53ff2b6c19a7175609440a840aa5624bc53a8013c435f31ac37933527771521ff02137c1c8fd53c5317eca8533be80
 DIST rocm-Tensile-5.7.1.tar.gz 12396002 BLAKE2B ec2c2bc3f07fe22abd800b642c998ea80b9e4e2d0d28c4763d574dbd2fcb14c735223ddc7571d4ab3a48f0bd819cc835c16df9882049c5bf56f25ef729e6d654 SHA512 8f356f36cfec74ee9b000d1180cf52077dc5c595e5c5a40792fc3eb13f3139980c7440f9bc912218f946cf8137e2481d23fe39f110511c1bb55fe85a933ffd36
 DIST rocm-Tensile-6.1.1.tar.gz 12675289 BLAKE2B dfe3698d7dda14d5b20a6fe1ef6535ac9737ac330b71678a3a94e939adc2350e2dcf33e58c711ee90dae543efba59fe210bfa39fc69b63910ec4537db3f209bf SHA512 cf8b014b1ff7cd5d45236b8a9a6f5604b02e34a9245a163c672847b535d565151bf7e3a5127601681e80e6fe26964a0e544594044efe2fe68e39b0f1128f96e2
+DIST rocm-Tensile-6.3.0.tar.gz 12724004 BLAKE2B 83887efe8ab4102b9d33bae1f97a245d40bcc186635760de509079218628fd4d57072c6c2c1726fec6d8603d40e760e37fa1a443eead290d121cac099ae779ff SHA512 4c80a269236690545d8bc9090b799c5b4095ed9152a1e19ff8b2e5decd588545641ccdf3c6c469b12f4de29b3f4c2821a6e4714460771250b05339ac32f57c13
 EBUILD Tensile-5.1.3-r3.ebuild 2812 BLAKE2B 4c005cc1fcdcc45e74d97b463b1c7aff059a953fb951f2833ac3439e20138ce5d0cd15d20f47db6640a164def7e66c268289d6d1634f9b29ef1930665c77cc47 SHA512 3f1377286dc82e2a0a0797feb5f1223dcefa8367817cd97559c1ef78159ee9854d5be4b0eb0078ef3687702bf67ee708725c76d08dd9ae40e999b3b3aafc61ae
 EBUILD Tensile-5.4.2-r2.ebuild 3348 BLAKE2B 45125cb1fcf233eaa847f3f5b565e1aa7e5fb7504ae37de9f16f9755f4bcb1b8bbd97a6cafe54a0a2a3253e21fea1a31b6d1ca6412b34994561eacd996f23088 SHA512 59a34c46a1372a071cc2df45cade4d4183cfb1f13f867cd380a193c1d1525b7ea4d1d4570c64101886787abd6880865432ea8577a241cebdb97807fd6b4ddb79
 EBUILD Tensile-5.7.1-r2.ebuild 3534 BLAKE2B 508198211e41ae0e519a0c358e8b6d2b35384da585b947b1c29457ec4a8d91a941fd53e51da44dc5db56fec9749a101dd2598a0189a3953dddf29aced4832263 SHA512 6e41dd66afc8236aaf096eec8f445f59ad152c4b5846edda1b4a583695756dc7fe1743a530454a439d72469984f8038ae20e0fedfad102867c9ce049133aa1fc
-EBUILD Tensile-6.1.1-r1.ebuild 3609 BLAKE2B f924dd010c036c171915709dd6a3cc33e64ac1820a59f9ab5318e93d4dfb193aabd6a0250c3237980df21ee1e78f048a71259adc574f29ae61c082457380f61e SHA512 64c168e534772c4f6163004a81838d9d6ed684a8c8ac644c31ddaf275a6aab623a39d189661b40a4d5ce333710daad506c6e564db6f6c34f734b91f9aed166ed
+EBUILD Tensile-6.1.1-r1.ebuild 3613 BLAKE2B bc993857e81720270ccdb3aa68c6a36a07ec32f46a45a8edbdf01af05c069ef58a5ba9349fe9be51fe3204ea8fd894595cc16304708c5d7d0eda76dde84dd1a6 SHA512 2f381562ba1ed3fd38435e519dd58ffe0198428b382d6114b18aadf6f6090e6b477aec1009744413e6e9cfcbb759f569b8a6a6b62c149dab613d449d8615ff0c
 EBUILD Tensile-6.1.1.ebuild 3561 BLAKE2B cd1cc973261db88e42b84bdfb977bdfe5f3d8053a3cbd564dbb960e7730c6028e984499b7fea9bb091773b4ff5fa1775bd253cba2898d896f4d5e17a67820ee2 SHA512 680cc2e82ad2d393316224c119ec0b04d67f6e4729e412987c1fd449b68cffe570d0389904182020c03330ebd7a12a6bc7467b98c498c57159da21587a7d6550
-MISC metadata.xml 478 BLAKE2B 4931f453630761d3272371d09065c23cd9fea6e9a80f3b78a07e672e5d2e891c2ad7661883e1cb1f41e89fb2cd725a7189937c7b3cc7fc39b23ef0caaf0b3ce7 SHA512 d57284ff50913d95f092a5b8e4e566d0d6668b56afadfeb2e7003f2af6ed2106f14df82be880b2ea71dec29b614c5cb286a085098fbe8eed16e8bd3588149be6
+EBUILD Tensile-6.3.0.ebuild 3539 BLAKE2B 189cfd03790ebd16ba082bf8d0b0a9df9cb8f31db8600f86c2fb327c4c5a79585a86382f025330399b0350bc020bee6b2c281638df38daf775145a7e7ca42173 SHA512 970317d58bfad0c22081868d18ed2b572802a8d0cd8375564468f34a5d674ead6b10a964ff79f570925f90d197a07a72a7ecc783c12f15abb100fee9e773247e
+MISC metadata.xml 462 BLAKE2B 5ce10e79977a750f19569a4b78dfea8443364c8aa5540648cdcad85895c6bd3144b0e949a0dec2928c13eafa4700808b80a6a12d864cee3d17f5cad1d7fb0c41 SHA512 97db6599f4efc77421cc1c5f0a5733fd1e58b2a82236082b621f4b750638d68b4727fa129729e2f87e37fd28813d860a7eb00f056f252bbf3f5747200d4bcdd6
diff --git a/dev-util/Tensile/Tensile-6.1.1-r1.ebuild b/dev-util/Tensile/Tensile-6.1.1-r1.ebuild
index 896eeb8bfb5d..eba19ada31cc 100644
--- a/dev-util/Tensile/Tensile-6.1.1-r1.ebuild
+++ b/dev-util/Tensile/Tensile-6.1.1-r1.ebuild
@@ -29,8 +29,8 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/msgpack[${PYTHON_USEDEP}]
 	dev-python/joblib[${PYTHON_USEDEP}]
-	=dev-util/hip-6*
-	>=dev-util/rocm-smi-4.3.0
+	dev-util/hip:${SLOT}
+	dev-util/rocm-smi:${SLOT}
 	$(llvm_gen_dep '
 		llvm-core/clang:${LLVM_SLOT}
 	')
diff --git a/dev-util/Tensile/Tensile-6.3.0.ebuild b/dev-util/Tensile/Tensile-6.3.0.ebuild
new file mode 100644
index 000000000000..3e03e4831a55
--- /dev/null
+++ b/dev-util/Tensile/Tensile-6.3.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+DISTUTILS_USE_PEP517=setuptools
+ROCM_VERSION=${PV}
+LLVM_COMPAT=( 19 )
+
+inherit cmake distutils-r1 llvm-r1 prefix rocm
+
+DESCRIPTION="Stretching GPU performance for GEMMs and tensor contractions"
+HOMEPAGE="https://github.com/ROCm/Tensile"
+SRC_URI="https://github.com/ROCm/Tensile/archive/rocm-${PV}.tar.gz -> rocm-Tensile-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="client test"
+REQUIRED_USE="client? ( ${ROCM_REQUIRED_USE} )"
+
+# tests can freeze machine depending on gpu/kernel
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	client? ( dev-libs/boost )
+	>=dev-cpp/msgpack-cxx-6.0.0
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/joblib[${PYTHON_USEDEP}]
+	dev-util/hip:${SLOT}
+	dev-util/rocm-smi:${SLOT}
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/filelock[${PYTHON_USEDEP}]
+		dev-python/joblib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.2-fix-arch-parse.patch
+	"${FILESDIR}"/${PN}-6.3.0-use-ninja.patch
+	"${FILESDIR}"/${PN}-6.1.1-fix-msgpack-dependency.patch
+	"${FILESDIR}"/${PN}-6.0.2-expand-isa-compatibility.patch
+)
+
+CMAKE_USE_DIR="${S}/${PN}/Source"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix),g" \
+		"${FILESDIR}"/${PN}-5.7.1-gentoopath.patch > "${S}"/gentoopath.patch || die
+	eapply $(prefixify_ro "${S}"/gentoopath.patch)
+
+	pushd ${PN} || die
+
+	sed -e "/ROCM_SMI_ROOT/s,lib,$(get_libdir)," \
+		-i Source/cmake/FindROCmSMI.cmake || die
+	sed -r -e "/TENSILE_USE_LLVM/s/ON/OFF/" \
+		-i Source/CMakeLists.txt || die
+
+	# ${Tensile_ROOT}/bin does not exists; call command directly
+	sed -e "s,\${Tensile_ROOT}/bin/,,g" -i cmake/TensileConfig.cmake || die
+
+	local Tensile_share_dir="\"${EPREFIX}/usr/share/${PN}\""
+	sed -e "/HipClangVersion/s/0.0.0/$(hipconfig -v)/" -i Common.py || die
+
+	sed -e "s,os.path.dirname(os.path.realpath(__file__)),${Tensile_share_dir},g" \
+		-i ReplacementKernels.py Common.py ${PN}.py || die
+
+	sed -e "s|os\.path\.dirname.*$|\"${EPREFIX}/usr/share/Tensile/Source\", end='')|" -i __init__.py || die
+
+	popd || die
+
+	sed -e "/package_data/d" -e "/data_files/d" -i setup.py || die
+	use client && PATCHES= cmake_src_prepare  # do not apply patches again in cmake_src_prepare
+}
+
+src_configure() {
+	rocm_use_hipcc
+
+	distutils-r1_src_configure
+	if use client; then
+		local mycmakeargs=(
+			-DCMAKE_SKIP_RPATH=ON
+			-DTENSILE_USE_MSGPACK=ON
+			-DTENSILE_USE_LLVM=ON
+			-DTensile_LIBRARY_FORMAT=msgpack
+			-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		)
+		cmake_src_configure
+	fi
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	use client && cmake_src_compile
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	python_moduleinto Tensile
+	pushd Tensile || die
+	python_domodule Components
+	python_domodule Utilities
+	python_domodule TensileCreateLib
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	pushd ${PN} || die
+	insinto /usr/share/${PN}
+	doins -r Configs Perf Source CustomKernels
+	insinto /usr/$(get_libdir)/cmake/${PN}
+	doins cmake/*.cmake
+
+	if use client; then
+		pushd "${BUILD_DIR}" || die
+		dobin client/tensile_client
+	fi
+}
+
+# Test suite fails to start without this
+python_test() {
+	export ROCM_PATH="${EPREFIX}/usr"
+	epytest
+}
diff --git a/dev-util/Tensile/files/Tensile-6.3.0-use-ninja.patch b/dev-util/Tensile/files/Tensile-6.3.0-use-ninja.patch
new file mode 100644
index 000000000000..ab36761e0e24
--- /dev/null
+++ b/dev-util/Tensile/files/Tensile-6.3.0-use-ninja.patch
@@ -0,0 +1,20 @@
+--- a/Tensile/ClientExecutable.py
++++ b/Tensile/ClientExecutable.py
+@@ -42,7 +42,7 @@ class CMakeEnvironment:
+     def generate(self):
+ 
+         args = ['cmake']
+-        args += ['-G', 'Ninja'] if (os.name == 'nt') else []
++        args += ['-G', 'Ninja']
+         args += itertools.chain.from_iterable([ ['-D{}={}'.format(key, value)] for key,value in self.options.items()])
+         args += [self.sourceDir]
+         args = [cmake_path(arg) for arg in args]
+@@ -59,7 +59,7 @@ class CMakeEnvironment:
+             
+ 
+     def build(self):
+-        args = [('ninja' if (os.name == "nt") else 'make'), f'-j{CPUThreadCount()}']
++        args = ['ninja', f'-j{CPUThreadCount()}']
+         Common.tPrint(3, ' '.join(args))
+         with Common.ClientExecutionLock():
+             # change to use  check_output to force windows cmd block util command finish
diff --git a/dev-util/Tensile/metadata.xml b/dev-util/Tensile/metadata.xml
index 32364cb13b06..a033b1b3e185 100644
--- a/dev-util/Tensile/metadata.xml
+++ b/dev-util/Tensile/metadata.xml
@@ -6,7 +6,7 @@
     <name>Science Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/Tensile</remote-id>
+    <remote-id type="github">ROCm/Tensile</remote-id>
   </upstream>
   <use>
     <flag name="client">Build and install tensile_client executable to run benchmarks and tune GPU GEMM</flag>