* [gentoo-commits] repo/gentoo:master commit in: dev-util/rocprofiler/files/, dev-util/rocprofiler/
@ 2022-06-22 18:35 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2022-06-22 18:35 UTC (permalink / raw
To: gentoo-commits
commit: 548d7270d6a895bcd7ce4af5bb6417e8508d2175
Author: Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Tue Jun 14 08:02:26 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 18:35:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=548d7270
dev-util/rocprofiler: QA fixes
Closes: https://bugs.gentoo.org/851792
Closes: https://bugs.gentoo.org/851795
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
dev-util/rocprofiler/files/rocprofiler-4.3.0-ldflag.patch | 13 +++++++++++++
dev-util/rocprofiler/files/rocprofiler-4.3.0-nostrip.patch | 13 +++++++++++++
dev-util/rocprofiler/rocprofiler-4.3.0.ebuild | 2 ++
dev-util/rocprofiler/rocprofiler-5.0.2.ebuild | 4 +++-
4 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/dev-util/rocprofiler/files/rocprofiler-4.3.0-ldflag.patch b/dev-util/rocprofiler/files/rocprofiler-4.3.0-ldflag.patch
new file mode 100644
index 000000000000..dc097a568ca4
--- /dev/null
+++ b/dev-util/rocprofiler/files/rocprofiler-4.3.0-ldflag.patch
@@ -0,0 +1,13 @@
+Index: rocprofiler-rocm-5.0.2/cmake_modules/env.cmake
+===================================================================
+--- rocprofiler-rocm-5.0.2.orig/cmake_modules/env.cmake
++++ rocprofiler-rocm-5.0.2/cmake_modules/env.cmake
+@@ -51,7 +51,7 @@ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS
+ #set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=int-in-bool-context" )
+ 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/rocprofiler/files/rocprofiler-4.3.0-nostrip.patch b/dev-util/rocprofiler/files/rocprofiler-4.3.0-nostrip.patch
new file mode 100644
index 000000000000..3da3d99357f7
--- /dev/null
+++ b/dev-util/rocprofiler/files/rocprofiler-4.3.0-nostrip.patch
@@ -0,0 +1,13 @@
+Index: rocprofiler-rocm-5.0.2/cmake_modules/env.cmake
+===================================================================
+--- rocprofiler-rocm-5.0.2.orig/cmake_modules/env.cmake
++++ rocprofiler-rocm-5.0.2/cmake_modules/env.cmake
+@@ -92,8 +92,6 @@ string ( TOLOWER "${CMAKE_BUILD_TYPE}" C
+ if ( "${CMAKE_BUILD_TYPE}" STREQUAL debug )
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb" )
+ set ( CMAKE_BUILD_TYPE "debug" )
+-else ()
+- set ( CMAKE_BUILD_TYPE "release" )
+ endif ()
+
+ ## Extend Compiler flags based on Processor architecture
diff --git a/dev-util/rocprofiler/rocprofiler-4.3.0.ebuild b/dev-util/rocprofiler/rocprofiler-4.3.0.ebuild
index 28e57bde66a4..630f4754fc8f 100644
--- a/dev-util/rocprofiler/rocprofiler-4.3.0.ebuild
+++ b/dev-util/rocprofiler/rocprofiler-4.3.0.ebuild
@@ -27,6 +27,8 @@ BDEPEND="
"
PATCHES=( "${FILESDIR}/${P}-fix-gcc11.patch"
+ "${FILESDIR}/${PN}-4.3.0-nostrip.patch"
+ "${FILESDIR}/${PN}-4.3.0-ldflag.patch"
"${FILESDIR}/${PN}-4.3.0-gentoo-location.patch" )
python_check_deps() {
diff --git a/dev-util/rocprofiler/rocprofiler-5.0.2.ebuild b/dev-util/rocprofiler/rocprofiler-5.0.2.ebuild
index ff321726622e..7e8f0346636d 100644
--- a/dev-util/rocprofiler/rocprofiler-5.0.2.ebuild
+++ b/dev-util/rocprofiler/rocprofiler-5.0.2.ebuild
@@ -26,7 +26,9 @@ BDEPEND="
')
"
-PATCHES=( "${FILESDIR}/${PN}-5.0.2-gentoo-location.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.3.0-nostrip.patch"
+ "${FILESDIR}/${PN}-4.3.0-ldflag.patch"
+ "${FILESDIR}/${PN}-5.0.2-gentoo-location.patch" )
python_check_deps() {
has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/rocprofiler/files/, dev-util/rocprofiler/
@ 2022-12-19 14:00 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-12-19 14:00 UTC (permalink / raw
To: gentoo-commits
commit: f5ff9bd0d88c6997658ec14a8798ef990d2742de
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 13:33:10 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=f5ff9bd0
dev-util/rocprofiler: drop 4.3.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-util/rocprofiler/Manifest | 1 -
.../files/rocprofiler-4.3.0-fix-gcc11.patch | 13 ----
.../files/rocprofiler-4.3.0-gentoo-location.patch | 71 ----------------------
dev-util/rocprofiler/rocprofiler-4.3.0-r1.ebuild | 61 -------------------
4 files changed, 146 deletions(-)
diff --git a/dev-util/rocprofiler/Manifest b/dev-util/rocprofiler/Manifest
index b4695fc215a2..23a43f49ce08 100644
--- a/dev-util/rocprofiler/Manifest
+++ b/dev-util/rocprofiler/Manifest
@@ -1,3 +1,2 @@
-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/rocprofiler/files/rocprofiler-4.3.0-fix-gcc11.patch b/dev-util/rocprofiler/files/rocprofiler-4.3.0-fix-gcc11.patch
deleted file mode 100644
index 0aec99627a4a..000000000000
--- a/dev-util/rocprofiler/files/rocprofiler-4.3.0-fix-gcc11.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rocprofiler-rocm-4.3.0/test/ctrl/test_kernel.h
-===================================================================
---- rocprofiler-rocm-4.3.0.orig/test/ctrl/test_kernel.h
-+++ rocprofiler-rocm-4.3.0/test/ctrl/test_kernel.h
-@@ -23,7 +23,7 @@ THE SOFTWARE.
- #ifndef TEST_CTRL_TEST_KERNEL_H_
- #define TEST_CTRL_TEST_KERNEL_H_
-
--#include <string.h>
-+#include <string>
- #include <stdint.h>
- #include <map>
-
diff --git a/dev-util/rocprofiler/files/rocprofiler-4.3.0-gentoo-location.patch b/dev-util/rocprofiler/files/rocprofiler-4.3.0-gentoo-location.patch
deleted file mode 100644
index b6d8454dfedd..000000000000
--- a/dev-util/rocprofiler/files/rocprofiler-4.3.0-gentoo-location.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Index: rocprofiler-rocm-4.3.0/bin/rpl_run.sh
-===================================================================
---- rocprofiler-rocm-4.3.0.orig/bin/rpl_run.sh
-+++ rocprofiler-rocm-4.3.0/bin/rpl_run.sh
-@@ -25,18 +25,18 @@
- time_stamp=`date +%y%m%d_%H%M%S`
- BIN_DIR=$(dirname $(realpath ${BASH_SOURCE[0]}))
- PKG_DIR=$(dirname $BIN_DIR)
--ROOT_DIR=$(dirname $PKG_DIR)
--TT_DIR=$ROOT_DIR/roctracer
-+ROOT_DIR=$PKG_DIR
-+TT_DIR=$ROOT_DIR
- RUN_DIR=`pwd`
- TMP_DIR="/tmp"
- DATA_DIR="rpl_data_${time_stamp}_$$"
-
--RPL_PATH=$PKG_DIR/lib
--TLIB_PATH=$PKG_DIR/tool
--TTLIB_PATH=$TT_DIR/tool
--ROCM_LIB_PATH=$ROOT_DIR/lib
-+RPL_PATH=$PKG_DIR/@LIB_DIR@
-+TLIB_PATH=$PKG_DIR/@LIB_DIR@
-+TTLIB_PATH=$TT_DIR/@LIB_DIR@
-+ROCM_LIB_PATH=$ROOT_DIR/@LIB_DIR@
-
--GFX=`/opt/rocm/bin/rocm_agent_enumerator | tail -1`
-+GFX=`rocm_agent_enumerator | tail -1`
-
- SPM_COUNTERS_FILE="spm_counters.txt"
-
-@@ -75,7 +75,7 @@ export ROCP_HSA_INTERCEPT=1
- # Disabling internal ROC Profiler proxy queue (simple version supported for testing purposes)
- unset ROCP_PROXY_QUEUE
- # ROC Profiler metrics definition
--export ROCP_METRICS=$PKG_DIR/lib/metrics.xml
-+export ROCP_METRICS=$PKG_DIR/share/rocprofiler/metrics.xml
- # Disable AQL-profile read API
- export AQLPROFILE_READ_API=0
- # ROC Profiler package path
-@@ -109,7 +109,7 @@ usage() {
- bin_name=`basename $0`
- echo "ROCm Profiling Library (RPL) run script, a part of ROCprofiler library package."
- echo "Full path: $BIN_DIR/$bin_name"
-- echo "Metrics definition: $PKG_DIR/lib/metrics.xml"
-+ echo "Metrics definition: $PKG_DIR/share/rocprofiler/metrics.xml"
- echo ""
- echo "Usage:"
- echo " $bin_name [-h] [--list-basic] [--list-derived] [-i <input .txt/.xml file>] [-o <output CSV file>] <app command line>"
-@@ -270,7 +270,7 @@ run() {
- fi
- if [ "$KFD_TRACE" = 1 ] ; then
- API_TRACE=${API_TRACE}":kfd"
-- MY_LD_PRELOAD="$TT_DIR/lib/libkfdwrapper64.so $ROCM_LIB_PATH/libhsakmt.so.1 $MY_LD_PRELOAD"
-+ MY_LD_PRELOAD="$TTLIB_PATH/libkfdwrapper64.so $ROCM_LIB_PATH/libhsakmt.so.1 $MY_LD_PRELOAD"
- fi
- if [ "$HIP_TRACE" = 1 ] ; then
- API_TRACE=${API_TRACE}":hip"
-@@ -380,11 +380,11 @@ while [ 1 ] ; do
- export ROCP_METRICS="$2"
- elif [ "$1" = "--list-basic" ] ; then
- export ROCP_INFO=b
-- HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PKG_DIR/tool/ctrl"
-+ HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PKG_DIR/bin/ctrl"
- exit 1
- elif [ "$1" = "--list-derived" ] ; then
- export ROCP_INFO=d
-- HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PKG_DIR/tool/ctrl"
-+ HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PKG_DIR/bin/ctrl"
- exit 1
- elif [ "$1" = "--basenames" ] ; then
- if [ "$2" = "on" ] ; then
diff --git a/dev-util/rocprofiler/rocprofiler-4.3.0-r1.ebuild b/dev-util/rocprofiler/rocprofiler-4.3.0-r1.ebuild
deleted file mode 100644
index bd3cb998a285..000000000000
--- a/dev-util/rocprofiler/rocprofiler-4.3.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=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake 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/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-rocm-${PV}"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-libs/rocr-runtime:${SLOT}
- >=dev-util/roctracer-${PV}-r3:${SLOT}
- "
-DEPEND="${RDEPEND}"
-BDEPEND="
- $(python_gen_any_dep '
- dev-python/CppHeaderParser[${PYTHON_USEDEP}]
- ')
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-gcc11.patch"
- "${FILESDIR}/${PN}-4.3.0-nostrip.patch"
- "${FILESDIR}/${PN}-4.3.0-no-aqlprofile.patch"
- "${FILESDIR}/${PN}-4.3.0-ldflag.patch"
- "${FILESDIR}/${PN}-4.3.0-gentoo-location.patch" )
-
-python_check_deps() {
- python_has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- sed -e "s,\${DEST_NAME}/lib,$(get_libdir),g" \
- -e "s,\${DEST_NAME}/include,include/\${DEST_NAME},g" \
- -e "s,\${DEST_NAME}/bin,bin,g" \
- -e "/ctrl DESTINATION/s,\${DEST_NAME}/tool,bin,g" \
- -e "/CPACK_RESOURCE_FILE_LICENSE/d" \
- -e "/libtool.so DESTINATION/s,\${DEST_NAME}/tool,$(get_libdir),g" -i CMakeLists.txt || die
-
- cmake_src_prepare
-
- sed -e "s,@LIB_DIR@,$(get_libdir),g" -i bin/rpl_run.sh || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
- -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa"
- -DPROF_API_HEADER_PATH="${EPREFIX}"/usr/include/roctracer/ext
- -DUSE_PROF_API=1
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/rocprofiler/files/, dev-util/rocprofiler/
@ 2023-01-31 14:18 Benda XU
0 siblings, 0 replies; 3+ messages in thread
From: Benda XU @ 2023-01-31 14:18 UTC (permalink / raw
To: gentoo-commits
commit: acf7743519df9e0592827326467127316aaa1439
Author: Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Fri Jan 27 15:11:14 2023 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 14:18:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf77435
dev-util/rocprofiler: strip -Werror
Closes: https://bugs.gentoo.org/888867
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
.../rocprofiler/files/rocprofiler-5.1.3-remove-Werror.patch | 12 ++++++++++++
dev-util/rocprofiler/rocprofiler-5.1.3-r1.ebuild | 3 ++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/dev-util/rocprofiler/files/rocprofiler-5.1.3-remove-Werror.patch b/dev-util/rocprofiler/files/rocprofiler-5.1.3-remove-Werror.patch
new file mode 100644
index 000000000000..a30d6d6d00a7
--- /dev/null
+++ b/dev-util/rocprofiler/files/rocprofiler-5.1.3-remove-Werror.patch
@@ -0,0 +1,12 @@
+Index: rocprofiler-rocm-5.1.3/cmake_modules/env.cmake
+===================================================================
+--- rocprofiler-rocm-5.1.3.orig/cmake_modules/env.cmake
++++ rocprofiler-rocm-5.1.3/cmake_modules/env.cmake
+@@ -38,7 +38,6 @@ add_definitions ( -DHSA_DEPRECATED= )
+ ## 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} -fvisibility=hidden" )
diff --git a/dev-util/rocprofiler/rocprofiler-5.1.3-r1.ebuild b/dev-util/rocprofiler/rocprofiler-5.1.3-r1.ebuild
index ded4edd1ce8e..e63978351e11 100644
--- a/dev-util/rocprofiler/rocprofiler-5.1.3-r1.ebuild
+++ b/dev-util/rocprofiler/rocprofiler-5.1.3-r1.ebuild
@@ -28,7 +28,8 @@ BDEPEND="
PATCHES=( "${FILESDIR}/${PN}-4.3.0-nostrip.patch"
"${FILESDIR}/${PN}-4.3.0-no-aqlprofile.patch"
- "${FILESDIR}/${PN}-5.0.2-gentoo-location.patch" )
+ "${FILESDIR}/${PN}-5.0.2-gentoo-location.patch"
+ "${FILESDIR}/${PN}-5.1.3-remove-Werror.patch" )
python_check_deps() {
python_has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-31 14:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-31 14:18 [gentoo-commits] repo/gentoo:master commit in: dev-util/rocprofiler/files/, dev-util/rocprofiler/ Benda XU
-- strict thread matches above, loose matches on Subject: below --
2022-12-19 14:00 Andreas Sturmlechner
2022-06-22 18:35 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox