gentoo auto-resync : 22:09:2022 - 05:27:18

5 files changed, 166 insertions, 2 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 939ff055face..17f1dbbff1bf 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest
index 29f82f60a0c9..b980919c1f12 100644
--- a/dev-util/Tensile/Manifest
+++ b/dev-util/Tensile/Manifest
@@ -9,9 +9,12 @@ AUX Tensile-5.0.2-fix-arch-parse.patch 424 BLAKE2B 43e716ccc9256c2f98cc1d2807e77
 AUX Tensile-5.0.2-gentoopath.patch 3410 BLAKE2B bbf2c406bbcf2c34efd04667788719f6f10aebda3f9d9096e6798c1a8924768df4fed30223e2f4675af88c41841d148e43e3cd63edc7523dab4618ae245b0339 SHA512 c7b99eab1f0c979f54fcac3b2dcb4a2094b9a536bb392fcf4fb62050b1dc6e61f5280d3d1c7e3ed21617ebe693a17eb2bb7535a93f700123fe6aa6f28f256514
 AUX Tensile-5.0.2-gfx1031.patch 5561 BLAKE2B 244bb644a90ba34f500f4d0cc634acf041cce42f9a5a9f10ee7bd1feff3b78b626b56f3b8cfa4005cc422ef643cd60a7da954618ff9f8f460568ff4b011136bc SHA512 1cd1dd95e481a76fde21dd09aac1ac02f1372e552eeb45eb100dc970639e28f52a709735aca6480d2286b8c747a75435aa7f2e2a288ffe2a596d6f75e4bd17ec
 AUX Tensile-5.0.2-use-ninja.patch 897 BLAKE2B f06a3831a43a4b6c00e7eb231cc13901f7b4a3a924a50d85ba81f9def535951c450a01504506476c1ee88317cbdf0c0c00a57cb5cd198ab44e8e0b94aefda25d SHA512 15404d3cd5dbc7b74e81092d86f9c49cd45fe4df645602849ff515baafa3890fd68ca808cbebd6ae37e951b382ff4446a31089306c950f8549431dfbe75c3b53
+AUX Tensile-5.1.3-gentoopath.patch 3350 BLAKE2B 890ab24fbd99aede187bde67c8d6f586f625c30cff34da39e12b199b022170de8df3087c3581f9e635d5d12f31db0aa944a2628733417322621ab51b0292b01b SHA512 d17a948146e7ef2447ae92b2822f53cd77b0992297fd2a43598434db4f7c2095d269138ce5c0eedda73a34e193fc56401f22471f9eca68ec6026577f07a7fca1
 DIST Tensile-5.0.2-PR1419.patch.gz 43754 BLAKE2B 3b1d7333ed0115f77816806e7735e25d897dbae3f7a40ece61d655c8f016d9d1c804b586b4e0e75661e20c517f5937a61d5ead25a545f0ce2e4a178bcbb3e7be SHA512 0154d8e14d335f4ecd86e5db335289f8662cede7e5d4b93bf6c56d8e48c1d7d0457271c078c9abbbca1f4aa91f028f6ce6a89efb783ba0207d0f39fd5de8a42c
 DIST rocm-Tensile-4.3.0.tar.gz 14250149 BLAKE2B 030138eaca2a0aadd96801e6dbd72e510716dd90553ef3795c5e04e00a34a05ecae82b24f755e4033a4acfcdb1cf26291da1e7902bb090f89a010d403e832beb SHA512 126db0b413c716fba8d5be9bff7a44fd1badacbf32f3db8d0db649819177db37ebd56fd22dd3c809655f5d29675be115e698cd10bc3d0b4b23878ae3726fce47
 DIST rocm-Tensile-5.0.2.tar.gz 14362090 BLAKE2B d44c3135496db41c4eb2545f6054c84493e89ef6357da881dae6859763338417e7a9e142cdce7e2de0536684bb641049ad0440964adbe68d03ca329f01efabc9 SHA512 f5ab7d7cbc5ba25498a02a6b7c07d5a9a548edcd44b439b92c8718072382adc18ae78274db1a7174e06436ac1396f3b4edafc7f491a2c87086c368e7270e64e3
+DIST rocm-Tensile-5.1.3.tar.gz 14357517 BLAKE2B 7c5881cc2b1d25db39f54a99f9f0a08395a5f7a58deebe74d9868e8f7044db5ae2f3907196adf16dc6abeba0f1f47f5cce5c8900891276daff8e4ad614cf3b94 SHA512 4405cb6de65c1da1fd93910fc901402a24e996ff04eccadf483c25d8eb518e03ea9bbf00e372dd5fe377696e71c39355603095f3c5fc1e26d311ed15d8e3b734
 EBUILD Tensile-4.3.0-r1.ebuild 2764 BLAKE2B e24ddb516d8dfd9e5e691f567f5b97b279e518b38be49a2cc69e8eae100d4d2ce7dc1432247c0bd5c94656ff1a7faf88a8e8f2e8df3dbbbc491eb4323cc20706 SHA512 79859e7dd5647bc4c1eb766faa9b3116994ed74aeb900caaf1b524a1216dcadd8d0c608d097a0c4c1d51b3117b75ccf7a061b7624cad6390fd5ce37494d67987
