summaryrefslogtreecommitdiff
path: root/dev-util/hipcc
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/hipcc')
-rw-r--r--dev-util/hipcc/Manifest6
-rw-r--r--dev-util/hipcc/hipcc-6.0.0.ebuild51
-rw-r--r--dev-util/hipcc/hipcc-6.1.1.ebuild83
-rw-r--r--dev-util/hipcc/metadata.xml6
4 files changed, 91 insertions, 55 deletions
diff --git a/dev-util/hipcc/Manifest b/dev-util/hipcc/Manifest
index 3c95471bd0e7..aadfbc006417 100644
--- a/dev-util/hipcc/Manifest
+++ b/dev-util/hipcc/Manifest
@@ -1,7 +1,7 @@
AUX hipcc-5.7.1-fno-stack-protector.patch 499 BLAKE2B d848b79ad2fd542bc6e6595ebc7dbd240b23aa2903aae31a0583b7beba032d8f4999142b932e9a443415bdb7ae4fe06f9e7da607c402109e3b887fef741d460f SHA512 a115cc8c9779cd318e7806d78a8aa99f03596258f8d3b105231dd6b1f9d3168687c305d1ec1c95902f841bb18570f943d3a655a03504f19a6f6ca7419d9272fd
AUX hipcc-5.7.1-hipcc-hip-version.patch 2245 BLAKE2B 85e41db593706478e92966ee2ee33e1e8c8309251446f14192083a81e35f43be5dfa23337abc8371147b59c9399be79f9461cadf7ba0e025f1355d6c9836d68e SHA512 2cbfdeb9361b38a32ef52dec0c899c7cadc7220a5213fd6e9670c8a9ea6690e80e956d236e0de893bc4fe19117466659bdfdb2e16e720011b7480bc2e8bee458
DIST hipcc-5.7.1.tar.gz 36589 BLAKE2B a8ae6bd9f0f985d78119223b67b5b35b8d1ee38edb7e43c1e77752d203fe2c8b669b3bcff0cec661054d8cb24f799e7784a49eb0664bdd1dc2bf024ce026c175 SHA512 2d232c8dd4a47de6e0cff9d37b4e63a26cb1809ef2ff3a119c15e992cae96ffc2f4d8c1ddffd8732dea3a3d589a93e177f424a6174f982908aa50904e265432a
-DIST hipcc-6.0.0.tar.gz 36648 BLAKE2B d4b67a962e61da5e96423191dad13e90c6aaec890a2b0dccb83ec4b3a9551ed9e2050bdc747fe7c79627d51b62408918157114f954aa579097163af2fc0b06e8 SHA512 e5307c880c96906d216b44b7bb269756e713cf45f5c72fc5dfc31f1e69d8e5e2cc8022bca289dc2b0a1bd72f86ddbdbb29dfda45010d4e4a4fb77096c9c93621
+DIST llvm-project-rocm-6.1.1.tar.gz 196027084 BLAKE2B 3ef0b6e3c47c66fd80289373e6ff8aaff44751f9b380addfae73a18dc388093c0535f230b0cc7528724bc43f6992e2ae6decd3d0d3c700893ca95a6166b7b8dc SHA512 e320d4eeaa6f61ed1cdbf653d67fe887d3ce9dc0d6743b4713502e1cb5318ab8afbe1ee71f8cba07635c54ce532df6683de40ade0e5be4a52e50ce25a9b70818
EBUILD hipcc-5.7.1-r3.ebuild 1168 BLAKE2B 480af07e6feb93e684ff7de07efada9231d43296bfc498267c8d758a25d2690779b7d3bd9f872290f86a8621fa1e519d37d0712200ac0a2cb57c915942b2b3e0 SHA512 c3c3abb00fee6fcc593df78dad13b5ec8a144ed92439942512c67d9fb369dec7f8fa055075a0121a3b08823e236560d256741b1243fb14a3e643cda929f90650
-EBUILD hipcc-6.0.0.ebuild 1254 BLAKE2B 717f472afefd65ffc96a22b9f0701edd35c18df2d2cdc782ff5786c7c04d97f16c1c566b43d787f2555fd99fb3167541c85b531af5200bf2b810fdb185403582 SHA512 d9d043e58856cd1b4e64505d165fa40b15f95e8b4dde1c4966cc2d55257fbb42fb160bf09004b91dde747286839d8668149f1270a3880230646afd2a5133a4de
-MISC metadata.xml 845 BLAKE2B 108a9ee40f02d5e190f4d1ee11eea32aaec844c63811265d52046bdb266f6cddfb1774419feace41aaa2bacfd01581847f655aa5fc49536968c54e7f023d49ae SHA512 2b7bbe1205b4a07b81e6c0f4cc2c224a573a03004ce808b4d1ef51ea1b0bec770545b7c46530a1b18222cd67854f790ae44695dd39ef2201d7f3e3ea3ada904f
+EBUILD hipcc-6.1.1.ebuild 2024 BLAKE2B 9cad5c85c2795a692878aa46b3b578e518e4ed8f2443d55d62408c16e0b3561417d34939dd52f26980f8fabf04b7d70ec53263fe47710bcff3b51eb8163609b5 SHA512 b09ef0e288403be4beaecd59d41a3c44e17c3543b3ff3f9fe59e4a7de44d54fca98d82fb5c12c834fa2246e301ac4d137e7bb54558a5a4b79a8578c82f4cd12b
+MISC metadata.xml 942 BLAKE2B 56fe9d0c0615796d69d11ced9aa54834f9e3cb649786cc117bb2628086be15e1bc2dfb8e96fc93a043603ab34abec04a8bb1592b101444ea077ba0d73e55c374 SHA512 84bac9774f2d0dfec093c0269fe76662dc12a44fa3d4861152c6a076165d44af399cdcb134bea93d094b9b9d0094bec6ba72f6f81ad29b7467ce5262348ba263
diff --git a/dev-util/hipcc/hipcc-6.0.0.ebuild b/dev-util/hipcc/hipcc-6.0.0.ebuild
deleted file mode 100644
index 088297598782..000000000000
--- a/dev-util/hipcc/hipcc-6.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake llvm
-
-LLVM_MAX_SLOT=17
-
-DESCRIPTION="Radeon Open Compute hipcc"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipcc"
-
-KEYWORDS="~amd64"
-SRC_URI="https://github.com/ROCm-Developer-Tools/hipcc/archive/refs/tags/rocm-${PV}.tar.gz -> hipcc-${PV}.tar.gz"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/HIPCC-rocm-${PV}
-
-DEPEND="<sys-devel/llvm-18:=
- <sys-devel/clang-18:=
- "
-RDEPEND="${DEPEND}
- !<dev-util/hip-5.7"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.7.1-fno-stack-protector.patch"
- "${FILESDIR}/${PN}-5.7.1-hipcc-hip-version.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
-
- sed -e "s:\$ROCM_PATH/llvm/bin:$(get_llvm_prefix ${LLVM_MAX_SLOT})/bin:" \
- -i bin/hipvars.pm || die
-
- sed -e "s:\$ENV{'DEVICE_LIB_PATH'}:'${EPREFIX}/usr/lib/amdgcn/bitcode':" \
- -e "s:\$ENV{'HIP_LIB_PATH'}:'${EPREFIX}/usr/$(get_libdir)':" \
- -e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \
- -e 's:${ROCM_PATH}/usr/bin/rocm_agent_enumerator:/usr/bin/rocm_agent_enumerator:' \
- -i bin/hipcc.pl || die
-}
-
-src_install() {
- cmake_src_install
- # rm unwanted copy
- rm -rf "${ED}/usr/hip" || die
-}
diff --git a/dev-util/hipcc/hipcc-6.1.1.ebuild b/dev-util/hipcc/hipcc-6.1.1.ebuild
new file mode 100644
index 000000000000..87a19b598953
--- /dev/null
+++ b/dev-util/hipcc/hipcc-6.1.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 )
+inherit cmake perl-functions llvm-r1
+
+DESCRIPTION="Radeon Open Compute hipcc"
+HOMEPAGE="https://github.com/ROCm/hipcc"
+
+MY_P=llvm-project-rocm-${PV}
+components=( "amd/hipcc" )
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/ROCm/llvm-project"
+ inherit git-r3
+ S="${WORKDIR}/${P}/${components[0]}"
+else
+ SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz"
+ S="${WORKDIR}/${MY_P}/${components[0]}"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ $(llvm_gen_dep '
+ sys-libs/compiler-rt:${LLVM_SLOT}=
+ sys-devel/llvm:${LLVM_SLOT}=
+ sys-devel/clang:${LLVM_SLOT}=
+ ')
+"
+RDEPEND="${DEPEND}
+ !<dev-util/hip-5.7"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.7.1-hipcc-hip-version.patch"
+)
+
+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() {
+ cmake_src_prepare
+
+ sed -e "s:\$ROCM_PATH/llvm/bin:$(get_llvm_prefix)/bin:" \
+ -e "s:/opt/rocm:/usr:" \
+ -i bin/hipvars.pm || die
+
+ sed -e "s:\$ENV{'DEVICE_LIB_PATH'}:'${EPREFIX}/usr/lib/amdgcn/bitcode':" \
+ -e "s:\$ENV{'HIP_LIB_PATH'}:'${EPREFIX}/usr/$(get_libdir)':" \
+ -e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \
+ -i bin/hipcc.pl || die
+
+ # With Clang>17 -amdgpu-early-inline-all=true causes OOMs in dependencies
+ # https://github.com/llvm/llvm-project/issues/86332
+ if [ "$LLVM_SLOT" != "17" ]; then
+ sed -e "s/-mllvm -amdgpu-early-inline-all=true //g" -i bin/hipcc.pl || die
+ fi
+}
+
+src_install() {
+ cmake_src_install
+ # rm unwanted copy
+ rm -rf "${ED}/usr/hip" || die
+ # Handle hipvars.pm
+ rm "${ED}/usr/bin/hipvars.pm" || die
+ perl_domodule "${S}"/bin/hipvars.pm
+}
diff --git a/dev-util/hipcc/metadata.xml b/dev-util/hipcc/metadata.xml
index d280423bad96..b6d25312b735 100644
--- a/dev-util/hipcc/metadata.xml
+++ b/dev-util/hipcc/metadata.xml
@@ -21,7 +21,11 @@
<email>gentoo@holzke.net</email>
<name>Wilfried Holzke</name>
</maintainer>
+ <maintainer type="person">
+ <email>lockalsash@gmail.com</email>
+ <name>Sv. Lockal</name>
+ </maintainer>
<upstream>
- <remote-id type="github">ROCm-Developer-Tools/hipcc</remote-id>
+ <remote-id type="github">ROCm/hipcc</remote-id>
</upstream>
</pkgmetadata>