From f287ecad888abdeb38e617d0485de282cd6819db Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 19 Dec 2022 19:49:08 +0000 Subject: gentoo auto-resync : 19:12:2022 - 19:49:08 --- dev-util/rocprofiler/Manifest | 4 -- .../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, 149 deletions(-) delete mode 100644 dev-util/rocprofiler/files/rocprofiler-4.3.0-fix-gcc11.patch delete mode 100644 dev-util/rocprofiler/files/rocprofiler-4.3.0-gentoo-location.patch delete mode 100644 dev-util/rocprofiler/rocprofiler-4.3.0-r1.ebuild (limited to 'dev-util/rocprofiler') diff --git a/dev-util/rocprofiler/Manifest b/dev-util/rocprofiler/Manifest index 1da176c276eb..732670d32380 100644 --- a/dev-util/rocprofiler/Manifest +++ b/dev-util/rocprofiler/Manifest @@ -1,13 +1,9 @@ -AUX rocprofiler-4.3.0-fix-gcc11.patch 410 BLAKE2B 04516f2da7ed09de30243bb05241489deb9ee23e94ef5014dede9c9d54869d24a8467699cdc7e7fa5840c98102b386555c40ab77c4fe1d9679d2bdf17fb7855f SHA512 170963d5a52b5b42924f39d0dc9b2c6c8e4ae468b97cf453a28d6a1be8f2b5bf49f73de80a40cd98b837038f53bbd4002f9ed83864129c36682f317b376da83c -AUX rocprofiler-4.3.0-gentoo-location.patch 2651 BLAKE2B 296c84acb0887ef0792698636ca521d749fb81e283e0e42a9799f2af002a7f5397eb9051ee2711b3d78a34b9061db3be420e7de07fc1c0ee478c2b6402cecfa5 SHA512 a55c83584fb40a0a342125ae88689eea7857e6663759e5d5664a9c618afeea74662d551e9cab78ec03859d4503d67ea0f6b26143a8bea05d213f6426112ffb18 AUX rocprofiler-4.3.0-ldflag.patch 627 BLAKE2B 116e02e22f1ad0b3168dbc2aa76792a8797b1e6fe4c77f876af6c6e964936d2c2687972dd68c2057623197d8ddc1e9b318767f5e3818b7e35a03ce433b821080 SHA512 393e6334d2f13a6f8a0708c45233b1211b074969873ff1faaf5e58b667be57602b7a885f737f9309699fee9ab859d6ce28f5760e2b42556d9d8320957f68dca0 AUX rocprofiler-4.3.0-no-aqlprofile.patch 1708 BLAKE2B ab7054d368332f39fd4ddcb377610001011a279764fb921a2440245ed13ea123024e8c35b26398d3e007089687fc5ec734c6fce1fae58dd03963ad6fc0a02c84 SHA512 cd8c5f1d78e73b75c109d99f2d35fb9815d2360092669337941595698a3326c53266ea6a530faa599d954afaed19d8b41a73e4513ec832899eb17835134de5df AUX rocprofiler-4.3.0-nostrip.patch 540 BLAKE2B 20592fe6ee33effc9feaca9ffcd6d48bef0a46bb7353c4e0b624cfb60b29a168ace763c86775c020ce162dca59886a68068485da19a2a14b35582a3ae33dfbe4 SHA512 a1d2a5d1606e4d2d249e51063f76b96dc460fb6ebe358029182bf9e4de88dd6879332cdff0ee7458b808a4dcc35fcbba3b43f0fc8c5dc2a0cffbbf2ddb05634c AUX rocprofiler-5.0.2-gentoo-location.patch 2219 BLAKE2B 10237145d132be7b31b311b9f2ed69cb7494da312f980ffcf92eb89ed8a946d15e9312e77bd3997a578e6c33f3ef1efb896e73c597705bf461daf1f73cc77bfa SHA512 dfe21a0e43ecc94e15899e4f2a7ee28ae36d5b666ad6df66892b9d9befc9444111c817861b136aa8973cc426e0f30964909753360bf7fd7da31ffa05029457ba -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 -EBUILD rocprofiler-4.3.0-r1.ebuild 1684 BLAKE2B 670fd962a7ba9b30eb09d6e1f72beb37b047aff9b8ffb3d865211ba4ac8d52a5799a2f9ef1893784e3cd0f250d46cf071df3a62f0772715cad80c2b62abdb6aa SHA512 6f7ebdcecc90b0dedccf0adb5df9c7cca5d09647c8e48efc1dd283b7f54974b67ba94b1968b342abe1005b414a3de20336496aa74de74526d6c6ee4e8f3b9079 EBUILD rocprofiler-5.0.2-r1.ebuild 1647 BLAKE2B 585d314f1e8d7eac7df40406584a72f653a99c0c8028890c03cb1a54c0110cf199b429a95c1adff12be8b4df25c5e588a9f306b4f74cf2aa5898ca83d675b709 SHA512 dfd80abd7e93dd99371bf7d1cf65b941a51d317a44773fa6b1b846e6cb645feeef160b032036fb2a1c60356fcb746eddb4836c5108acc9fd89d11796ca9fa4a7 EBUILD rocprofiler-5.1.3-r1.ebuild 1606 BLAKE2B aa070754d4e9ac84ed9d74668abf949d28a6a671938c2fa64d50d820c252aa63f5b5d31812783032de1d31dd7c7d1c5ca31293514c5fc01412d74f5baa52949c SHA512 788aa9a284cb33ead6f8d93adc6f60840861a4af48e34bcb03ed61a54f436e5596cf31ebf5803e230a96752b84489e74ef9475ea7b06edf426a8564b974e2b49 MISC metadata.xml 493 BLAKE2B 79000a74b13a0d35e0bcdb8254471fde9027c498ca75e761a3f694690315149e711ae8f7b73ae9bc5aa462358784fac055b975149109829e00cb2acac73ef138 SHA512 3f49c336aee801fb73d26b9d43a52816ca15c75061bed885c1b1406929ae1a3b9b01ce6f3c71b17ca9e121dcbc73f525d5a843c526ea8d4b433642eeff89ccd5 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 -+#include - #include - #include - 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 ] [-o ] " -@@ -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 -} -- cgit v1.2.3