-EBUILD Tensile-5.0.2-r2.ebuild 2634 BLAKE2B a54c9ec8c4876585f8b807da04ea4d92ae2905dae86dfd7f5202bbfa02d492158c5364e6136e1b1a9990a2c37ad0171096da429074734b3a101ff483e4e7794a SHA512 14ae5bfd4490453123bc271ddbbfc329cbb6b271ee719c696318befb97592d06b502a8105c1764a8e15bc99ad3da254b28997fa458a90b7c57afc064320fd31a
+EBUILD Tensile-5.0.2-r2.ebuild 2634 BLAKE2B f1360a69a7bba99f0abacc39d3a967626512317426c527d48c119c10a3da8adf49478e59bc6b3a8a37730b2c9ab073e6d7665e4ef7f25992a6741cc869306e23 SHA512 0ac3f2512c6555adc64797ed1ec26e072fe3ebe374251ed7771b5690f7039964bbf6616cb79b0cc8f0a3eec9efc9e90f96eea0ae138738fb1a7cd3c1e36ead35
+EBUILD Tensile-5.1.3.ebuild 2736 BLAKE2B 54f93e12d4687a88e58231a8367608c2feea6d2fdb65e4e0b601fe03f0ba9d36219a054c8bf3d2de4a0a98520d49cc840b25559290c32a06f26b0eac938d8c3d SHA512 a500e803bdc930d998fc823270205a6bf9654e013fa43cbd1a79a4a98b86acca9844b3a18ab2de6b109c6df4ee4202e5432db6b50196264c757413e5663d7f1a
 MISC metadata.xml 350 BLAKE2B f621bb03aafc000672f022db9cad9a1fed65b912129d26ed7e717ba8e5cfb11f0d6b309905b6e12b07993a7aa0cbebf18aeaf92d643eff5419d765e31b3c52a7 SHA512 99b497edddaaf6d84159df959fb8b0a5d18ea0ecc879d600a2a1fc004554612e1422b258a2f7c5f73148caca93f9283481b53669f7247d62782401fdb112f69e
diff --git a/dev-util/Tensile/Tensile-5.0.2-r2.ebuild b/dev-util/Tensile/Tensile-5.0.2-r2.ebuild
index 38854fd0c269..22d3a6cee451 100644
--- a/dev-util/Tensile/Tensile-5.0.2-r2.ebuild
+++ b/dev-util/Tensile/Tensile-5.0.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 prefix
 
