From 0d3219165e816e09207a0e1b5b5c8ad764228615 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Jul 2023 22:12:15 +0100 Subject: gentoo auto-resync : 05:07:2023 - 22:12:15 --- dev-libs/Manifest.gz | Bin 97916 -> 97909 bytes dev-libs/libclc/Manifest | 2 + dev-libs/libclc/libclc-17.0.0_pre20230705.ebuild | 88 ++++++++++++++ dev-libs/rocm-opencl-runtime/Manifest | 8 +- .../rocm-opencl-runtime-5.1.3.ebuild | 3 +- .../rocm-opencl-runtime-5.3.3-r1.ebuild | 3 +- .../rocm-opencl-runtime-5.4.3-r1.ebuild | 133 +++++++++++++++++++++ .../rocm-opencl-runtime-5.4.3.ebuild | 130 -------------------- .../rocm-opencl-runtime-9999.ebuild | 3 +- 9 files changed, 233 insertions(+), 137 deletions(-) create mode 100644 dev-libs/libclc/libclc-17.0.0_pre20230705.ebuild create mode 100644 dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.4.3-r1.ebuild delete mode 100644 dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.4.3.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index e269f196e7cd..950af67fde37 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest index 8d56f7382dd0..e86f26e3bfb6 100644 --- a/dev-libs/libclc/Manifest +++ b/dev-libs/libclc/Manifest @@ -6,6 +6,7 @@ DIST llvm-project-16.0.5.src.tar.xz 118000368 BLAKE2B 9f84e6bab450dc8d6379771afb DIST llvm-project-16.0.5.src.tar.xz.sig 566 BLAKE2B 4c96f294f350e0086f8504a54c3387308c60efb573c8def40aec45b1918d43e36c44bafb0823625b6cefa5d99b3aacd7823d6c92c7a64a737653d5b51839a924 SHA512 4550c7c6a1b6ea603d1499aba5aca746f3948a00e7567604f5e7dc3b215a34357bad382a7ebea1f6cd7952841cb75a0dfbe2c278a8c6fcb630a5035b3e16e869 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447 +DIST llvm-project-5ae7fde004cbc640c2f60207791ac36574e5f5c6.tar.gz 193410766 BLAKE2B 50287f1ad41a895040934f8f19fd8aa2e91065b930ab14125dbbc3977273655d11482b6229577c11a8ad2bdd854ca109449b603bbc2e30cee20e95e4fe11e8b7 SHA512 f24f7a3b0661d2d4533b24c295c114817aff22c8f1d473ffa639cee547d31502719f8e1be4f25b970d450ecb9dcaa809c0e12b1bb380774f52cda82a4769d7bc DIST llvm-project-d32fb5e5f51dedba495301073b9250f84ac6d8a8.tar.gz 193280254 BLAKE2B 31473bee900caa45c816a020113d7b6bf6e6e2db4848fa529bc622fbf2956487ab89b04d1624e7e1530e9aa56293361e01b9fde31912b2a08194398a11db8b63 SHA512 5799e106403a3954767afafac515112ec9f6505c02abb502e21a5d7019e1079912939803e95177d91678d2e28e07a12b33ceabb13e90696da13a3613a16f2396 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B b355a93d63ee4beb5f3782cda8514aa02f16e71563f66bac6fc7a5e3beae40efa1bdbe098f3d83ce775d0458118f19fceb7225f2b5511823c8e56cabdae4f2d8 SHA512 488e5c278fe4b48ec8ce6ccd76d489cf08251ce6e8f8bd417048a80a10e4a5cf72f20462aa8115f72afe1a40dbee02d936680d516dd1c940fd52fe6f55402e69 EBUILD libclc-15.0.7.ebuild 1668 BLAKE2B ac2bd589fb3c29662799f97b1f649fd22b1b7ce5701879815bc01a05ae88421a830a6a3507b4dead181f24eb4e45c451e8ea1ebbdac2a2de51ddbc3cd9f53c66 SHA512 a3e39fbaddb322360f6362ef21713f375d04e02b2b9a3d43a3d47b26d5d43643a8c654181aef9518aee5f9805d09c446bbbf13342b74f09622e5e1b0c59470b1 @@ -13,4 +14,5 @@ EBUILD libclc-16.0.5.ebuild 1665 BLAKE2B 2bb69cd706b29f82ddddcd1922b005f8eb8387d EBUILD libclc-16.0.6.ebuild 1667 BLAKE2B 714254d0db0a169ec48f82b0961f67de530d5698fe1ef72f04b40c2ae9cf94ecde2091c331c6662aa2ee0be776a9f08fdeb24c8f8021b92108e57f1e91eb04f0 SHA512 cf7be556c5b83c5be2f8051a6711a38c74c43bbf5d5c17f860b9e7d8eae4d4d1ee14a85461481949c7519aae1f9b9f029aab5bfb3e75e936b46923131fa110f2 EBUILD libclc-17.0.0.9999.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a EBUILD libclc-17.0.0_pre20230630.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a +EBUILD libclc-17.0.0_pre20230705.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a MISC metadata.xml 362 BLAKE2B 768f93d0058e4da4b420569f3f1771dfa7385ad89540bbc18cf53b5a71e3f060a8afa1112ff37570d7fc9dc3e71619fa3fd8d0cf7b5d3954f5110b19e146df30 SHA512 e6335424da09f668953acd39dcd9b03a30e3b509b34b1de5c72644a3740a5b6b287f10e08405b79bafc8104cc4dc1324b7b9d7990c3b560b0235ae82da8c68a5 diff --git a/dev-libs/libclc/libclc-17.0.0_pre20230705.ebuild b/dev-libs/libclc/libclc-17.0.0_pre20230705.ebuild new file mode 100644 index 000000000000..117d489acdec --- /dev/null +++ b/dev-libs/libclc/libclc-17.0.0_pre20230705.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake llvm llvm.org python-any-r1 + +DESCRIPTION="OpenCL C library" +HOMEPAGE="https://libclc.llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )" +SLOT="0" +KEYWORDS="" +IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi" + +LLVM_MAX_SLOT=17 +BDEPEND=" + ${PYTHON_DEPS} + || ( + ( + sys-devel/clang:17 + spirv? ( dev-util/spirv-llvm-translator:17 ) + ) + ( + sys-devel/clang:16 + spirv? ( dev-util/spirv-llvm-translator:16 ) + ) + ( + sys-devel/clang:15 + spirv? ( dev-util/spirv-llvm-translator:15 ) + ) + ( + sys-devel/clang:14 + spirv? ( dev-util/spirv-llvm-translator:14 ) + ) + ( + sys-devel/clang:13 + spirv? ( dev-util/spirv-llvm-translator:13 ) + ) + ) +" + +LLVM_COMPONENTS=( libclc ) +llvm.org_set_globals + +llvm_check_deps() { + if use spirv; then + has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" || + return 1 + fi + has_version -b "sys-devel/clang:${LLVM_SLOT}" +} + +pkg_setup() { + llvm_pkg_setup + python-any-r1_pkg_setup +} + +src_configure() { + local libclc_targets=() + + use spirv && libclc_targets+=( + "spirv-mesa3d-" + "spirv64-mesa3d-" + ) + use video_cards_nvidia && libclc_targets+=( + "nvptx--" + "nvptx64--" + "nvptx--nvidiacl" + "nvptx64--nvidiacl" + ) + use video_cards_r600 && libclc_targets+=( + "r600--" + ) + use video_cards_radeonsi && libclc_targets+=( + "amdgcn--" + "amdgcn-mesa-mesa3d" + "amdgcn--amdhsa" + ) + [[ ${#libclc_targets[@]} ]] || die "libclc target missing!" + + libclc_targets=${libclc_targets[*]} + local mycmakeargs=( + -DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}" + ) + cmake_src_configure +} diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest index fb2754d9085c..6eeacfd4fd48 100644 --- a/dev-libs/rocm-opencl-runtime/Manifest +++ b/dev-libs/rocm-opencl-runtime/Manifest @@ -10,8 +10,8 @@ DIST rocclr-5.4.3.tar.gz 640557 BLAKE2B 9ab91bab7ffb06c9c0d1c2ae79533fccc597071d DIST rocm-opencl-runtime-5.1.3.tar.gz 1004765 BLAKE2B 64d9b42026d2be1d0e4aa666785699f6b4ec0584a927904a94bf830883050943503f8bdd7c97438a2fb11c71686a330d526f633959916c5c6c8da2e037841e79 SHA512 b83c3ae0bfad80f867bacce36710a8964f6dd7e64bf50da3ec6ce842217d6de63299d9ceaab9dc25a22252484520a85d02859809463dad5dda9b1f00a86863e0 DIST rocm-opencl-runtime-5.3.3.tar.gz 1007773 BLAKE2B a3f600a68183337f92b152a123241cb7025889cca2ef6814d9d5b5a2146a78703b171d20bcb432bc7a2cdd1f24ad349408c17816b25a66702e9f0f5345af9082 SHA512 391f0f244b7f02972df8cada821e69ee8d81d96b9cff3c14f1d0838da583d8fb136ec4bd5ee820f6dd261968e9eef5e9a5b10b7bb76b1b64625c399d79bcb03f DIST rocm-opencl-runtime-5.4.3.tar.gz 1005268 BLAKE2B f9398e4c2b0f045f1b5d8df9f31b7f2bef6a9201885aa6ee5fc5d71632cfde26a078d9a5ea38c3da12d3c187faf04c7bdcf1a8ecb9927cdba56b1efdfcdc44ee SHA512 f65d4622ce8721a6b91ab5b5b306d142ba507d3e631ac3ab0b76c5bc6d8d18455e02debd954c82e7eb609f232b509f1ec1a013dc2fad467c2c2ad31fdf15755d -EBUILD rocm-opencl-runtime-5.1.3.ebuild 3862 BLAKE2B dcafdf4ab1160b25ebe915a01309dd4b17afbc4234637cded23c727f99fda56b6c3bad7cfc0c9ed3aee080f5ce00fa61409ff39600580454b48e0b7bb0dec257 SHA512 0d3d636980e132e909a0df480698331e92d2a8c0fc11158c26f159003632985927c626f9f23873e6a0c090f3993cd3ecf94250c06e3549416aaf349ace6426cd -EBUILD rocm-opencl-runtime-5.3.3-r1.ebuild 3439 BLAKE2B d792a570030d12d5750fbfa928e1d66f240459aae3dfb8f5f6cbea46ef6349eee4b567644c3efded318885276e8c5d1bc88436dc2ba483b92b67f6dfbb684852 SHA512 330dc61720dc774146b604ca392610ca1b07f4785231172a01cc0a1618fda9af01c72d92539e40e6d13ba6e10fc1a30664a2384b4152e6a965e88305490baca4 -EBUILD rocm-opencl-runtime-5.4.3.ebuild 3836 BLAKE2B 9780ffdbdf472cb0974dff1df640ee384b190735eca870f84830f6a0b50b942311957aecf4e7a2de5e3bf3dfd0e8cf8ddd41348cc967a84add7bd4ec50245fa2 SHA512 4ff353c488400fbf3cc10deac7117dbf8c95672b03d5e738adb4ad488eb9f26f37f17e22a30bdbc5e1ee2777af3b1ba4cd2c89f56149ec7f28f3dee6bc661119 -EBUILD rocm-opencl-runtime-9999.ebuild 3720 BLAKE2B adbf87566b21defccd420ed65a350a31d4e775bd876392eca8f67c16083530efd2a0566052ba07b0b71346c178217e71888f4b412e69a9db2525cafc840446cf SHA512 96ec382f016e00ce391100bca0c6f9a8b3c2f7ade745b6b3455ff3bad57c48d0eb3db06a5ac2cf0c272d55bb3efff6806c44f43581b9562bc348515d161a605c +EBUILD rocm-opencl-runtime-5.1.3.ebuild 3887 BLAKE2B 322c7eb5d35c8d9468da57da8d9b10e449cbaacb08e3c70241ac050f0feefb4a88cbb14921dea89d4d04944ee3c532c83c351e6e85663f1c36e65710d34affa2 SHA512 b17251f136606344e2264a40401ec965fb7a4f54efebe138735a9b9f59be34c99838a43cee070daeea4996051dc30a64b79542c679eed7fce4139849042f0478 +EBUILD rocm-opencl-runtime-5.3.3-r1.ebuild 3464 BLAKE2B bb991c34e75068a9c91c21afcd60e20130c0d056792080bb1b6e16fdc0ca60129f4efc984c3a50dc3435f47fdd126752d762d45e5ee521a61691cdab1881465b SHA512 8606a190d00a3f32145ae43f402e6e034adca05c888fa13e27be4866da3a214f4c79faa5112ed6e0f0e0666f5dff48c285d9fe443c2261d30906430b1388fc3d +EBUILD rocm-opencl-runtime-5.4.3-r1.ebuild 3865 BLAKE2B d54114f6c6946beae67cd4748a9ae462e9b35de81b4fc6bd59775d6ffa71532eceda9e7e1a9c5a6ba21ccb1ed4f5d7fffa62945647629c6752dc11c2acfc281c SHA512 2aeafd80fdca860d06d296b1da791a61440c698b00cf1e3fb289864e613fc7d26baa2f6b25590d424aa1ea5aaf65f8c3827040029ee0de8e6159f3dd6497e1de +EBUILD rocm-opencl-runtime-9999.ebuild 3745 BLAKE2B 91635003fa3f6b7a8a18bf5c784628a920cf293526512df45db5db73d46b478389fb06d186b828e88a61bad93f47b40a75a7f79e6504d36e425f2f9973f663f0 SHA512 d497db6298a1811b43b537d81f780c38d8daa748c674497744327bf7a499854e3317d53a696ba4d6778d9b66fb226be4dcd1d52eba56cb0947e5045caa8a0944 MISC metadata.xml 525 BLAKE2B 9af34c6be2bb5ff304e4d01810b810eb8a0639d1972325fad3b81c93aa4d060cbebddc9c06da702dd80f9aa98549720cf2bc674d5b11ef6f99ed30efe50d2110 SHA512 c50670dde49ec0d9d3acca19d37842ecf567429f455e1b37c5181e5d4361d829eff0980ba35096ef42c0789f8904d52425faf4a2aabf641142722957b626378d diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.1.3.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.1.3.ebuild index e0845f49453a..e50c897d3dcc 100644 --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.1.3.ebuild +++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.1.3.ebuild @@ -21,7 +21,8 @@ RDEPEND=">=dev-libs/rocr-runtime-${PV} >=dev-libs/rocm-device-libs-${PV} >=virtual/opencl-3 media-libs/mesa" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-util/opencl-headers" BDEPEND=">=dev-util/rocm-cmake-${PV} media-libs/glew test? ( >=x11-apps/mesa-progs-8.5.0[X] ) diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.3.3-r1.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.3.3-r1.ebuild index a982c2d36ed0..6b0a63a9a65e 100644 --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.3.3-r1.ebuild +++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.3.3-r1.ebuild @@ -21,7 +21,8 @@ RDEPEND=">=dev-libs/rocr-runtime-${PV} >=dev-libs/rocm-device-libs-${PV} >=virtual/opencl-3 media-libs/mesa" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-util/opencl-headers" BDEPEND=">=dev-util/rocm-cmake-${PV} media-libs/glew test? ( >=x11-apps/mesa-progs-8.5.0[X] ) diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.4.3-r1.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.4.3-r1.ebuild new file mode 100644 index 000000000000..d8951635f728 --- /dev/null +++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.4.3-r1.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake edo flag-o-matic + +DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime" +HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime" + EGIT_CLR_REPO_URI="https://github.com/ROCm-Developer-Tools/ROCclr" + inherit git-r3 + S="${WORKDIR}/${P}" +else + KEYWORDS="~amd64" + SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> rocclr-${PV}.tar.gz + https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz" + S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}" +fi + +LICENSE="Apache-2.0 MIT" +SLOT="0/$(ver_cut 1-2)" +IUSE="debug test" +RESTRICT="!test? ( test )" + +RDEPEND=">=dev-libs/rocr-runtime-5.3 + >=dev-libs/rocm-comgr-5.3 + >=dev-libs/rocm-device-libs-5.3 + >=virtual/opencl-3 + media-libs/mesa" +DEPEND="${RDEPEND} + dev-util/opencl-headers" +BDEPEND=">=dev-util/rocm-cmake-5.3 + test? ( + >=x11-apps/mesa-progs-8.5.0[X] + media-libs/glew + ) + " + +CLR_S="${WORKDIR}/ROCclr-rocm-${PV}" +PATCHES=( "${FILESDIR}/${PN}-5.3.3-gcc13.patch" ) + +src_unpack () { +if [[ ${PV} == "9999" ]]; then + git-r3_fetch + git-r3_checkout + git-r3_fetch "${EGIT_CLR_REPO_URI}" + git-r3_checkout "${EGIT_CLR_REPO_URI}" "${CLR_S}" + else + default + fi +} +src_prepare() { + cmake_src_prepare + + pushd ${CLR_S} || die + # Bug #753377 + # patch re-enables accidentally disabled gfx800 family + eapply "${FILESDIR}/${PN}-5.0.2-enable-gfx800.patch" + eapply "${FILESDIR}/rocclr-5.3.3-gcc13.patch" + popd || die +} + +src_configure() { + # Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120 + append-cflags -fcommon + + local mycmakeargs=( + -Wno-dev + -DROCCLR_PATH="${CLR_S}" + -DAMD_OPENCL_PATH="${S}" + -DROCM_PATH="${EPREFIX}/usr" + -DBUILD_TESTS=$(usex test ON OFF) + -DEMU_ENV=ON + -DBUILD_ICD=OFF + -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF + ) + cmake_src_configure +} + +src_install() { + insinto /etc/OpenCL/vendors + doins config/amdocl64.icd + + cd "${BUILD_DIR}" || die + insinto /usr/lib64 + doins amdocl/libamdocl64.so + doins tools/cltrace/libcltrace.so +} + +# Copied from rocm.eclass. This ebuild does not need amdgpu_targets +# USE_EXPANDS, so it should not inherit rocm.eclass; it only uses the +# check_amdgpu function in src_test. Rename it to check-amdgpu to avoid +# pkgcheck warning. +check-amdgpu() { + for device in /dev/kfd /dev/dri/render*; do + addwrite ${device} + if [[ ! -r ${device} || ! -w ${device} ]]; then + eerror "Cannot read or write ${device}!" + eerror "Make sure it is present and check the permission." + ewarn "By default render group have access to it. Check if portage user is in render group." + die "${device} inaccessible" + fi + done +} + +src_test() { + check-amdgpu + cd "${BUILD_DIR}"/tests/ocltst || die + export OCL_ICD_FILENAMES="${BUILD_DIR}"/amdocl/libamdocl64.so + local instruction1="Please start an X server using amdgpu driver (not Xvfb!)," + local instruction2="and export OCLGL_DISPLAY=\${DISPLAY} OCLGL_XAUTHORITY=\${XAUTHORITY} before reruning the test." + if [[ -n ${OCLGL_DISPLAY+x} ]]; then + export DISPLAY=${OCLGL_DISPLAY} + export XAUTHORITY=${OCLGL_XAUTHORITY} + ebegin "Running oclgl test under DISPLAY ${OCLGL_DISPLAY}" + if ! glxinfo | grep "OpenGL vendor string: AMD"; then + ewarn "${instruction1}" + ewarn "${instruction2}" + die "This display does not have AMD OpenGL vendor!" + fi + ./ocltst -m $(realpath liboclgl.so) -A ogl.exclude + eend $? || die "oclgl test failed" + else + ewarn "${instruction1}" + ewarn "${instruction2}" + die "\${OCLGL_DISPLAY} not set." + fi + edob ./ocltst -m $(realpath liboclruntime.so) -A oclruntime.exclude + edob ./ocltst -m $(realpath liboclperf.so) -A oclperf.exclude +} diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.4.3.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.4.3.ebuild deleted file mode 100644 index 4ee8c36fb4d8..000000000000 --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.4.3.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake edo flag-o-matic - -DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime" -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime" - EGIT_CLR_REPO_URI="https://github.com/ROCm-Developer-Tools/ROCclr" - inherit git-r3 - S="${WORKDIR}/${P}" -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> rocclr-${PV}.tar.gz - https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz" - S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}" -fi - -LICENSE="Apache-2.0 MIT" -SLOT="0/$(ver_cut 1-2)" -IUSE="debug test" -RESTRICT="!test? ( test )" - -RDEPEND=">=dev-libs/rocr-runtime-5.3 - >=dev-libs/rocm-comgr-5.3 - >=dev-libs/rocm-device-libs-5.3 - >=virtual/opencl-3 - media-libs/mesa" -DEPEND="${RDEPEND}" -BDEPEND=">=dev-util/rocm-cmake-5.3 - media-libs/glew - test? ( >=x11-apps/mesa-progs-8.5.0[X] ) - " - -CLR_S="${WORKDIR}/ROCclr-rocm-${PV}" -PATCHES=( "${FILESDIR}/${PN}-5.3.3-gcc13.patch" ) - -src_unpack () { -if [[ ${PV} == "9999" ]]; then - git-r3_fetch - git-r3_checkout - git-r3_fetch "${EGIT_CLR_REPO_URI}" - git-r3_checkout "${EGIT_CLR_REPO_URI}" "${CLR_S}" - else - default - fi -} -src_prepare() { - cmake_src_prepare - - pushd ${CLR_S} || die - # Bug #753377 - # patch re-enables accidentally disabled gfx800 family - eapply "${FILESDIR}/${PN}-5.0.2-enable-gfx800.patch" - eapply "${FILESDIR}/rocclr-5.3.3-gcc13.patch" - popd || die -} - -src_configure() { - # Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120 - append-cflags -fcommon - - local mycmakeargs=( - -Wno-dev - -DROCCLR_PATH="${CLR_S}" - -DAMD_OPENCL_PATH="${S}" - -DROCM_PATH="${EPREFIX}/usr" - -DBUILD_TESTS=$(usex test ON OFF) - -DEMU_ENV=ON - -DBUILD_ICD=OFF - -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF - ) - cmake_src_configure -} - -src_install() { - insinto /etc/OpenCL/vendors - doins config/amdocl64.icd - - cd "${BUILD_DIR}" || die - insinto /usr/lib64 - doins amdocl/libamdocl64.so - doins tools/cltrace/libcltrace.so -} - -# Copied from rocm.eclass. This ebuild does not need amdgpu_targets -# USE_EXPANDS, so it should not inherit rocm.eclass; it only uses the -# check_amdgpu function in src_test. Rename it to check-amdgpu to avoid -# pkgcheck warning. -check-amdgpu() { - for device in /dev/kfd /dev/dri/render*; do - addwrite ${device} - if [[ ! -r ${device} || ! -w ${device} ]]; then - eerror "Cannot read or write ${device}!" - eerror "Make sure it is present and check the permission." - ewarn "By default render group have access to it. Check if portage user is in render group." - die "${device} inaccessible" - fi - done -} - -src_test() { - check-amdgpu - cd "${BUILD_DIR}"/tests/ocltst || die - export OCL_ICD_FILENAMES="${BUILD_DIR}"/amdocl/libamdocl64.so - local instruction1="Please start an X server using amdgpu driver (not Xvfb!)," - local instruction2="and export OCLGL_DISPLAY=\${DISPLAY} OCLGL_XAUTHORITY=\${XAUTHORITY} before reruning the test." - if [[ -n ${OCLGL_DISPLAY+x} ]]; then - export DISPLAY=${OCLGL_DISPLAY} - export XAUTHORITY=${OCLGL_XAUTHORITY} - ebegin "Running oclgl test under DISPLAY ${OCLGL_DISPLAY}" - if ! glxinfo | grep "OpenGL vendor string: AMD"; then - ewarn "${instruction1}" - ewarn "${instruction2}" - die "This display does not have AMD OpenGL vendor!" - fi - ./ocltst -m $(realpath liboclgl.so) -A ogl.exclude - eend $? || die "oclgl test failed" - else - ewarn "${instruction1}" - ewarn "${instruction2}" - die "\${OCLGL_DISPLAY} not set." - fi - edob ./ocltst -m $(realpath liboclruntime.so) -A oclruntime.exclude - edob ./ocltst -m $(realpath liboclperf.so) -A oclperf.exclude -} diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-9999.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-9999.ebuild index 2fdb4a002b1c..1b92380587cf 100644 --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-9999.ebuild +++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-9999.ebuild @@ -29,7 +29,8 @@ RDEPEND=">=dev-libs/rocr-runtime-5.3 >=dev-libs/rocm-device-libs-5.3 >=virtual/opencl-3 media-libs/mesa" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-util/opencl-headers" BDEPEND=">=dev-util/rocm-cmake-5.3 media-libs/glew test? ( >=x11-apps/mesa-progs-8.5.0[X] ) -- cgit v1.2.3