[gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/, dev-util/roctracer/files/

[Andreas Sturmlechner]

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, &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-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
-}