From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DCDD7158086 for ; Sat, 30 Oct 2021 16:47:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FD9BE07FA; Sat, 30 Oct 2021 16:47:20 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E5BF6E07FA for ; Sat, 30 Oct 2021 16:47:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2401343280 for ; Sat, 30 Oct 2021 16:47:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3D57779 for ; Sat, 30 Oct 2021 16:47:17 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1635612429.17141c97e9313f7f73148036e5d3dc96f9760f15.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/, dev-util/roctracer/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/roctracer/files/roctracer-4.3.0-glibc-2.34.patch dev-util/roctracer/roctracer-4.3.0.ebuild X-VCS-Directories: dev-util/roctracer/files/ dev-util/roctracer/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 17141c97e9313f7f73148036e5d3dc96f9760f15 X-VCS-Branch: master Date: Sat, 30 Oct 2021 16:47:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8a15a4e7-b670-4f98-bdeb-5afc65a58ed4 X-Archives-Hash: 6bfc775430a274a6848026a2bb483bb1 commit: 17141c97e9313f7f73148036e5d3dc96f9760f15 Author: David Seifert gentoo org> AuthorDate: Sat Oct 30 16:47:09 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Oct 30 16:47:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17141c97 dev-util/roctracer: pthread_yield -> sched_yield (glibc 2.34) Closes: https://bugs.gentoo.org/808049 Signed-off-by: David Seifert gentoo.org> .../files/roctracer-4.3.0-glibc-2.34.patch | 35 ++++++++++++++++++++++ dev-util/roctracer/roctracer-4.3.0.ebuild | 9 ++++-- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dev-util/roctracer/files/roctracer-4.3.0-glibc-2.34.patch b/dev-util/roctracer/files/roctracer-4.3.0-glibc-2.34.patch new file mode 100644 index 00000000000..e11b1148bb8 --- /dev/null +++ b/dev-util/roctracer/files/roctracer-4.3.0-glibc-2.34.patch @@ -0,0 +1,35 @@ +From 5f4c1c01de8f0da24956c1c931d3ffe7410b5b78 Mon Sep 17 00:00:00 2001 +From: David Seifert +Date: Sat, 30 Oct 2021 18:35:53 +0200 +Subject: [PATCH] pthread_yield -> sched_yield (glibc 2.34) + +Bug: https://bugs.gentoo.org/808049 +Upstream: https://github.com/ROCm-Developer-Tools/roctracer/pull/63 +--- + src/core/memory_pool.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/core/memory_pool.h b/src/core/memory_pool.h +index fe2f1a6..fbd9060 100644 +--- a/src/core/memory_pool.h ++++ b/src/core/memory_pool.h +@@ -24,6 +24,7 @@ THE SOFTWARE. + #define MEMORY_POOL_H_ + + #include ++#include + #include + + #include +@@ -152,7 +153,7 @@ class MemoryPool { + } + + static void sync_reader(const consumer_arg_t* arg) { +- while(arg->valid.load() == true) PTHREAD_CALL(pthread_yield()); ++ while(arg->valid.load() == true) PTHREAD_CALL(sched_yield()); + } + + static void* reader_fun(void* consumer_arg) { +-- +2.33.1 + diff --git a/dev-util/roctracer/roctracer-4.3.0.ebuild b/dev-util/roctracer/roctracer-4.3.0.ebuild index 19a0adee967..35092c81a55 100644 --- a/dev-util/roctracer/roctracer-4.3.0.ebuild +++ b/dev-util/roctracer/roctracer-4.3.0.ebuild @@ -11,6 +11,7 @@ DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's" HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer.git" SRC_URI="https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-${PV}.tar.gz -> rocm-tracer-${PV}.tar.gz https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-${PV}.tar.gz -> rocprofiler-${PV}.tar.gz" +S="${WORKDIR}/roctracer-rocm-${PV}" LICENSE="MIT" SLOT="0/$(ver_cut 1-2)" @@ -26,13 +27,16 @@ BDEPEND=" ') " +PATCHES=( + # https://github.com/ROCm-Developer-Tools/roctracer/pull/63 + "${FILESDIR}"/${PN}-4.3.0-glibc-2.34.patch +) + python_check_deps() { has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]" && has_version "dev-python/ply[${PYTHON_USEDEP}]" } -S="${WORKDIR}/roctracer-rocm-${PV}" - src_prepare() { mv "${WORKDIR}"/rocprofiler-rocm-${PV} "${WORKDIR}"/rocprofiler || die @@ -54,7 +58,6 @@ src_prepare() { hprefixify script/*.py - eapply_user cmake_src_prepare }