From 4b19be30aa626b327c885dae62c559ec0e9fb935 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 13 Oct 2019 22:19:36 +0100 Subject: gentoo resync : 13.10.2019 --- dev-libs/rocr-runtime/Manifest | 6 +++ .../rocr-runtime-2.8.0-fix_doorbell_map.patch | 57 ++++++++++++++++++++++ dev-libs/rocr-runtime/rocr-runtime-2.8.0-r1.ebuild | 38 +++++++++++++++ dev-libs/rocr-runtime/rocr-runtime-2.8.0.ebuild | 37 ++++++++++++++ dev-libs/rocr-runtime/rocr-runtime-2.9.0.ebuild | 37 ++++++++++++++ 5 files changed, 175 insertions(+) create mode 100644 dev-libs/rocr-runtime/files/rocr-runtime-2.8.0-fix_doorbell_map.patch create mode 100644 dev-libs/rocr-runtime/rocr-runtime-2.8.0-r1.ebuild create mode 100644 dev-libs/rocr-runtime/rocr-runtime-2.8.0.ebuild create mode 100644 dev-libs/rocr-runtime/rocr-runtime-2.9.0.ebuild (limited to 'dev-libs/rocr-runtime') diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest index bdb8a87026cf..54208b48c6e3 100644 --- a/dev-libs/rocr-runtime/Manifest +++ b/dev-libs/rocr-runtime/Manifest @@ -1,9 +1,15 @@ AUX rocr-runtime-2.0.0-cmake-install-paths.patch 2151 BLAKE2B 4d52316dae6fae72c85dcf0d042f97dc94910278ffecfc4ca2c4f51fe7ed9afafef994626d7f58e8f806eb3620762adfe4523630db982f715ccad6f90c120e97 SHA512 d8d3862d018582c3c4c5551ffd75dbfccb0d005bcaf0a005de07a2c0ac7d9060c21a348b2ac01b447a9ede007ffd63ba11a8a8e24d4c15c0044e2e86d6266f95 +AUX rocr-runtime-2.8.0-fix_doorbell_map.patch 2384 BLAKE2B 3fd7ca719788a48a40adfabd6543510d586f6414c19daec011fa09d801254e9a3b5169feb26e8fa787bb9f05f254b83a59552d226e0537adbe411609e12bbf55 SHA512 e2f506bc6d8a942b57d46561e29bb9b17aab5e7a8afab92e147ea6be2670c82ad7f624549a4ddfa847a2ec2984f842eaf3a12fc9ec9f5375ba8ff88c2199a041 DIST rocr-runtime-2.0.0.tar.gz 313087 BLAKE2B 5fe5ea99728f7d7337c9e8a174a31d4ca8bdd559fad3400955ba6d86947d5bf9004094d78548cab2cb2089bfd028d0e4dfdd4d5fd7b41bed73feeebf2f33b705 SHA512 662d3d8fff8aeb17557df67207d885edc1266bb9800ec46ecab28bbd6ace7fbffb9e4092d74beb0366cacfe8873b1b257bcf2f8345d81a9b6657a7adcfc53c0c DIST rocr-runtime-2.6.0.tar.gz 318296 BLAKE2B c04e04db32f650def8a7973fa73f0c0e9b99412b13676a05e9c4283ea07958ffe14f7c54002db469ddfd506f349087bd66fff138b7e7b19c41f4ca8789a7c384 SHA512 3b88cf4e1cb6fca6b4361a612abc2c02466d4f716838665d02f16b6fa975b5f69795622d6b96a01b796165980d2888be7eedd77957a7fd44fac19a0ea581f6b8 DIST rocr-runtime-2.7.0.tar.gz 321669 BLAKE2B 99f7a62019aaa893ff032a7ed492720c1d0d8fc2c8a730f2e6833d1ad34af57e1045ed480a7d5ba72123bebfa6accd6282be4299bf94d77404adc5bbc9d13624 SHA512 46926a711665df4e232a6dcbcb1f67a4a133bffac927b70404e3cefe624be31dfc5ffea49ae9b834076cfcdf94a6e61b6804af6aed75f433e1842c980bc6e54d +DIST rocr-runtime-2.8.0.tar.gz 324868 BLAKE2B 5c46ffec7482e09032c67270a352543465f9f8a0a7c45e9884c37104e9e12a7e4dccb60bf3904d1398ffc00d9e934fc055190ba9ba4c1104bdb83be6c758eded SHA512 428b7d1d17a82c841a4d9a2c163670464416afa3ca3c579cc63ee712880940c0150e365922ffdafa44ee81fb76295cc19b66a1a4cb0a7e9a366f56782d826061 +DIST rocr-runtime-2.9.0.tar.gz 323220 BLAKE2B 7e6338185f23011ed4105c6797431677e657c6fc198f83399daab4d3b2d3333ebd6e86c0d669bf794f984ea0346b8e528449eb5d81aff2ecf3f1871663458df6 SHA512 fa68fde0f79651956096ee506ff8b6760a9623e7d9cb099229b3951b7434bed5b501a3c6785c5767902c7dbf6c478ada5d2c2a5c5984063f0d0d0db8bca2bda2 EBUILD rocr-runtime-2.0.0.ebuild 862 BLAKE2B c9262812cdfdc159248b81cb168b5d2465f2bd7544d576d4d7407919a0f9764a6c2eaf53731294c424755e05915ec47647435ce7524d276acbc7786bccf6ede9 SHA512 8c02bd29599c6cc7ad77dae4f8759cd4f3c2840800ecab30953d325b0ce1aa6bc5bee51ad2b5eca60eb420d5c4fce74e746cdf1efc470a4262eb5a360531399d EBUILD rocr-runtime-2.6.0-r1.ebuild 869 BLAKE2B e5a736b834cf77ee056ed3497bcdd3bdb0c525e3ed117164d0a28a9c49ffd079909967110af94c5c87f9e1429e58d36511f95b8bb60c3158a27800fb8679269d SHA512 f883e3f6e2354a2bdab1f5dce33eb9ae6b6405d158414f8016276b25e8e50420489419d4bd3727981bba04ec2311afa7ac3c2590148ab1f45116b7c66124cfbb EBUILD rocr-runtime-2.7.0.ebuild 967 BLAKE2B 847b465d805b6d30129b3bafedd2471bc093fd3bb91dbfec11dae0a086ec625e4ce087af08e405942d4677003c4c6d9794488932da754588e4567878edaed5ab SHA512 02dd1a0fc265a44a2250d475733c1aa3ea1fd046651291b457991a433676007828e082380b6593eb23dc2dbb5d0293b07072925706002dcc2aaa3d8f12306abf +EBUILD rocr-runtime-2.8.0-r1.ebuild 1010 BLAKE2B f94721331deaa6b107be62380a09fb2337359275fda8bf814f93fc119485aba974219833db78d92a438d91f706eb46e3a704d086661e24fc1bacd969eb010bd6 SHA512 0aa37210c6ccd697b483dbe856017e382e0b46a168f420910371e46f405e0e300a5d05f77548b29a989dde6f4065be07ceffc618fa9864baeb2ced7681a2738c +EBUILD rocr-runtime-2.8.0.ebuild 967 BLAKE2B 847b465d805b6d30129b3bafedd2471bc093fd3bb91dbfec11dae0a086ec625e4ce087af08e405942d4677003c4c6d9794488932da754588e4567878edaed5ab SHA512 02dd1a0fc265a44a2250d475733c1aa3ea1fd046651291b457991a433676007828e082380b6593eb23dc2dbb5d0293b07072925706002dcc2aaa3d8f12306abf +EBUILD rocr-runtime-2.9.0.ebuild 967 BLAKE2B 847b465d805b6d30129b3bafedd2471bc093fd3bb91dbfec11dae0a086ec625e4ce087af08e405942d4677003c4c6d9794488932da754588e4567878edaed5ab SHA512 02dd1a0fc265a44a2250d475733c1aa3ea1fd046651291b457991a433676007828e082380b6593eb23dc2dbb5d0293b07072925706002dcc2aaa3d8f12306abf EBUILD rocr-runtime-9999.ebuild 902 BLAKE2B 0e7ae79cbaf8eec276cee4981a4e093d4fd1121c4e71d86d485db8eecf239ed773c50934ad5010d56a69fb01408968ac99af80ee6105593b1976d31e48224aab SHA512 346a787c3be08d55b1de4bbfbea44b9e321a8f9646284667c3146181d75cd7c9e98ec594d4674cd5290ed68ce1f60afc8919efd878f920eb15ec8b408100c32f MISC metadata.xml 720 BLAKE2B 79e9a058e954fd4d4d7d3490f5cda3e157ac772ca9dcb973d14bae4cfe572de2edc4f6b36c8ec1803632dfeb30c734552566ed1100d0ef89c74fa7386baadf3f SHA512 3a13dc340357222fbab6e417c63c83905c3c5fb9aacff18097ba954eae0cca26e752749dd0da031658de5ab96a30528775ee55403b09b36b17c98f108bd6c1d1 diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-2.8.0-fix_doorbell_map.patch b/dev-libs/rocr-runtime/files/rocr-runtime-2.8.0-fix_doorbell_map.patch new file mode 100644 index 000000000000..aef3d297034e --- /dev/null +++ b/dev-libs/rocr-runtime/files/rocr-runtime-2.8.0-fix_doorbell_map.patch @@ -0,0 +1,57 @@ +https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/71 + +From d2a6ad97eb96a28d8f8b658b26ab94e911886cf2 Mon Sep 17 00:00:00 2001 +From: Sean Keely +Date: Thu, 5 Sep 2019 20:58:57 -0500 +Subject: [PATCH] Correct doorbell_queue_map allocation. + +doorbell_queue_map should be allocated unconditionally. +--- + core/runtime/amd_gpu_agent.cpp | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/core/runtime/amd_gpu_agent.cpp b/core/runtime/amd_gpu_agent.cpp +index 9b79a6b..76df913 100644 +--- a/core/runtime/amd_gpu_agent.cpp ++++ b/core/runtime/amd_gpu_agent.cpp +@@ -1182,12 +1182,22 @@ void GpuAgent::SyncClocks() { + } + + void GpuAgent::BindTrapHandler() { ++ // Make an empty map from doorbell index to queue. ++ // The trap handler uses this to retrieve a wave's amd_queue_t*. ++ auto doorbell_queue_map_size = MAX_NUM_DOORBELLS * sizeof(amd_queue_t*); ++ ++ doorbell_queue_map_ = (amd_queue_t**)core::Runtime::runtime_singleton_->system_allocator()( ++ doorbell_queue_map_size, 0x1000, 0); ++ assert(doorbell_queue_map_ != NULL && "Doorbell queue map allocation failed"); ++ ++ memset(doorbell_queue_map_, 0, doorbell_queue_map_size); ++ + if (isa_->GetMajorVersion() == 7) { + // No trap handler support on Gfx7, soft error. + return; + } + +- // Disable trap handler on Carrizo until KFD is fixed. ++ // Disable trap handler on APUs until KFD is fixed. + if (profile_ == HSA_PROFILE_FULL) { + return; + } +@@ -1195,16 +1205,6 @@ void GpuAgent::BindTrapHandler() { + // Assemble the trap handler source code. + AssembleShader("TrapHandler", AssembleTarget::ISA, trap_code_buf_, trap_code_buf_size_); + +- // Make an empty map from doorbell index to queue. +- // The trap handler uses this to retrieve a wave's amd_queue_t*. +- auto doorbell_queue_map_size = MAX_NUM_DOORBELLS * sizeof(amd_queue_t*); +- +- doorbell_queue_map_ = (amd_queue_t**)core::Runtime::runtime_singleton_->system_allocator()( +- doorbell_queue_map_size, 0x1000, 0); +- assert(doorbell_queue_map_ != NULL && "Doorbell queue map allocation failed"); +- +- memset(doorbell_queue_map_, 0, doorbell_queue_map_size); +- + // Bind the trap handler to this node. + HSAKMT_STATUS err = hsaKmtSetTrapHandler(node_id(), trap_code_buf_, trap_code_buf_size_, + doorbell_queue_map_, doorbell_queue_map_size); diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.8.0-r1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-2.8.0-r1.ebuild new file mode 100644 index 000000000000..9a38ed332383 --- /dev/null +++ b/dev-libs/rocr-runtime/rocr-runtime-2.8.0-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/" + inherit git-r3 + S="${WORKDIR}/${P}/src" +else + SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Radeon Open Compute Runtime" +HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime" +PATCHES=( + "${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch" + "${FILESDIR}/${P}-fix_doorbell_map.patch" +) + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +IUSE="nonfree" + +COMMON_DEPEND="sys-process/numactl" +RDEPEND="${COMMON_DEPEND} + nonfree? ( dev-libs/hsa-ext-rocr )" +DEPEND="${COMMON_DEPEND} + >=dev-libs/roct-thunk-interface-${PV}" + +src_prepare() { + sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die + cmake-utils_src_prepare +} diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.8.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-2.8.0.ebuild new file mode 100644 index 000000000000..507d471dc104 --- /dev/null +++ b/dev-libs/rocr-runtime/rocr-runtime-2.8.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/" + inherit git-r3 + S="${WORKDIR}/${P}/src" +else + SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Radeon Open Compute Runtime" +HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime" +PATCHES=( + "${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch" +) + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +IUSE="nonfree" + +COMMON_DEPEND="sys-process/numactl" +RDEPEND="${COMMON_DEPEND} + nonfree? ( dev-libs/hsa-ext-rocr )" +DEPEND="${COMMON_DEPEND} + >=dev-libs/roct-thunk-interface-${PV}" + +src_prepare() { + sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die + cmake-utils_src_prepare +} diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.9.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-2.9.0.ebuild new file mode 100644 index 000000000000..507d471dc104 --- /dev/null +++ b/dev-libs/rocr-runtime/rocr-runtime-2.9.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/" + inherit git-r3 + S="${WORKDIR}/${P}/src" +else + SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Radeon Open Compute Runtime" +HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime" +PATCHES=( + "${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch" +) + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +IUSE="nonfree" + +COMMON_DEPEND="sys-process/numactl" +RDEPEND="${COMMON_DEPEND} + nonfree? ( dev-libs/hsa-ext-rocr )" +DEPEND="${COMMON_DEPEND} + >=dev-libs/roct-thunk-interface-${PV}" + +src_prepare() { + sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die + cmake-utils_src_prepare +} -- cgit v1.2.3