* [gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/, dev-util/roctracer/files/
@ 2021-01-24 7:43 Benda XU
0 siblings, 0 replies; 6+ messages in thread
From: Benda XU @ 2021-01-24 7:43 UTC (permalink / raw
To: gentoo-commits
commit: d1e25273456a9f38b842f65e9c5bc1ac63c5c13d
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 14:37:07 2021 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 07:43:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1e25273
dev-util/roctracer: performance tracing for AMD GPUs.
Closes: https://github.com/gentoo/gentoo/pull/19148
Suggested-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Suggested-by: Wilfried Holzke <gentoo <AT> holzke.net>
Bug: https://bugs.gentoo.org/650804
Bug: https://github.com/gentoo/gentoo/pull/10724
Package-Manager: Portage-3.0.12, Repoman-3.0.1
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
dev-util/roctracer/Manifest | 1 +
...roctracer-3.8.0-gen_ostream_ops-toPython3.patch | 28 +++++++++++
dev-util/roctracer/metadata.xml | 19 +++++++
dev-util/roctracer/roctracer-4.0.0-r1.ebuild | 58 ++++++++++++++++++++++
4 files changed, 106 insertions(+)
diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
new file mode 100644
index 00000000000..d6046052c24
--- /dev/null
+++ b/dev-util/roctracer/Manifest
@@ -0,0 +1 @@
+DIST rocm-tracer-4.0.0.tar.gz 462166 BLAKE2B 1294b5639a743a9d32737c72dc0f082b5a33ee1b3365f48221ad6392cdde7637926c42ea344fa96e9fc8410ea04e9ce3f535e188a25130f4be764c4d4a59b69c SHA512 312cd6c4c98a83e28a9f8b9e6123862af2e80a0d0852acff11be65d198f277c6ea194e72f6dbaccab1dd5d4af318bef28ca546e49440f22d024a546a4e5e9e15
diff --git a/dev-util/roctracer/files/roctracer-3.8.0-gen_ostream_ops-toPython3.patch b/dev-util/roctracer/files/roctracer-3.8.0-gen_ostream_ops-toPython3.patch
new file mode 100644
index 00000000000..b73949b9233
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-3.8.0-gen_ostream_ops-toPython3.patch
@@ -0,0 +1,28 @@
+--- a/script/gen_ostream_ops.py 2020-09-27 11:23:37.833756185 +0200
++++ b/script/gen_ostream_ops.py 2020-09-27 11:21:25.763756688 +0200
+@@ -176,9 +176,9 @@
+ process_struct(f, c, cppHeader, "", apiname)
+ global_str = "\n".join(global_str.split("\n")[0:-2])
+ if structs_depth != -1: #reindent
+- global_str = string.split(global_str, '\n')
+- global_str = [' ' + string.lstrip(line) for line in global_str]
+- global_str = string.join(global_str, '\n')
++ global_str = global_str.split('\n')
++ global_str = [' ' + line.lstrip() for line in global_str]
++ global_str = str.join('\n', global_str)
+ f.write(global_str+"\n")
+ if structs_depth != -1:
+ f.write(" };\n")
+@@ -199,9 +199,9 @@
+ process_struct(f, c, cppHeader, "", apiname)
+ global_str = "\n".join(global_str.split("\n")[0:-2])
+ if structs_depth != -1: #reindent
+- global_str = string.split(global_str, '\n')
+- global_str = [' ' + string.lstrip(line) for line in global_str]
+- global_str = string.join(global_str, '\n')
++ global_str = global_str.split('\n')
++ global_str = [' ' + line.lstrip() for line in global_str]
++ global_str = str.join('\n', global_str)
+ f.write(global_str+"\n")
+ if structs_depth != -1:
+ f.write(" };\n")
diff --git a/dev-util/roctracer/metadata.xml b/dev-util/roctracer/metadata.xml
new file mode 100644
index 00000000000..eec4ce34fdd
--- /dev/null
+++ b/dev-util/roctracer/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>candrews@gentoo.org</email>
+ <name>Craig Andrews</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>gentoo@holzke.net</email>
+ <name>Wilfried Holzke</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ROCm-Developer-Tools/roctracer</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-util/roctracer/roctracer-4.0.0-r1.ebuild b/dev-util/roctracer/roctracer-4.0.0-r1.ebuild
new file mode 100644
index 00000000000..04c9a3080f2
--- /dev/null
+++ b/dev-util/roctracer/roctracer-4.0.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake prefix
+
+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"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/rocr-runtime
+ sys-devel/llvm-roc
+ dev-util/hip"
+DEPEND="dev-python/CppHeaderParser
+ dev-python/ply
+ ${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/roctracer-3.8.0-gen_ostream_ops-toPython3.patch"
+)
+
+S="${WORKDIR}/roctracer-rocm-${PV}"
+
+src_prepare() {
+ # do not build the tool and it´s library;
+ # change destination for headers to include/roctracer;
+ # do not install a second set of header files;
+ sed -e "/LIBRARY DESTINATION/s,lib,$(get_libdir)," \
+ -e "/add_subdirectory ( \${TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
+ -e "/DESTINATION/s,\${DEST_NAME}/include,include/roctracer," \
+ -e "/install ( FILES \${CMAKE_CURRENT_SOURCE_DIR}/d" \
+ -e "/install ( FILES \${PROJECT_BINARY_DIR}/d" \
+ -i CMakeLists.txt || die
+
+ # do not download additional sources via git
+ sed -e "/execute_process ( COMMAND sh -xc \"if/d" \
+ -e "/add_subdirectory ( \${TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
+ -i test/CMakeLists.txt || die
+
+ hprefixify script/*.py
+
+ eapply_user
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DHIP_VDI=1
+ -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa:${EPREFIX}/usr/lib"
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/, dev-util/roctracer/files/
@ 2021-10-30 16:47 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2021-10-30 16:47 UTC (permalink / raw
To: gentoo-commits
commit: 17141c97e9313f7f73148036e5d3dc96f9760f15
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 30 16:47:09 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> 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 <soap <AT> 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 <soap@gentoo.org>
+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 <pthread.h>
++#include <sched.h>
+ #include <stdlib.h>
+
+ #include <atomic>
+@@ -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
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/, dev-util/roctracer/files/
@ 2022-05-01 14:43 Benda XU
0 siblings, 0 replies; 6+ messages in thread
From: Benda XU @ 2022-05-01 14:43 UTC (permalink / raw
To: gentoo-commits
commit: d781014aad6aa8ecf7af866458427b2ef208ff4d
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun May 1 14:41:18 2022 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun May 1 14:43:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d781014a
dev-util/roctracer: version bump to 5.0.2.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
dev-util/roctracer/Manifest | 2 +
.../roctracer/files/roctracer-5.0.2-Werror.patch | 18 ++++++
| 36 +++++++++++
.../files/roctracer-5.0.2-strip-license.patch | 14 +++++
dev-util/roctracer/roctracer-5.0.2.ebuild | 69 ++++++++++++++++++++++
5 files changed, 139 insertions(+)
diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index c0dab991cddc..9c8b51497026 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -1,5 +1,7 @@
DIST rocm-tracer-4.0.0.tar.gz 462166 BLAKE2B 1294b5639a743a9d32737c72dc0f082b5a33ee1b3365f48221ad6392cdde7637926c42ea344fa96e9fc8410ea04e9ce3f535e188a25130f4be764c4d4a59b69c SHA512 312cd6c4c98a83e28a9f8b9e6123862af2e80a0d0852acff11be65d198f277c6ea194e72f6dbaccab1dd5d4af318bef28ca546e49440f22d024a546a4e5e9e15
DIST rocm-tracer-4.2.0.tar.gz 476974 BLAKE2B 3a7be9c269fec5dcca98d7de514d97a2e1de7bbfaa54a1aca2df70453d05326564c8ee7bf793c7d176069ecd3f7f91409c6a20dd0773aa157f7abc1dac41448e SHA512 002d9fccee4761af4853e589b116bc5844b98abb84517c260aedcb5f31f5c92b862a233062ec280a6f878343c4f751d55f47fd38483e1882feb8c970f9836120
DIST rocm-tracer-4.3.0.tar.gz 477647 BLAKE2B d597df2efef0c750637c8f509b89ad62927cb839ba7c9a42fa71882ee13d4a0bba295af19b02eda5310421e53187e9a98a76777f0d3a587e7e652ecf4c10cb6a SHA512 47ea2705a361cb863f33a9f4c1a7d5005bb679221fa95f14dd5404ef5af32377bad5c7d9807e2fff8030a9c26ac4230f2bab833344ef49ecebbd5653f0edfc2c
+DIST rocm-tracer-5.0.2.tar.gz 474669 BLAKE2B b350111590140e1282338e4f134caf6228677c49361ceb9bc7ba0da8709346daa4fd014644c04adff0e903dba6014a84edd2eb3a5c132a8f91b479e4d5b085e5 SHA512 3fc1449cc9c9bf83e5233a7a0e83c0e3fa9da225d5ee4427b7d6fa15e3580497e1b9fbcd63892e4a99df01582aecd3ccfd66d2a19af2d8c25949ee705894ea44
DIST rocprofiler-4.2.0.tar.gz 1408433 BLAKE2B b35a7710d680167bad78ff74be153ea994ea919d572c5091ecec73d614bebb7ec14a14d81a0cabbe514b8439ddd7225f1a3a3fa7a0b653c33f938568bbe0c593 SHA512 35d3e9648bc5ee60bbddc15c9675efba7de3b4b3b725b9623e71a83007b8f23a323cc1da82e67f0ff425e5f827d6c632435bf465be8cba8c775405ead3f0f3be
DIST rocprofiler-4.3.0.tar.gz 1402250 BLAKE2B 3826c3b26b0d5838ab3475614c2ecd2265e177fe40b8a90abb491746513bd50841e5ceb34d1fcb4bcb2fbe8a6854b9715d0670d38f08775e5e14cd855f15629b SHA512 e327146604459f2f827ab943a21d0eaa0ee41cf6770ab94dd019d461cf6438e70a48139ce67ec1553d0f450fa5bb233a7ed39438e8bf39b33218d53e2c270d3b
+DIST rocprofiler-5.0.2.tar.gz 1401732 BLAKE2B ae870bc50dbd39c11e24f77ccb41773df1107b76cb7a12e1cebc66f8d66ddba6ad3bd6f9fe61657b03b22ef35f88fb608cf6070178f6aab24fe7a1bdcac43a96 SHA512 244e2b827126b7299ec0510daa5e1245a4a5a877394419f8bc9113f443231f67fc935609cbde6eeb26bb138ab4e95e2a88829ffa79ecc8f9881b5a77b5910c02
diff --git a/dev-util/roctracer/files/roctracer-5.0.2-Werror.patch b/dev-util/roctracer/files/roctracer-5.0.2-Werror.patch
new file mode 100644
index 000000000000..ddcfd7d669df
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-5.0.2-Werror.patch
@@ -0,0 +1,18 @@
+User code should not use the aggressive warning and error flags.
+
+Index: roctracer-rocm-5.0.2/cmake_modules/env.cmake
+===================================================================
+--- roctracer-rocm-5.0.2.orig/cmake_modules/env.cmake
++++ roctracer-rocm-5.0.2/cmake_modules/env.cmake
+@@ -39,10 +39,8 @@ add_definitions ( -D__HIP_PLATFORM_HCC__
+
+ ## Linux Compiler options
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+-set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" )
+-set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" )
+-set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type" )
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" )
++set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive" )
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden" )
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-math-errno" )
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-threadsafe-statics" )
--git a/dev-util/roctracer/files/roctracer-5.0.2-headers.patch b/dev-util/roctracer/files/roctracer-5.0.2-headers.patch
new file mode 100644
index 000000000000..91e48892bc45
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-5.0.2-headers.patch
@@ -0,0 +1,36 @@
+do not install a second set of header files, strip package name from
+libraries and headers.
+
+Index: roctracer-rocm-5.0.2/CMakeLists.txt
+===================================================================
+--- roctracer-rocm-5.0.2.orig/CMakeLists.txt
++++ roctracer-rocm-5.0.2/CMakeLists.txt
+@@ -131,16 +131,12 @@ add_custom_target ( so-patch-link ALL WO
+ COMMAND ${CMAKE_COMMAND} -E create_symlink ../${DEST_NAME}/lib/${ROCTRACER_LIBRARY}.so.${LIB_VERSION_STRING} so-patch-link )
+
+ ## Install information
+-install ( TARGETS ${ROCTRACER_TARGET} LIBRARY DESTINATION ${DEST_NAME}/lib )
++install ( TARGETS ${ROCTRACER_TARGET} LIBRARY DESTINATION lib )
+ foreach ( header ${PUBLIC_HEADERS} )
+- get_filename_component ( header_subdir ${header} DIRECTORY )
+- install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/inc/${header} DESTINATION ${DEST_NAME}/include/${header_subdir} )
+- install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/inc/${header} DESTINATION include/${DEST_NAME}/${header_subdir} )
++ install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/inc/${header} DESTINATION include )
+ endforeach ()
+ foreach ( header ${GEN_HEADERS} )
+- get_filename_component ( header_subdir ${header} DIRECTORY )
+- install ( FILES ${PROJECT_BINARY_DIR}/inc/${header} DESTINATION ${DEST_NAME}/include/${header_subdir} )
+- install ( FILES ${PROJECT_BINARY_DIR}/inc/${header} DESTINATION include/${DEST_NAME}/${header_subdir} )
++ install ( FILES ${PROJECT_BINARY_DIR}/inc/${header} DESTINATION include )
+ endforeach ()
+ #install ( FILES ${PROJECT_BINARY_DIR}/inc-link DESTINATION include RENAME ${DEST_NAME} )
+ install ( FILES ${PROJECT_BINARY_DIR}/so-link DESTINATION lib RENAME ${ROCTRACER_LIBRARY}.so )
+@@ -162,7 +158,7 @@ add_custom_target ( so-roctx-major-link
+ add_custom_target ( so-roctx-patch-link ALL WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+ COMMAND ${CMAKE_COMMAND} -E create_symlink ../${DEST_NAME}/lib/${ROCTX_LIBRARY}.so.${LIB_VERSION_STRING} so-roctx-patch-link )
+
+-install ( TARGETS "roctx64" LIBRARY DESTINATION ${DEST_NAME}/lib )
++install ( TARGETS "roctx64" LIBRARY DESTINATION lib )
+ install ( FILES ${PROJECT_BINARY_DIR}/so-roctx-link DESTINATION lib RENAME ${ROCTX_LIBRARY}.so )
+ install ( FILES ${PROJECT_BINARY_DIR}/so-roctx-major-link DESTINATION lib RENAME ${ROCTX_LIBRARY}.so.${LIB_VERSION_MAJOR} )
+ install ( FILES ${PROJECT_BINARY_DIR}/so-roctx-patch-link DESTINATION lib RENAME ${ROCTX_LIBRARY}.so.${LIB_VERSION_STRING} )
diff --git a/dev-util/roctracer/files/roctracer-5.0.2-strip-license.patch b/dev-util/roctracer/files/roctracer-5.0.2-strip-license.patch
new file mode 100644
index 000000000000..e9c33885a01c
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-5.0.2-strip-license.patch
@@ -0,0 +1,14 @@
+Index: roctracer-rocm-5.0.2/CMakeLists.txt
+===================================================================
+--- roctracer-rocm-5.0.2.orig/CMakeLists.txt
++++ roctracer-rocm-5.0.2/CMakeLists.txt
+@@ -173,9 +173,6 @@ set ( CPACK_PACKAGE_CONTACT "ROCm Profil
+ set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "AMD ROCTRACER library" )
+ set ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE" )
+
+-# Install license file
+-install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION share/doc/${CPACK_PACKAGE_NAME})
+-
+ ## Debian package specific variables
+ if ( DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE} )
+ set ( CPACK_DEBIAN_PACKAGE_RELEASE $ENV{CPACK_DEBIAN_PACKAGE_RELEASE} )
diff --git a/dev-util/roctracer/roctracer-5.0.2.ebuild b/dev-util/roctracer/roctracer-5.0.2.ebuild
new file mode 100644
index 000000000000..7c53e956e347
--- /dev/null
+++ b/dev-util/roctracer/roctracer-5.0.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit cmake prefix python-any-r1
+
+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)"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/rocr-runtime:${SLOT}
+ dev-util/hip:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ $(python_gen_any_dep '
+ dev-python/CppHeaderParser[${PYTHON_USEDEP}]
+ dev-python/ply[${PYTHON_USEDEP}]
+ ')
+"
+
+PATCHES=(
+ # https://github.com/ROCm-Developer-Tools/roctracer/pull/63
+ "${FILESDIR}"/${PN}-4.3.0-glibc-2.34.patch
+ "${FILESDIR}"/${PN}-5.0.2-Werror.patch
+ "${FILESDIR}"/${PN}-5.0.2-headers.patch
+ "${FILESDIR}"/${PN}-5.0.2-strip-license.patch
+)
+
+python_check_deps() {
+ has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/ply[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ mv "${WORKDIR}"/rocprofiler-rocm-${PV} "${WORKDIR}"/rocprofiler || die
+
+ sed -e "/LIBRARY DESTINATION/s,lib,$(get_libdir)," \
+ -e "/add_subdirectory ( \${TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
+ -e "/install ( FILES \${PROJECT_BINARY_DIR}\/so/d" \
+ -i CMakeLists.txt || die
+
+ # do not download additional sources via git
+ sed -e "/execute_process ( COMMAND sh -xc \"if/d" \
+ -e "/add_subdirectory ( \${HSA_TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
+ -i test/CMakeLists.txt || die
+
+ hprefixify script/*.py
+}
+
+src_configure() {
+ export HIP_PATH="${EPREFIX}/usr"
+
+ local mycmakeargs=(
+ -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa"
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/, dev-util/roctracer/files/
@ 2022-08-08 1:38 Benda XU
0 siblings, 0 replies; 6+ messages in thread
From: Benda XU @ 2022-08-08 1:38 UTC (permalink / raw
To: gentoo-commits
commit: bd9ffa661677c66e9a1b1208db16d4b709cf5a7c
Author: Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Sun Aug 7 10:28:40 2022 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Aug 8 01:35:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd9ffa66
dev-util/roctracer: Skip loading proprietary AQLProfile lib
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
.../files/roctracer-4.3.0-no-aqlprofile.patch | 20 +++++++++++
.../files/roctracer-5.1.3-no-aqlprofile.patch | 39 ++++++++++++++++++++++
...r-4.3.0-r2.ebuild => roctracer-4.3.0-r3.ebuild} | 1 +
...acer-5.0.2.ebuild => roctracer-5.0.2-r1.ebuild} | 1 +
...acer-5.1.3.ebuild => roctracer-5.1.3-r1.ebuild} | 1 +
5 files changed, 62 insertions(+)
diff --git a/dev-util/roctracer/files/roctracer-4.3.0-no-aqlprofile.patch b/dev-util/roctracer/files/roctracer-4.3.0-no-aqlprofile.patch
new file mode 100644
index 000000000000..0548953f3089
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-4.3.0-no-aqlprofile.patch
@@ -0,0 +1,20 @@
+Skip loading proprietary AQLProfile lib
+Index: roctracer-rocm-5.1.3/src/util/hsa_rsrc_factory.cpp
+===================================================================
+--- roctracer-rocm-5.1.3.orig/src/util/hsa_rsrc_factory.cpp
++++ roctracer-rocm-5.1.3/src/util/hsa_rsrc_factory.cpp
+@@ -127,14 +127,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool init
+ if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR);
+ if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR);
+
+- // Get AqlProfile API table
+- aqlprofile_api_ = {0};
+-#ifdef ROCP_LD_AQLPROFILE
+- status = LoadAqlProfileLib(&aqlprofile_api_);
+-#else
+- status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_);
+-#endif
+- CHECK_STATUS("aqlprofile API table load failed", status);
+
+ // Get Loader API table
+ loader_api_ = {0};
diff --git a/dev-util/roctracer/files/roctracer-5.1.3-no-aqlprofile.patch b/dev-util/roctracer/files/roctracer-5.1.3-no-aqlprofile.patch
new file mode 100644
index 000000000000..93ddee3e5b43
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-5.1.3-no-aqlprofile.patch
@@ -0,0 +1,39 @@
+Skip loading proprietary AQLProfile lib
+Index: roctracer-rocm-5.1.3/src/util/hsa_rsrc_factory.cpp
+===================================================================
+--- roctracer-rocm-5.1.3.orig/src/util/hsa_rsrc_factory.cpp
++++ roctracer-rocm-5.1.3/src/util/hsa_rsrc_factory.cpp
+@@ -127,14 +127,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool init
+ if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR);
+ if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR);
+
+- // Get AqlProfile API table
+- aqlprofile_api_ = {0};
+-#ifdef ROCP_LD_AQLPROFILE
+- status = LoadAqlProfileLib(&aqlprofile_api_);
+-#else
+- status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_);
+-#endif
+- CHECK_STATUS("aqlprofile API table load failed", status);
+
+ // Get Loader API table
+ loader_api_ = {0};
+Index: roctracer-rocm-5.1.3/test/hsa/src/hsa_rsrc_factory.cpp
+===================================================================
+--- roctracer-rocm-5.1.3.orig/test/hsa/src/hsa_rsrc_factory.cpp
++++ roctracer-rocm-5.1.3/test/hsa/src/hsa_rsrc_factory.cpp
+@@ -125,14 +125,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool init
+ if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR);
+ if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR);
+
+- // Get AqlProfile API table
+- aqlprofile_api_ = {0};
+-#ifdef ROCP_LD_AQLPROFILE
+- status = LoadAqlProfileLib(&aqlprofile_api_);
+-#else
+- status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_);
+-#endif
+- CHECK_STATUS("aqlprofile API table load failed", status);
+
+ // Get Loader API table
+ loader_api_ = {0};
diff --git a/dev-util/roctracer/roctracer-4.3.0-r2.ebuild b/dev-util/roctracer/roctracer-4.3.0-r3.ebuild
similarity index 98%
rename from dev-util/roctracer/roctracer-4.3.0-r2.ebuild
rename to dev-util/roctracer/roctracer-4.3.0-r3.ebuild
index e5c7872fe3a1..c0573fc9cb13 100644
--- a/dev-util/roctracer/roctracer-4.3.0-r2.ebuild
+++ b/dev-util/roctracer/roctracer-4.3.0-r3.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.3.0-glibc-2.34.patch
"${FILESDIR}"/${PN}-4.3.0-ldflag.patch
"${FILESDIR}"/${PN}-4.3.0-tracer_tool.patch
+ "${FILESDIR}"/${PN}-4.3.0-no-aqlprofile.patch
)
python_check_deps() {
diff --git a/dev-util/roctracer/roctracer-5.0.2.ebuild b/dev-util/roctracer/roctracer-5.0.2-r1.ebuild
similarity index 98%
rename from dev-util/roctracer/roctracer-5.0.2.ebuild
rename to dev-util/roctracer/roctracer-5.0.2-r1.ebuild
index efabd899d252..a95a1732ef5e 100644
--- a/dev-util/roctracer/roctracer-5.0.2.ebuild
+++ b/dev-util/roctracer/roctracer-5.0.2-r1.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.0.2-Werror.patch
"${FILESDIR}"/${PN}-5.0.2-headers.patch
"${FILESDIR}"/${PN}-5.0.2-strip-license.patch
+ "${FILESDIR}"/${PN}-4.3.0-no-aqlprofile.patch
)
python_check_deps() {
diff --git a/dev-util/roctracer/roctracer-5.1.3.ebuild b/dev-util/roctracer/roctracer-5.1.3-r1.ebuild
similarity index 98%
rename from dev-util/roctracer/roctracer-5.1.3.ebuild
rename to dev-util/roctracer/roctracer-5.1.3-r1.ebuild
index b378cfcc340d..1154d03f8c16 100644
--- a/dev-util/roctracer/roctracer-5.1.3.ebuild
+++ b/dev-util/roctracer/roctracer-5.1.3-r1.ebuild
@@ -34,6 +34,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.0.2-Werror.patch
"${FILESDIR}"/${PN}-5.0.2-headers.patch
"${FILESDIR}"/${PN}-5.0.2-strip-license.patch
+ "${FILESDIR}"/${PN}-5.1.3-no-aqlprofile.patch
)
python_check_deps() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/, dev-util/roctracer/files/
@ 2023-01-31 14:18 Benda XU
0 siblings, 0 replies; 6+ messages in thread
From: Benda XU @ 2023-01-31 14:18 UTC (permalink / raw
To: gentoo-commits
commit: 8d85fce7add919ffa04f44b0e1b148eec6f7c471
Author: Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Fri Jan 27 13:57:24 2023 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 14:18:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d85fce7
dev-util/roctracer: add 5.3.3
Add myself as maintainer; use rocm.eclass to enable test.
All tests passed on gfx1031
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
dev-util/roctracer/Manifest | 1 +
...roctracer-5.3.3-do-not-install-test-files.patch | 37 +++++++++++++
.../files/roctracer-5.3.3-flat-lib-layout.patch | 34 ++++++++++++
.../files/roctracer-5.3.3-rocm-path.patch | 12 ++++
dev-util/roctracer/metadata.xml | 4 ++
dev-util/roctracer/roctracer-5.3.3.ebuild | 64 ++++++++++++++++++++++
6 files changed, 152 insertions(+)
diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index 890787a739ee..26b776a9f8a0 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -1,5 +1,6 @@
DIST hsa-class-f8b3870.tar.gz 37432 BLAKE2B c2a09e4a4c3708e8db432378874c63b9cefefb567ad19a9c17181ed2b60f38d0591a618f72b11f606eb44efc5e170adaf72f0ec1b93cde628ca2230a62e2d6de SHA512 f371a955bf59b7e0af07261981a6e68562fad0753d3f39d1e220034c17501abf839ed2fd88fbf376d659970395c8795a82c0560c7ed8d3b87c11c79864f5f612
DIST rocm-tracer-5.0.2.tar.gz 474669 BLAKE2B b350111590140e1282338e4f134caf6228677c49361ceb9bc7ba0da8709346daa4fd014644c04adff0e903dba6014a84edd2eb3a5c132a8f91b479e4d5b085e5 SHA512 3fc1449cc9c9bf83e5233a7a0e83c0e3fa9da225d5ee4427b7d6fa15e3580497e1b9fbcd63892e4a99df01582aecd3ccfd66d2a19af2d8c25949ee705894ea44
DIST rocm-tracer-5.1.3.tar.gz 511617 BLAKE2B 4142979b3b7d649798a7ac0b2a04b42aa7fbcbf82f2cf51b0e5363ec0da538046d6e59283d0ce1bfd341317bf24ac2f694d5c8a7d1f132f9b21caea5caf7eda3 SHA512 e73b0c921ffbdcac571d8b0825de39bd8a4fd5f2720ecdd0c189951db85efb607a0b1cd7a9bb02b3dbf329b277cb5e197525216a8e8927eea4e6ce290b7e7c7b
+DIST rocm-tracer-5.3.3.tar.gz 353041 BLAKE2B b7614707ae3af2f5a46d058dacadfb0ef3b980963ac49face66a80c8396e66cf13e0430ab41737ba15e163f5da03697376b13238ea1decfe7ee4a7f31c7664a5 SHA512 95a202f76f6b68a35942750233bd09d372a9be843150d7ec02824da13c6b9a7c8da7a752ac69f66776e7ccfb6176473745dc46a7baadfe77c99c0596fbc2ffeb
DIST rocprofiler-5.0.2.tar.gz 1401732 BLAKE2B ae870bc50dbd39c11e24f77ccb41773df1107b76cb7a12e1cebc66f8d66ddba6ad3bd6f9fe61657b03b22ef35f88fb608cf6070178f6aab24fe7a1bdcac43a96 SHA512 244e2b827126b7299ec0510daa5e1245a4a5a877394419f8bc9113f443231f67fc935609cbde6eeb26bb138ab4e95e2a88829ffa79ecc8f9881b5a77b5910c02
DIST rocprofiler-5.1.3.tar.gz 1402172 BLAKE2B 16e9b127ede94a3f96056e84a2942b6c9f3aec90579fb12796ab8ba385160aa020e3dc77f7a475dadbc0a813a823ae733ca9560f6a09e55c4c82b13dd792dfa4 SHA512 6e9932a425eaaa2a1e1741280d7525c6360700f85edb3bcf4967fe9be4fed662bae0d2ba609701f0d9733769c340e93e32076024b27bab3303449c1d68d9e1ce
diff --git a/dev-util/roctracer/files/roctracer-5.3.3-do-not-install-test-files.patch b/dev-util/roctracer/files/roctracer-5.3.3-do-not-install-test-files.patch
new file mode 100644
index 000000000000..ac3e53c1f405
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-5.3.3-do-not-install-test-files.patch
@@ -0,0 +1,37 @@
+Remove all install commands for test
+===================================================================
+--- roctracer-rocm-5.3.3.orig/test/CMakeLists.txt
++++ roctracer-rocm-5.3.3/test/CMakeLists.txt
+@@ -87,7 +87,6 @@ function(generate_hsaco TARGET_ID INPUT_
+ DEPENDS ${INPUT_FILE} clang
+ COMMENT "Building ${OUTPUT_FILE}..."
+ VERBATIM)
+- install(FILES ${PROJECT_BINARY_DIR}/${OUTPUT_FILE} DESTINATION test/${PROJECT_NAME} COMPONENT tests)
+ set(HSACO_TARGET_LIST ${HSACO_TARGET_LIST} ${PROJECT_BINARY_DIR}/${OUTPUT_FILE} PARENT_SCOPE)
+ endfunction(generate_hsaco)
+
+@@ -150,24 +149,10 @@ add_dependencies(mytest dlopen)
+ ## Copy the golden traces and test scripts
+ configure_file(run.sh ${PROJECT_BINARY_DIR} COPYONLY)
+ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink run.sh ${PROJECT_BINARY_DIR}/run_ci.sh)
+-install(PROGRAMS ${PROJECT_BINARY_DIR}/run.sh DESTINATION test/${PROJECT_NAME} COMPONENT tests)
+
+ configure_file(${PROJECT_SOURCE_DIR}/script/check_trace.py ${PROJECT_BINARY_DIR}/test/check_trace.py COPYONLY)
+-install(PROGRAMS ${PROJECT_BINARY_DIR}/test/check_trace.py DESTINATION test/${PROJECT_NAME}/test COMPONENT tests)
+
+ file(GLOB files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "golden_traces/tests_trace_cmp_levels.txt" "golden_traces/*_trace.txt")
+ foreach(file ${files})
+ configure_file(${file} ${PROJECT_BINARY_DIR}/test/${file} COPYONLY)
+ endforeach()
+-install(DIRECTORY ${PROJECT_BINARY_DIR}/test/golden_traces DESTINATION test/${PROJECT_NAME}/test COMPONENT tests)
+-
+-# install all executables
+-set(all_executables)
+-get_property(all_targets DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY BUILDSYSTEM_TARGETS)
+-foreach(target IN LISTS all_targets)
+- get_target_property(target_type ${target} TYPE)
+- if (target_type STREQUAL "EXECUTABLE")
+- list(APPEND all_executables ${target})
+- endif()
+-endforeach()
+-install(TARGETS ${all_executables} DESTINATION test/${PROJECT_NAME}/test COMPONENT tests)
diff --git a/dev-util/roctracer/files/roctracer-5.3.3-flat-lib-layout.patch b/dev-util/roctracer/files/roctracer-5.3.3-flat-lib-layout.patch
new file mode 100644
index 000000000000..46c8d1a168b8
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-5.3.3-flat-lib-layout.patch
@@ -0,0 +1,34 @@
+Install libs directly into /usr/lib64
+===================================================================
+Index: roctracer-rocm-5.3.3/src/CMakeLists.txt
+===================================================================
+--- roctracer-rocm-5.3.3.orig/src/CMakeLists.txt
++++ roctracer-rocm-5.3.3/src/CMakeLists.txt
+@@ -215,12 +215,12 @@ target_include_directories(roctracer_too
+ target_link_libraries(roctracer_tool util roctracer hsa-runtime64::hsa-runtime64 stdc++fs Threads::Threads atomic dl)
+ target_link_options(roctracer_tool PRIVATE -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/tracer_tool/exportmap -Wl,--no-undefined)
+
+-install(TARGETS roctracer_tool LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME} COMPONENT runtime)
++install(TARGETS roctracer_tool LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT runtime)
+
+ add_library(hip_stats SHARED hip_stats/hip_stats.cpp)
+ target_compile_definitions(hip_stats PRIVATE __HIP_PLATFORM_AMD__)
+ target_link_libraries(hip_stats roctracer stdc++fs)
+-install(TARGETS hip_stats LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME} COMPONENT runtime)
++install(TARGETS hip_stats LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT runtime)
+
+ endif()
+
+Index: roctracer-rocm-5.3.3/plugin/file/CMakeLists.txt
+===================================================================
+--- roctracer-rocm-5.3.3.orig/plugin/file/CMakeLists.txt
++++ roctracer-rocm-5.3.3/plugin/file/CMakeLists.txt
+@@ -38,5 +38,5 @@ target_link_options(file_plugin PRIVATE
+ target_link_libraries(file_plugin PRIVATE util roctracer hsa-runtime64::hsa-runtime64 stdc++fs)
+
+ install(TARGETS file_plugin LIBRARY
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}
+- COMPONENT runtime)
+\ No newline at end of file
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ COMPONENT runtime)
diff --git a/dev-util/roctracer/files/roctracer-5.3.3-rocm-path.patch b/dev-util/roctracer/files/roctracer-5.3.3-rocm-path.patch
new file mode 100644
index 000000000000..d8cc792b4dbb
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-5.3.3-rocm-path.patch
@@ -0,0 +1,12 @@
+Append flags for clang to recognize device lib path
+===================================================================
+--- roctracer-rocm-5.3.3.orig/test/CMakeLists.txt
++++ roctracer-rocm-5.3.3/test/CMakeLists.txt
+@@ -80,6 +80,7 @@ add_dependencies(mytest codeobj_test)
+ function(generate_hsaco TARGET_ID INPUT_FILE OUTPUT_FILE)
+ separate_arguments(CLANG_ARG_LIST UNIX_COMMAND
+ "-O2 -x cl -Xclang -finclude-default-header -cl-denorms-are-zero -cl-std=CL2.0 -Wl,--build-id=sha1
++ --rocm-path=@GENTOO_PORTAGE_EPREFIX@/usr --rocm-device-lib-path=@GENTOO_PORTAGE_EPREFIX@/usr/lib/amdgcn/bitcode
+ -target amdgcn-amd-amdhsa -mcpu=${TARGET_ID} -o ${OUTPUT_FILE} ${INPUT_FILE}")
+ add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/${OUTPUT_FILE}
+ COMMAND clang ${CLANG_ARG_LIST}
diff --git a/dev-util/roctracer/metadata.xml b/dev-util/roctracer/metadata.xml
index 899809591942..1d728a2f4ec4 100644
--- a/dev-util/roctracer/metadata.xml
+++ b/dev-util/roctracer/metadata.xml
@@ -9,6 +9,10 @@
<email>candrews@gentoo.org</email>
<name>Craig Andrews</name>
</maintainer>
+ <maintainer type="person" proxied="yes">
+ <email>xgreenlandforwyy@gmail.com</email>
+ <name>Yiyang Wu</name>
+ </maintainer>
<maintainer type="person" proxied="yes">
<email>gentoo@holzke.net</email>
<name>Wilfried Holzke</name>
diff --git a/dev-util/roctracer/roctracer-5.3.3.ebuild b/dev-util/roctracer/roctracer-5.3.3.ebuild
new file mode 100644
index 000000000000..a053427379df
--- /dev/null
+++ b/dev-util/roctracer/roctracer-5.3.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+ROCM_VERSION=${PV}
+
+inherit cmake prefix python-any-r1 rocm
+
+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"
+S="${WORKDIR}/roctracer-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/rocr-runtime:${SLOT}
+ dev-util/hip:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ $(python_gen_any_dep '
+ dev-python/CppHeaderParser[${PYTHON_USEDEP}]
+ dev-python/ply[${PYTHON_USEDEP}]
+ ')
+"
+
+PATCHES=( "${FILESDIR}"/roctracer-5.3.3-flat-lib-layout.patch
+ "${FILESDIR}"/roctracer-5.3.3-do-not-install-test-files.patch )
+
+python_check_deps() {
+ python_has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]" \
+ "dev-python/ply[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ hprefixify script/*.py
+ eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.3.3-rocm-path.patch)
+}
+
+src_configure() {
+ export ROCM_PATH="$(hipconfig -p)"
+ local mycmakeargs=(
+ -DCMAKE_MODULE_PATH="${EPREFIX}/usr/lib64/cmake/hip"
+ -DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+ -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ check_amdgpu
+ cd "${BUILD_DIR}" || die
+ # if LD_LIBRARY_PATH not set, dlopen cannot find correct lib
+ LD_LIBRARY_PATH="${EPREFIX}"/usr/lib64 bash run.sh || die
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/, dev-util/roctracer/files/
@ 2023-02-01 9:53 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2023-02-01 9:53 UTC (permalink / raw
To: gentoo-commits
commit: 5220a4a1e32425b56ad7411dceeb0a0d6667e0e7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 22:21:28 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 09:52:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5220a4a1
dev-util/roctracer: drop 5.0.2-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-util/roctracer/Manifest | 2 -
.../roctracer/files/roctracer-4.3.0-ldflag.patch | 13 ----
.../files/roctracer-4.3.0-no-aqlprofile.patch | 20 ------
.../files/roctracer-4.3.0-tracer_tool.patch | 35 ----------
dev-util/roctracer/roctracer-5.0.2-r1.ebuild | 80 ----------------------
5 files changed, 150 deletions(-)
diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index 26b776a9f8a0..457c47217b7e 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -1,6 +1,4 @@
DIST hsa-class-f8b3870.tar.gz 37432 BLAKE2B c2a09e4a4c3708e8db432378874c63b9cefefb567ad19a9c17181ed2b60f38d0591a618f72b11f606eb44efc5e170adaf72f0ec1b93cde628ca2230a62e2d6de SHA512 f371a955bf59b7e0af07261981a6e68562fad0753d3f39d1e220034c17501abf839ed2fd88fbf376d659970395c8795a82c0560c7ed8d3b87c11c79864f5f612
-DIST rocm-tracer-5.0.2.tar.gz 474669 BLAKE2B b350111590140e1282338e4f134caf6228677c49361ceb9bc7ba0da8709346daa4fd014644c04adff0e903dba6014a84edd2eb3a5c132a8f91b479e4d5b085e5 SHA512 3fc1449cc9c9bf83e5233a7a0e83c0e3fa9da225d5ee4427b7d6fa15e3580497e1b9fbcd63892e4a99df01582aecd3ccfd66d2a19af2d8c25949ee705894ea44
DIST rocm-tracer-5.1.3.tar.gz 511617 BLAKE2B 4142979b3b7d649798a7ac0b2a04b42aa7fbcbf82f2cf51b0e5363ec0da538046d6e59283d0ce1bfd341317bf24ac2f694d5c8a7d1f132f9b21caea5caf7eda3 SHA512 e73b0c921ffbdcac571d8b0825de39bd8a4fd5f2720ecdd0c189951db85efb607a0b1cd7a9bb02b3dbf329b277cb5e197525216a8e8927eea4e6ce290b7e7c7b
DIST rocm-tracer-5.3.3.tar.gz 353041 BLAKE2B b7614707ae3af2f5a46d058dacadfb0ef3b980963ac49face66a80c8396e66cf13e0430ab41737ba15e163f5da03697376b13238ea1decfe7ee4a7f31c7664a5 SHA512 95a202f76f6b68a35942750233bd09d372a9be843150d7ec02824da13c6b9a7c8da7a752ac69f66776e7ccfb6176473745dc46a7baadfe77c99c0596fbc2ffeb
-DIST rocprofiler-5.0.2.tar.gz 1401732 BLAKE2B ae870bc50dbd39c11e24f77ccb41773df1107b76cb7a12e1cebc66f8d66ddba6ad3bd6f9fe61657b03b22ef35f88fb608cf6070178f6aab24fe7a1bdcac43a96 SHA512 244e2b827126b7299ec0510daa5e1245a4a5a877394419f8bc9113f443231f67fc935609cbde6eeb26bb138ab4e95e2a88829ffa79ecc8f9881b5a77b5910c02
DIST rocprofiler-5.1.3.tar.gz 1402172 BLAKE2B 16e9b127ede94a3f96056e84a2942b6c9f3aec90579fb12796ab8ba385160aa020e3dc77f7a475dadbc0a813a823ae733ca9560f6a09e55c4c82b13dd792dfa4 SHA512 6e9932a425eaaa2a1e1741280d7525c6360700f85edb3bcf4967fe9be4fed662bae0d2ba609701f0d9733769c340e93e32076024b27bab3303449c1d68d9e1ce
diff --git a/dev-util/roctracer/files/roctracer-4.3.0-ldflag.patch b/dev-util/roctracer/files/roctracer-4.3.0-ldflag.patch
deleted file mode 100644
index a1db6922158a..000000000000
--- a/dev-util/roctracer/files/roctracer-4.3.0-ldflag.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: roctracer-rocm-4.3.0/cmake_modules/env.cmake
-===================================================================
---- roctracer-rocm-4.3.0.orig/cmake_modules/env.cmake
-+++ roctracer-rocm-4.3.0/cmake_modules/env.cmake
-@@ -51,7 +51,7 @@ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS
- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmerge-all-constants" )
- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" )
-
--set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bdynamic -Wl,-z,noexecstack" )
-+set ( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bdynamic -Wl,-z,noexecstack" )
-
- set ( CMAKE_SKIP_BUILD_RPATH TRUE )
-
diff --git a/dev-util/roctracer/files/roctracer-4.3.0-no-aqlprofile.patch b/dev-util/roctracer/files/roctracer-4.3.0-no-aqlprofile.patch
deleted file mode 100644
index 0548953f3089..000000000000
--- a/dev-util/roctracer/files/roctracer-4.3.0-no-aqlprofile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Skip loading proprietary AQLProfile lib
-Index: roctracer-rocm-5.1.3/src/util/hsa_rsrc_factory.cpp
-===================================================================
---- roctracer-rocm-5.1.3.orig/src/util/hsa_rsrc_factory.cpp
-+++ roctracer-rocm-5.1.3/src/util/hsa_rsrc_factory.cpp
-@@ -127,14 +127,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool init
- if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR);
- if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR);
-
-- // Get AqlProfile API table
-- aqlprofile_api_ = {0};
--#ifdef ROCP_LD_AQLPROFILE
-- status = LoadAqlProfileLib(&aqlprofile_api_);
--#else
-- status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_);
--#endif
-- CHECK_STATUS("aqlprofile API table load failed", status);
-
- // Get Loader API table
- loader_api_ = {0};
diff --git a/dev-util/roctracer/files/roctracer-4.3.0-tracer_tool.patch b/dev-util/roctracer/files/roctracer-4.3.0-tracer_tool.patch
deleted file mode 100644
index f59c83a96110..000000000000
--- a/dev-util/roctracer/files/roctracer-4.3.0-tracer_tool.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: roctracer-rocm-4.3.0/test/CMakeLists.txt
-===================================================================
---- roctracer-rocm-4.3.0.orig/test/CMakeLists.txt
-+++ roctracer-rocm-4.3.0/test/CMakeLists.txt
-@@ -75,7 +75,7 @@ set ( TEST_DIR ${HSA_TEST_DIR} )
- set ( TEST_DIR ${TMP} )
-
- ## Util sources
--file( GLOB UTIL_SRC "${HSA_TEST_DIR}/util/*.cpp" )
-+file( GLOB UTIL_SRC "${CMAKE_CURRENT_SOURCE_DIR}/../src/util/*.cpp" )
-
- if ( DEFINED ROCTRACER_TARGET )
- ## Build test library
-Index: roctracer-rocm-4.3.0/test/tool/tracer_tool.cpp
-===================================================================
---- roctracer-rocm-4.3.0.orig/test/tool/tracer_tool.cpp
-+++ roctracer-rocm-4.3.0/test/tool/tracer_tool.cpp
-@@ -285,7 +285,7 @@ void stop_callback() { roctracer::RocTxL
- void roctx_flush_cb(roctx_trace_entry_t* entry) {
- #if ROCTX_CLOCK_TIME
- timestamp_t timestamp = 0;
-- HsaRsrcFactory::Instance().GetTimestamp(HsaTimer::TIME_ID_CLOCK_MONOTONIC, entry->time, ×tamp);
-+ util::HsaRsrcFactory::Instance().GetTimestamp(HsaTimer::TIME_ID_CLOCK_MONOTONIC, entry->time, ×tamp);
- #else
- const timestamp_t timestamp = entry->time;
- #endif
-@@ -1148,7 +1148,7 @@ extern "C" PUBLIC_API bool OnLoad(HsaApi
-
- // Dumping HSA handles for agents and pools
- FILE* handles_file_handle = open_output_file(output_prefix, "hsa_handles.txt");
-- HsaRsrcFactory::Instance().DumpHandles(handles_file_handle);
-+ util::HsaRsrcFactory::Instance().DumpHandles(handles_file_handle);
- close_output_file(handles_file_handle);
-
- ONLOAD_TRACE_END();
diff --git a/dev-util/roctracer/roctracer-5.0.2-r1.ebuild b/dev-util/roctracer/roctracer-5.0.2-r1.ebuild
deleted file mode 100644
index c3cdfe4a814f..000000000000
--- a/dev-util/roctracer/roctracer-5.0.2-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake prefix python-any-r1
-
-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
- https://github.com/ROCmSoftwarePlatform/hsa-class/archive/f8b387043b9f510afdf2e72e38a011900360d6ab.tar.gz -> hsa-class-f8b3870.tar.gz"
-S="${WORKDIR}/roctracer-rocm-${PV}"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-libs/rocr-runtime:${SLOT}
- dev-util/hip:${SLOT}"
-DEPEND="${RDEPEND}"
-BDEPEND="
- $(python_gen_any_dep '
- dev-python/CppHeaderParser[${PYTHON_USEDEP}]
- dev-python/ply[${PYTHON_USEDEP}]
- ')
-"
-
-PATCHES=(
- # https://github.com/ROCm-Developer-Tools/roctracer/pull/63
- "${FILESDIR}"/${PN}-4.3.0-glibc-2.34.patch
- "${FILESDIR}"/${PN}-4.3.0-ldflag.patch
- "${FILESDIR}"/${PN}-4.3.0-tracer_tool.patch
- "${FILESDIR}"/${PN}-5.0.2-Werror.patch
- "${FILESDIR}"/${PN}-5.0.2-headers.patch
- "${FILESDIR}"/${PN}-5.0.2-strip-license.patch
- "${FILESDIR}"/${PN}-4.3.0-no-aqlprofile.patch
-)
-
-python_check_deps() {
- python_has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]" \
- "dev-python/ply[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- cmake_src_prepare
-
- mv "${WORKDIR}"/rocprofiler-rocm-${PV} "${WORKDIR}"/rocprofiler || die
- mv "${WORKDIR}"/hsa-class-*/test/util "${S}"/inc/ || die
- rm "${S}"/inc/util/hsa* || die
- cp -a "${S}"/src/util/hsa* "${S}"/inc/util/ || die
-
- # change destination for headers to include/roctracer;
-
- sed -e "/LIBRARY DESTINATION/s,lib,$(get_libdir)," \
- -e "/DESTINATION/s,\${DEST_NAME}/include,include/roctracer," \
- -e "/install ( FILES \${PROJECT_BINARY_DIR}\/so/d" \
- -e "/DESTINATION/s,\${DEST_NAME}/lib64,$(get_libdir),g" \
- -i CMakeLists.txt || die
-
- # do not download additional sources via git
- sed -e "/execute_process ( COMMAND sh -xc \"if/d" \
- -e "/add_subdirectory ( \${HSA_TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
- -e "/DESTINATION/s,\${DEST_NAME}/tool,$(get_libdir),g" \
- -i test/CMakeLists.txt || die
-
- hprefixify script/*.py
-}
-
-src_configure() {
- export HIP_PATH="$(hipconfig -p)"
-
- local mycmakeargs=(
- -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa"
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-02-01 9:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-01 14:43 [gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/, dev-util/roctracer/files/ Benda XU
-- strict thread matches above, loose matches on Subject: below --
2023-02-01 9:53 Andreas Sturmlechner
2023-01-31 14:18 Benda XU
2022-08-08 1:38 Benda XU
2021-10-30 16:47 David Seifert
2021-01-24 7:43 Benda XU
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox