commit: a9f94df74ad20ba69681fe30c59d62f1e962defe
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 1 07:52:24 2024 +0000
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Sun Dec 1 07:57:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9f94df7
dev-libs/rocm-comgr: add 6.2.4
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>
dev-libs/rocm-comgr/Manifest | 1 +
.../files/rocm-comgr-6.2.2-missing-isa.patch | 9 +++
dev-libs/rocm-comgr/rocm-comgr-6.2.4.ebuild | 87 ++++++++++++++++++++++
3 files changed, 97 insertions(+)
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index 47b6dae79587..aefb0b28d727 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -1,5 +1,6 @@
DIST llvm-project-rocm-6.1.1.tar.gz 196027084 BLAKE2B
3ef0b6e3c47c66fd80289373e6ff8aaff44751f9b380addfae73a18dc388093c0535f230b0cc7528724bc43f6992e2ae6decd3d0d3c700893ca95a6166b7b8dc
SHA512
e320d4eeaa6f61ed1cdbf653d67fe887d3ce9dc0d6743b4713502e1cb5318ab8afbe1ee71f8cba07635c54ce532df6683de40ade0e5be4a52e50ce25a9b70818
DIST llvm-project-rocm-6.1.2.tar.gz 195992927 BLAKE2B
d821f29f2f1f7c1ff414c63a710281f16d2a394b21f3365d01b86710cc09ed27e514b49fb744bf6a36b38815afa56cc26d44f0238f38479a0c2db9bf9989f389
SHA512
5f7e5dbe5976141de35e96e603624bd9d5a2c08b0690ba9fcd81d1b32f540f94bb9f4b74539e2838fd60ae1312dbe5e0b429ba80a03871782cdf3bd834940ce0
+DIST llvm-project-rocm-6.2.4.tar.gz 206742705 BLAKE2B
e4d40c900b56a3d31003295c517fcb8fdc5cb0954f298d541d545c6d142746eecfa70a44bfdcb9044d70284f15af612c27dbd55d51e94e638e03bf21c1d3bc06
SHA512
5c5784c318c607168c9d2227ce1150e92fdc6aa457a9e64d62745a70f6fce92c4d4b1202422940f1ccc37a4bccf1efb220d8be39ec2ffdba7591d17e54ec8a5f
DIST rocm-comgr-5.1.3.tar.gz 117155 BLAKE2B
40e415c4c7ae3e709dd50981299291f0fc1133f35310b4c86a86847d3bce5fd7685a3f4480f8f156873ca922921c1d4e1cb620fd33bd5cdc87f155af839f2bbe
SHA512
5927250f5e03c32b7f270a1dbfe5221d349dfe32aba34143040da53d4e7eb83faa3073a43edabcff13e1fc977bc17088404523f2ab2ea95e207d2c00beb4249b
DIST rocm-comgr-5.3.3.tar.gz 120414 BLAKE2B
29b9d466d74ef94165a2b9bea35eac4616f6b2fc529cdac3c830ee7dc08f219cb9e5d4f081658881c76633f12eaebb74d1a2ea30a76652231b8ee516f9988db1
SHA512
ba7b1ef214e3624168e438ed7fd94291a07508fe89d178c0b158bf22e0998d5a8e4d8f0a7f08f05ac108ef65f725db5764fd66353a85bc25000e572a4fdcb61f
DIST rocm-comgr-5.4.3.tar.gz 120461 BLAKE2B
c4eb79dd5a72a2b18e16841fc8cb9a3a33efb0c7b04a7585df9672d682bba6fa826ab8b37dba5febca3b8c5ee5aca30d8546e1fa69e77671e5c750e2a8c1f12f
SHA512
1a25af99a0166d70ca6dc5df5a667068eaf583dccd74bbb18a2a5de3c1b769e0c1eb9a0c539e0cd88bc50bbbe53214a1d1b23fbdfd6fc5b6507c44da259815c4
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.2.2-missing-isa.patch
b/dev-libs/rocm-comgr/files/rocm-comgr-6.2.2-missing-isa.patch
new file mode 100644
index 000000000000..ea8e3ee1eabf
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-6.2.2-missing-isa.patch
@@ -0,0 +1,9 @@
+--- a/src/comgr-isa-metadata.def 2024-10-14 13:40:22.023251450 -0000
++++ b/src/comgr-isa-metadata.def 2024-10-14 13:40:31.949824212 -0000
+@@ -89,7 +89,6 @@
+ HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx1103", false, false,
EF_AMDGPU_MACH_AMDGCN_GFX1103, true, 65536, 32, 4, 40, 1024, 106, 800,
106, 16, 1024, 256)
+ HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx1150", false, false,
EF_AMDGPU_MACH_AMDGCN_GFX1150, true, 65536, 32, 4, 40, 1024, 106, 800,
106, 16, 1024, 256)
+ HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx1151", false, false,
EF_AMDGPU_MACH_AMDGCN_GFX1151, true, 65536, 32, 4, 40, 1024, 106, 800,
106, 24, 1536, 256)
+-HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx1152", false, false,
EF_AMDGPU_MACH_AMDGCN_GFX1152, true, 65536, 32, 4, 40, 1024, 106, 800,
106, 16, 1024, 256)
+ HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx1200", false, false,
EF_AMDGPU_MACH_AMDGCN_GFX1200, true, 65536, 32, 4, 40, 1024, 106, 800,
106, 24, 1536, 256)
+ HANDLE_ISA("amdgcn-amd-amdhsa-", "gfx1201", false, false,
EF_AMDGPU_MACH_AMDGCN_GFX1201, true, 65536, 32, 4, 40, 1024, 106, 800,
106, 24, 1536, 256)
diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.2.4.ebuild
b/dev-libs/rocm-comgr/rocm-comgr-6.2.4.ebuild
new file mode 100644
index 000000000000..9ce716803fc1
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-6.2.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 )
+
+inherit cmake llvm-r1 prefix
+
+MY_P=llvm-project-rocm-${PV}
+components=( "amd/comgr" )
+
+DESCRIPTION="Radeon Open Compute Code Object Manager"
+HOMEPAGE="https://github.com/ROCm/ROCm-CompilerSupport";
+SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz ->
${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}/${components[0]}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.1.3-rocm-path.patch"
+
"${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch"
+ "${FILESDIR}/${PN}-6.0.0-extend-isa-compatibility-check.patch"
+ "${FILESDIR}/${PN}-6.1.0-enforce-oop-compiler.patch"
+ "${FILESDIR}/${PN}-6.1.0-fix-comgr-default-flags.patch"
+ "${FILESDIR}/${PN}-6.1.0-dont-add-nogpulib.patch"
+ "${FILESDIR}/${PN}-6.2.2-missing-isa.patch"
+)
+
+RDEPEND=">=dev-libs/rocm-device-libs-${PV}
+ sys-devel/clang-runtime:=
+ $(llvm_gen_dep '
+ sys-devel/clang:${LLVM_SLOT}=
+ sys-devel/lld:${LLVM_SLOT}=
+ ')
+ dev-util/hipcc:${SLOT}
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_BUILD_TYPE=Release
+
+src_unpack() {
+ if [[ ${PV} == *9999 ]] ; then
+ git-r3_fetch
+ git-r3_checkout '' . '' "${components[@]}"
+ else
+ archive="${MY_P}.tar.gz"
+ ebegin "Unpacking from ${archive}"
+ tar -x -z -o \
+ -f "${DISTDIR}/${archive}" \
+ "${components[@]/#/${MY_P}/}" || die
+ eend ${?}
+ fi
+}
+
+src_prepare() {
+ sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die
+ sed "/return
LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix)\")," -i
src/comgr-env.cpp || die
+ eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch)
+
+ cmake_src_prepare
+
+ # Replace @CLANG_RESOURCE_DIR@ in patches
+ local CLANG_RESOURCE_DIR="$("$(get_llvm_prefix)"/bin/clang
-print-resource-dir)"
+ sed "s,@CLANG_RESOURCE_DIR@,\"${CLANG_RESOURCE_DIR}\"," -i
src/comgr-compiler.cpp || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DLLVM_DIR="$(get_llvm_prefix)"
+ -DCMAKE_STRIP="" # disable stripping defined at
lib/comgr/CMakeLists.txt:58
+ -DBUILD_TESTING=$(usex test ON OFF)
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ local CMAKE_SKIP_TESTS=(
+ comgr_nested_kernel_test # See
https://github.com/ROCm/llvm-project/issues/35
+ )
+ cmake_src_test
+}