diff --git a/dev-util/Tensile/Tensile-5.1.3.ebuild b/dev-util/Tensile/Tensile-5.1.3.ebuild
new file mode 100644
index 000000000000..f2a39a52dbbb
--- /dev/null
+++ b/dev-util/Tensile/Tensile-5.1.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 llvm prefix
+
+LLVM_MAX_SLOT=14
+
+DESCRIPTION="Stretching GPU performance for GEMMs and tensor contractions"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/Tensile"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-${PV}.tar.gz -> rocm-Tensile-${PV}.tar.gz
+		https://github.com/littlewu2508/littlewu2508.github.io/raw/main/gentoo-distfiles/${PN}-5.0.2-PR1419.patch.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+
+# Not compatible with recent versions of pytest
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	>=dev-util/rocm-smi-4.3.0
+	>=sys-devel/clang-14.0.6-r1:${LLVM_MAX_SLOT}=
+"
+DEPEND="${RDEPEND}
+	dev-util/hip
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch
+		  "${FILESDIR}"/${PN}-5.0.2-gfx1031.patch
+		  "${FILESDIR}"/${PN}-5.0.2-fix-arch-parse.patch
+		  "${FILESDIR}"/${PN}-5.0.2-use-ninja.patch
+	  )
+
+CMAKE_USE_DIR="${WORKDIR}/Source"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix ${LLVM_MAX_SLOT}),g" "${FILESDIR}"/${PN}-5.1.3-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
+	sed -e "/chmod 755/d" -i Source/TensileCreateLibrary.cmake || die # remove chmod 755 on
+	sed -e "s,\${Tensile_ROOT}/bin/,,g" -i Source/TensileCreateLibrary.cmake cmake/TensileConfig.cmake || die # ${Tensile_ROOT}/bin does not exists; call command directly
+
+	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
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	python_moduleinto Tensile
+	pushd Tensile || die
+	python_domodule Components
+	python_newexe Utilities/merge.py ${PN}-merge
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	pushd ${PN} || die
+	insinto /usr/share/${PN}
+	doins -r Configs Perf ReplacementKernels ReplacementKernels-cov3 Source CustomKernels
+	insinto /usr/$(get_libdir)/cmake/${PN}
+	doins cmake/*.cmake
+}
diff --git a/dev-util/Tensile/files/Tensile-5.1.3-gentoopath.patch b/dev-util/Tensile/files/Tensile-5.1.3-gentoopath.patch
new file mode 100644
index 000000000000..2f41bf3aa715
--- /dev/null
+++ b/dev-util/Tensile/files/Tensile-5.1.3-gentoopath.patch
@@ -0,0 +1,75 @@
+Fix incorrect path in scripts and CMakeLists, in order to build tensile_client 
+===================================================================
+--- Tensile-rocm-5.0.2.orig/Tensile/Source/client/CMakeLists.txt
++++ Tensile-rocm-5.0.2/Tensile/Source/client/CMakeLists.txt
+@@ -56,3 +56,5 @@ endif()
+ foreach(arch IN LISTS TENSILE_GPU_ARCHS)
+     target_link_libraries(tensile_client PRIVATE "--amdgpu-target=${arch}")
+ endforeach(arch)
++
++target_link_libraries(tensile_client PRIVATE LLVMSupport)
+Index: Tensile-rocm-5.0.2/Tensile/Source/lib/CMakeLists.txt
+===================================================================
+--- Tensile-rocm-5.0.2.orig/Tensile/Source/lib/CMakeLists.txt
++++ Tensile-rocm-5.0.2/Tensile/Source/lib/CMakeLists.txt
+@@ -47,7 +47,7 @@ set(tensile_sources  ${tensile_sources}
+     )
+ 
+ if(TENSILE_USE_LLVM)
+-    find_package(LLVM 13.0 QUIET CONFIG)
++    find_package(LLVM PATHS @LLVM_PATH@ QUIET CONFIG)
+     if(NOT LLVM_FOUND)
+         find_package(LLVM 12.0 QUIET CONFIG)
+         if(NOT LLVM_FOUND)
+Index: Tensile-rocm-5.0.2/Tensile/Common.py
+===================================================================
+--- Tensile-rocm-5.0.2.orig/Tensile/Common.py
++++ Tensile-rocm-5.0.2/Tensile/Common.py
+@@ -1873,7 +1873,7 @@ def assignGlobalParameters( config ):
+     else:
+       print2(" %24s: %8s (unspecified)" % (key, defaultValue))
+ 
+-  globalParameters["ROCmPath"] = "/opt/rocm"
++  globalParameters["ROCmPath"] = "@GENTOO_PORTAGE_EPREFIX@/usr"
+   if "ROCM_PATH" in os.environ:
+     globalParameters["ROCmPath"] = os.environ.get("ROCM_PATH")
+   if "TENSILE_ROCM_PATH" in os.environ:
+Index: Tensile-rocm-5.0.2/Tensile/ClientWriter.py
+===================================================================
+--- Tensile-rocm-5.0.2.orig/Tensile/ClientWriter.py
++++ Tensile-rocm-5.0.2/Tensile/ClientWriter.py
+@@ -205,7 +205,7 @@ def getBuildClientLibraryScript(buildPat
+   import io
+   runScriptFile = io.StringIO()
+ 
+-  callCreateLibraryCmd = globalParameters["ScriptPath"] + "/bin/TensileCreateLibrary"
++  callCreateLibraryCmd = "TensileCreateLibrary"
+ 
+ 
+   if globalParameters["MergeFiles"]:
+Index: Tensile-rocm-5.0.2/Tensile/GenerateSummations.py
+===================================================================
+--- Tensile-rocm-5.0.2.orig/Tensile/GenerateSummations.py
++++ Tensile-rocm-5.0.2/Tensile/GenerateSummations.py
+@@ -57,7 +57,7 @@ def createLibraryForBenchmark(logicPath,
+     Selection.
+     """
+ 
+-    pythonExePath = os.path.join(os.path.dirname(os.path.realpath(__file__)), "bin", "TensileCreateLibrary")
++    pythonExePath = "TensileCreateLibrary"
+     args = [pythonExePath, \
+         "--merge-files", "--new-client-only", "--no-short-file-names", "--no-library-print-debug", \
+         "--architecture=all", "--code-object-version=V3", "--cxx-compiler=hipcc", "--library-format=yaml", \
+Index: Tensile-rocm-5.0.2/HostLibraryTests/CMakeLists.txt
+===================================================================
+--- Tensile-rocm-5.0.2.orig/HostLibraryTests/CMakeLists.txt
++++ Tensile-rocm-5.0.2/HostLibraryTests/CMakeLists.txt
+@@ -135,7 +135,7 @@ set(test_sources ${test_sources}
+ )
+ 
+ if(TENSILE_USE_LLVM)
+-    find_package(LLVM 13.0 QUIET CONFIG)
++    find_package(LLVM PATHS @LLVM_PATH@ QUIET CONFIG)
+     if(NOT LLVM_FOUND)
+         find_package(LLVM 12.0 QUIET CONFIG)
+         if(NOT LLVM_FOUND)