public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/files/, dev-util/roctracer/
@ 2022-06-13 12:00 Benda XU
  0 siblings, 0 replies; 5+ messages in thread
From: Benda XU @ 2022-06-13 12:00 UTC (permalink / raw
  To: gentoo-commits

commit:     d4034da0890695292c0c2d24aba60446bcf8a465
Author:     Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Tue May 10 14:33:21 2022 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 12:00:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4034da0

dev-util/roctracer: compile tarcer_tool for rocprofiler

- patch out loading libhsa-amd-aqlprofile64.so
- Use `hipconfig -p` to determine HIP_PATH

Bug: https://github.com/gentoo/gentoo/pull/25536
Bug: https://bugs.gentoo.org/716948
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 dev-util/roctracer/Manifest                        |  2 ++
 .../files/roctracer-4.3.0-tracer_tool.patch        | 35 ++++++++++++++++++++++
 ...r-4.3.0-r1.ebuild => roctracer-4.3.0-r2.ebuild} | 17 +++++++----
 dev-util/roctracer/roctracer-5.0.2.ebuild          | 17 ++++++++---
 4 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index 9c8b51497026..ff14bd213a4e 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -1,3 +1,5 @@
+DIST hsa-class-4.3.0.tar.gz 37431 BLAKE2B 6fa2eb327256c44e0b9af3f0eabc775059d0e37ea976be155d4c6f05c73489abbf3abda20683c3ca4c720c2e6899c690d2a104decb56f80a8f76dde0a1cc08ef SHA512 4d0c554f6ecc66495d9493df39cc7a00c2912c93285146e891efa6b636b2b44ba9b6447fada5e664fce3329abd2670333e61cc2978e9e4f5973e99d165a93131
+DIST hsa-class-f8b3870.tar.gz 37432 BLAKE2B c2a09e4a4c3708e8db432378874c63b9cefefb567ad19a9c17181ed2b60f38d0591a618f72b11f606eb44efc5e170adaf72f0ec1b93cde628ca2230a62e2d6de SHA512 f371a955bf59b7e0af07261981a6e68562fad0753d3f39d1e220034c17501abf839ed2fd88fbf376d659970395c8795a82c0560c7ed8d3b87c11c79864f5f612
 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

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
new file mode 100644
index 000000000000..f59c83a96110
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-4.3.0-tracer_tool.patch
@@ -0,0 +1,35 @@
+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, &timestamp);
++  util::HsaRsrcFactory::Instance().GetTimestamp(HsaTimer::TIME_ID_CLOCK_MONOTONIC, entry->time, &timestamp);
+ #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-4.3.0-r1.ebuild b/dev-util/roctracer/roctracer-4.3.0-r2.ebuild
similarity index 77%
rename from dev-util/roctracer/roctracer-4.3.0-r1.ebuild
rename to dev-util/roctracer/roctracer-4.3.0-r2.ebuild
index 5b0d3c3f5b5d..1daabb2c9bc6 100644
--- a/dev-util/roctracer/roctracer-4.3.0-r1.ebuild
+++ b/dev-util/roctracer/roctracer-4.3.0-r2.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,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/ROCm-Developer-Tools/rocprofiler/archive/rocm-${PV}.tar.gz -> rocprofiler-${PV}.tar.gz
+		https://github.com/ROCmSoftwarePlatform/hsa-class/archive/master.tar.gz -> hsa-class-${PV}.tar.gz"
 S="${WORKDIR}/roctracer-rocm-${PV}"
 
 LICENSE="MIT"
