commit: 9d786a54cda2496f5e018e7b0ef452801e7dd8a9 Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com> AuthorDate: Mon Jun 23 21:08:55 2025 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Tue Jun 24 08:12:52 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d786a54
dev-util/hip: Remove invalid assert (caused random unittest failures in hiprt) Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42717 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-util/hip/files/hip-6.4.1-bad-assert.patch | 15 +++++++++++++++ dev-util/hip/{hip-6.4.1.ebuild => hip-6.4.1-r1.ebuild} | 1 + 2 files changed, 16 insertions(+) diff --git a/dev-util/hip/files/hip-6.4.1-bad-assert.patch b/dev-util/hip/files/hip-6.4.1-bad-assert.patch new file mode 100644 index 000000000000..481da014f67c --- /dev/null +++ b/dev-util/hip/files/hip-6.4.1-bad-assert.patch @@ -0,0 +1,15 @@ +Remove invalid assert (caused random unittest failures in hiprt) + +Upstream bug: https://github.com/ROCm/clr/issues/148 +Backports commit: https://github.com/ROCm/clr/commit/8fcaa1ca938bf6e57625d3fae3f80b00e86df266 +--- a/rocclr/platform/commandqueue.cpp ++++ b/rocclr/platform/commandqueue.cpp +@@ -156,8 +156,6 @@ void HostQueue::finish(bool cpu_wait) { + if (IS_HIP) { + command = getLastQueuedCommand(true); + if (command == nullptr) { +- assert(GetSubmissionBatch() == nullptr && +- "Can't claim the queue is finished with the active batch!"); + return; + } + // Force blocking wait if requested. That allows to avoid a build up of unreleased CPU commands diff --git a/dev-util/hip/hip-6.4.1.ebuild b/dev-util/hip/hip-6.4.1-r1.ebuild similarity index 99% rename from dev-util/hip/hip-6.4.1.ebuild rename to dev-util/hip/hip-6.4.1-r1.ebuild index b1a1a69d3995..e15f8c373794 100644 --- a/dev-util/hip/hip-6.4.1.ebuild +++ b/dev-util/hip/hip-6.4.1-r1.ebuild @@ -82,6 +82,7 @@ PATCHES=( "${FILESDIR}/${PN}-6.3.0-no-isystem-usr-include.patch" "${FILESDIR}/${PN}-6.3.0-clr-fix-libcxx.patch" "${FILESDIR}/${PN}-6.4.1-no-glibcxx-assert.patch" + "${FILESDIR}/${PN}-6.4.1-bad-assert.patch" ) hip_test_wrapper() {