@@ -30,6 +31,7 @@ BDEPEND="
 PATCHES=(
 	# https://github.com/ROCm-Developer-Tools/roctracer/pull/63
 	"${FILESDIR}"/${PN}-4.3.0-glibc-2.34.patch
+	"${FILESDIR}"/${PN}-4.3.0-tracer_tool.patch
 )
 
 python_check_deps() {
@@ -39,21 +41,24 @@ python_check_deps() {
 
 src_prepare() {
 	mv "${WORKDIR}"/rocprofiler-rocm-${PV} "${WORKDIR}"/rocprofiler || die
+	mv "${WORKDIR}"/ROCmSoftwarePlatform-hsa-class*/test/util "${S}"/inc/ || die
+	rm "${S}"/inc/util/hsa* || die
+	cp -a "${S}"/src/util/hsa* "${S}"/inc/util/ || die
 
 	# 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 \${PROJECT_BINARY_DIR}\/so/d" \
-		-e "/DESTINATION/s,\${DEST_NAME}/lib64,$(get_libdir)/roctracer,g" \
+		-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
@@ -62,7 +67,7 @@ src_prepare() {
 }
 
 src_configure() {
-	export HIP_PATH="${EPREFIX}/usr/lib/hip"
+	export HIP_PATH="$(hipconfig -p)"
 
 	local mycmakeargs=(
 		-DHIP_VDI=1

diff --git a/dev-util/roctracer/roctracer-5.0.2.ebuild b/dev-util/roctracer/roctracer-5.0.2.ebuild
index 7c53e956e347..755100264624 100644
--- a/dev-util/roctracer/roctracer-5.0.2.ebuild
+++ b/dev-util/roctracer/roctracer-5.0.2.ebuild
@@ -3,14 +3,15 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..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/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"
@@ -30,6 +31,7 @@ BDEPEND="
 PATCHES=(
 	# https://github.com/ROCm-Developer-Tools/roctracer/pull/63
 	"${FILESDIR}"/${PN}-4.3.0-glibc-2.34.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
@@ -44,22 +46,29 @@ 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 "/add_subdirectory ( \${TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
+		-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="${EPREFIX}/usr"
+	export HIP_PATH="$(hipconfig -p)"
 
 	local mycmakeargs=(
 		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa"


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/files/, dev-util/roctracer/
@ 2022-06-22 18:35 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2022-06-22 18:35 UTC (permalink / raw
  To: gentoo-commits

commit:     e8114ae86f9257cfcb4fd37a0ea228e6bdf6bae9
Author:     Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Wed Jun 22 13:49:13 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 18:35:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8114ae8

dev-util/roctracer: patch to respect LDFLAG

Closes: https://bugs.gentoo.org/766851
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25891
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-util/roctracer/files/roctracer-4.3.0-ldflag.patch | 13 +++++++++++++
 dev-util/roctracer/roctracer-4.3.0-r2.ebuild          |  1 +
 dev-util/roctracer/roctracer-5.0.2.ebuild             |  1 +
 3 files changed, 15 insertions(+)

diff --git a/dev-util/roctracer/files/roctracer-4.3.0-ldflag.patch b/dev-util/roctracer/files/roctracer-4.3.0-ldflag.patch
new file mode 100644
index 000000000000..a1db6922158a
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-4.3.0-ldflag.patch
@@ -0,0 +1,13 @@
+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/roctracer-4.3.0-r2.ebuild b/dev-util/roctracer/roctracer-4.3.0-r2.ebuild
index 88fb2b6669fb..e5c7872fe3a1 100644
--- a/dev-util/roctracer/roctracer-4.3.0-r2.ebuild
+++ b/dev-util/roctracer/roctracer-4.3.0-r2.ebuild
@@ -31,6 +31,7 @@ BDEPEND="
 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
 )
 

diff --git a/dev-util/roctracer/roctracer-5.0.2.ebuild b/dev-util/roctracer/roctracer-5.0.2.ebuild
index 755100264624..efabd899d252 100644
--- a/dev-util/roctracer/roctracer-5.0.2.ebuild
+++ b/dev-util/roctracer/roctracer-5.0.2.ebuild
@@ -31,6 +31,7 @@ BDEPEND="
 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


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/files/, dev-util/roctracer/
@ 2022-12-19 14:00 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2022-12-19 14:00 UTC (permalink / raw
  To: gentoo-commits

commit:     959a5dfabfb32ca885e3862a98d61171457ee9f8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 13:09:55 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 14:00:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=959a5dfa

dev-util/roctracer: drop 4.0.0-r1, 4.2.0-r1, 4.3.0-r3

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-util/roctracer/Manifest                        |  5 --
 ...roctracer-3.8.0-gen_ostream_ops-toPython3.patch | 28 --------
 dev-util/roctracer/roctracer-4.0.0-r1.ebuild       | 58 ----------------
 dev-util/roctracer/roctracer-4.2.0-r1.ebuild       | 61 -----------------
 dev-util/roctracer/roctracer-4.3.0-r3.ebuild       | 80 ----------------------
 5 files changed, 232 deletions(-)

diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index 2a1578462cf0..890787a739ee 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -1,10 +1,5 @@
 DIST hsa-class-f8b3870.tar.gz 37432 BLAKE2B c2a09e4a4c3708e8db432378874c63b9cefefb567ad19a9c17181ed2b60f38d0591a618f72b11f606eb44efc5e170adaf72f0ec1b93cde628ca2230a62e2d6de SHA512 f371a955bf59b7e0af07261981a6e68562fad0753d3f39d1e220034c17501abf839ed2fd88fbf376d659970395c8795a82c0560c7ed8d3b87c11c79864f5f612
-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 rocm-tracer-5.1.3.tar.gz 511617 BLAKE2B 4142979b3b7d649798a7ac0b2a04b42aa7fbcbf82f2cf51b0e5363ec0da538046d6e59283d0ce1bfd341317bf24ac2f694d5c8a7d1f132f9b21caea5caf7eda3 SHA512 e73b0c921ffbdcac571d8b0825de39bd8a4fd5f2720ecdd0c189951db85efb607a0b1cd7a9bb02b3dbf329b277cb5e197525216a8e8927eea4e6ce290b7e7c7b
-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
 DIST rocprofiler-5.1.3.tar.gz 1402172 BLAKE2B 16e9b127ede94a3f96056e84a2942b6c9f3aec90579fb12796ab8ba385160aa020e3dc77f7a475dadbc0a813a823ae733ca9560f6a09e55c4c82b13dd792dfa4 SHA512 6e9932a425eaaa2a1e1741280d7525c6360700f85edb3bcf4967fe9be4fed662bae0d2ba609701f0d9733769c340e93e32076024b27bab3303449c1d68d9e1ce

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
deleted file mode 100644
index b73949b92331..000000000000
--- a/dev-util/roctracer/files/roctracer-3.8.0-gen_ostream_ops-toPython3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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/roctracer-4.0.0-r1.ebuild b/dev-util/roctracer/roctracer-4.0.0-r1.ebuild
deleted file mode 100644
index 04c9a3080f20..000000000000
--- a/dev-util/roctracer/roctracer-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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
-}

diff --git a/dev-util/roctracer/roctracer-4.2.0-r1.ebuild b/dev-util/roctracer/roctracer-4.2.0-r1.ebuild
deleted file mode 100644
index 37aa6688e7ff..000000000000
--- a/dev-util/roctracer/roctracer-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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="dev-python/CppHeaderParser
-	dev-python/ply
-	${RDEPEND}
-	${PYTHON_DEPS}"
-
-src_prepare() {
-	mv "${WORKDIR}"/rocprofiler-rocm-${PV} "${WORKDIR}"/rocprofiler || die
-
-	# 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 \${PROJECT_BINARY_DIR}/d" \
-		-e "/DESTINATION/s,\${DEST_NAME}/lib64,$(get_libdir)/roctracer,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" \
-		-i test/CMakeLists.txt || die
-
-	hprefixify script/*.py
-
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	export HIP_PATH="${EPREFIX}/usr/lib/hip"
-
-	local mycmakeargs=(
-		-DHIP_VDI=1
-		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa:${EPREFIX}/usr/lib"
-	)
-
-	cmake_src_configure
-}

diff --git a/dev-util/roctracer/roctracer-4.3.0-r3.ebuild b/dev-util/roctracer/roctracer-4.3.0-r3.ebuild
deleted file mode 100644
index a62fc9da4ef7..000000000000
--- a/dev-util/roctracer/roctracer-4.3.0-r3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,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}-4.3.0-no-aqlprofile.patch
-)
-
-python_check_deps() {
-	python_has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]" \
-		"dev-python/ply[${PYTHON_USEDEP}]"
-}
-
-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
-
-	# 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 "/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
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	export HIP_PATH="$(hipconfig -p)"
-
-	local mycmakeargs=(
-		-DHIP_VDI=1
-		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa:${EPREFIX}/usr/lib"
-	)
-
-	cmake_src_configure
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/files/, dev-util/roctracer/
@ 2023-02-08  4:18 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-02-08  4:18 UTC (permalink / raw
  To: gentoo-commits

commit:     4f749acaea36d8ef66c2c4834c598247bb15ae41
Author:     Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Wed Feb  1 09:45:56 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb  8 04:17:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f749aca

dev-util/roctracer: strip -Werror and fix a configure issue

hip-config.cmake run ${HIP_CXX_COMPILER} -print-resource-dir to
determine some paths. By default,
HIP_CXX_COMPILER=${CMAKE_CXX_COMPILER}=gcc, causing configuration
issues, so set HIP_CXX_COMPILER=hipcc.

Closes: https://bugs.gentoo.org/891945
Bug: https://bugs.gentoo.org/892730
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29376
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/roctracer/files/roctracer-5.3.3-Werror.patch | 15 +++++++++++++++
 dev-util/roctracer/roctracer-5.3.3.ebuild             |  4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/dev-util/roctracer/files/roctracer-5.3.3-Werror.patch b/dev-util/roctracer/files/roctracer-5.3.3-Werror.patch
new file mode 100644
index 000000000000..b932bb5cb5d3
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-5.3.3-Werror.patch
@@ -0,0 +1,15 @@
+Should not use the aggressive -Werror flag.
+
+Index: roctracer-rocm-5.3.3/CMakeLists.txt
+===================================================================
+--- roctracer-rocm-5.3.3.orig/CMakeLists.txt
++++ roctracer-rocm-5.3.3/CMakeLists.txt
+@@ -37,7 +37,7 @@ endif()
+ 
+ set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+-add_compile_options(-Wall -Werror)
++add_compile_options(-Wall)
+ 
+ set(THREADS_PREFER_PTHREAD_FLAG ON)
+ 

diff --git a/dev-util/roctracer/roctracer-5.3.3.ebuild b/dev-util/roctracer/roctracer-5.3.3.ebuild
index a053427379df..23e3d7e714e7 100644
--- a/dev-util/roctracer/roctracer-5.3.3.ebuild
+++ b/dev-util/roctracer/roctracer-5.3.3.ebuild
@@ -31,7 +31,8 @@ BDEPEND="
 "
 
 PATCHES=( "${FILESDIR}"/roctracer-5.3.3-flat-lib-layout.patch
-	"${FILESDIR}"/roctracer-5.3.3-do-not-install-test-files.patch )
+	"${FILESDIR}"/roctracer-5.3.3-do-not-install-test-files.patch
+	"${FILESDIR}"/roctracer-5.3.3-Werror.patch )
 
 python_check_deps() {
 	python_has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]" \
@@ -51,6 +52,7 @@ src_configure() {
 		-DCMAKE_MODULE_PATH="${EPREFIX}/usr/lib64/cmake/hip"
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
 		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DHIP_CXX_COMPILER=hipcc
 	)
 
 	cmake_src_configure


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/files/, dev-util/roctracer/
@ 2024-03-08 19:22 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-03-08 19:22 UTC (permalink / raw
  To: gentoo-commits

commit:     ced13561b10895657a9641c7f18e3d04c879952f
Author:     Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Wed Jan 10 21:01:17 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 19:22:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ced13561

dev-util/roctracer: add 5.7.1

Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/roctracer/Manifest                        |  1 +
 .../files/roctracer-5.7.1-with-tests.patch         | 11 +++
 dev-util/roctracer/roctracer-5.7.1-r1.ebuild       | 87 ++++++++++++++++++++++
 3 files changed, 99 insertions(+)

diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index 457c47217b7e..48927e0649b5 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -2,3 +2,4 @@ DIST hsa-class-f8b3870.tar.gz 37432 BLAKE2B c2a09e4a4c3708e8db432378874c63b9cefe
 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.1.3.tar.gz 1402172 BLAKE2B 16e9b127ede94a3f96056e84a2942b6c9f3aec90579fb12796ab8ba385160aa020e3dc77f7a475dadbc0a813a823ae733ca9560f6a09e55c4c82b13dd792dfa4 SHA512 6e9932a425eaaa2a1e1741280d7525c6360700f85edb3bcf4967fe9be4fed662bae0d2ba609701f0d9733769c340e93e32076024b27bab3303449c1d68d9e1ce
+DIST roctracer-5.7.1.tar.gz 354686 BLAKE2B 2e72d8df5cf53a913102a715dab55f7c6d33b2d4a9cad7647a61824deba0363cf3dbf96d8de3469a78d6b5c8e517c163c303bf6aa12eeaf8e43f82ac8381ef97 SHA512 62cf62fc505955426596bd6d539c92f4d730d90d820d817343525f1b7be693290727c8c447ca98b1a0e46d1d188b62b3f4fafcf6bffbf2479fc5d937fb354e13

diff --git a/dev-util/roctracer/files/roctracer-5.7.1-with-tests.patch b/dev-util/roctracer/files/roctracer-5.7.1-with-tests.patch
new file mode 100644
index 000000000000..eb728b8f7237
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-5.7.1-with-tests.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -56,7 +56,7 @@ endif()
+ add_subdirectory(src)
+ 
+ ## Build tests
+-if(${LIBRARY_TYPE} STREQUAL SHARED)
++if(WITH_TESTS)
+   add_subdirectory(test)
+ endif()
+ 

diff --git a/dev-util/roctracer/roctracer-5.7.1-r1.ebuild b/dev-util/roctracer/roctracer-5.7.1-r1.ebuild
new file mode 100644
index 000000000000..e16ea7d01a5a
--- /dev/null
+++ b/dev-util/roctracer/roctracer-5.7.1-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+LLVM_MAX_SLOT=17
+ROCM_VERSION=${PV}
+
+inherit cmake prefix python-any-r1 rocm llvm
+
+DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
+HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer"
+SRC_URI="https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-${PV}.tar.gz -> ${P}.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
+	dev-util/hip"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep '
+	dev-python/CppHeaderParser[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}"/roctracer-5.7.1-with-tests.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)
+
+	# Install libs directly into /usr/lib64
+	sed -e 's:${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}:${CMAKE_INSTALL_LIBDIR}:g' \
+		-i src/CMakeLists.txt plugin/file/CMakeLists.txt || die
+
+	# Remove all install commands for tests
+	sed -E '/^ *install\(.+/d' -i test/CMakeLists.txt || die
+
+	# Fix search path for HIP cmake
+	sed -e "s,\${ROCM_PATH}/lib/cmake,/usr/$(get_libdir)/cmake,g" -i test/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_MODULE_PATH="${EPREFIX}/usr/$(get_libdir)/cmake/hip"
+		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DWITH_TESTS=$(usex test)
+	)
+	use test && mycmakeargs+=(
+		-DCMAKE_FIND_DEBUG_MODE=ON
+		-DHIP_ROOT_DIR="${EPREFIX}/usr"
+		-DHIP_CLANG_INSTALL_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin"
+		-DGPU_TARGETS="$(get_amdgpu_flags)"
+	)
+
+	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/$(get_libdir):${LD_LIBRARY_PATH}" bash run.sh || die
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove unneeded copy
+	rm -r "${ED}/usr/share/doc/${PF}-asan" || die
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-03-08 19:23 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-22 18:35 [gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/files/, dev-util/roctracer/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2024-03-08 19:22 Sam James
2023-02-08  4:18 Sam James
2022-12-19 14:00 Andreas Sturmlechner
2022-06-13 12:00 Benda XU

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox