From a3b31b1d6dec842523387619507a7e910c2f6636 Mon Sep 17 00:00:00 2001 From: Yiyang Wu Date: Fri, 27 Jan 2023 23:03:46 +0800 Subject: dev-util/rocprofiler: add 5.3.3 Closes: https://github.com/gentoo/gentoo/pull/29303 Signed-off-by: Yiyang Wu Signed-off-by: Benda Xu --- dev-util/rocprofiler/Manifest | 1 + .../files/rocprofiler-5.3.3-gentoo-location.patch | 102 +++++++++++++++++++++ .../rocprofiler-5.3.3-remove-aql-in-cmake.patch | 13 +++ dev-util/rocprofiler/rocprofiler-5.3.3.ebuild | 56 +++++++++++ 4 files changed, 172 insertions(+) create mode 100644 dev-util/rocprofiler/files/rocprofiler-5.3.3-gentoo-location.patch create mode 100644 dev-util/rocprofiler/files/rocprofiler-5.3.3-remove-aql-in-cmake.patch create mode 100644 dev-util/rocprofiler/rocprofiler-5.3.3.ebuild diff --git a/dev-util/rocprofiler/Manifest b/dev-util/rocprofiler/Manifest index 23a43f49ce08..358e4dfc5cd5 100644 --- a/dev-util/rocprofiler/Manifest +++ b/dev-util/rocprofiler/Manifest @@ -1,2 +1,3 @@ DIST rocprofiler-5.0.2.tar.gz 1401732 BLAKE2B ae870bc50dbd39c11e24f77ccb41773df1107b76cb7a12e1cebc66f8d66ddba6ad3bd6f9fe61657b03b22ef35f88fb608cf6070178f6aab24fe7a1bdcac43a96 SHA512 244e2b827126b7299ec0510daa5e1245a4a5a877394419f8bc9113f443231f67fc935609cbde6eeb26bb138ab4e95e2a88829ffa79ecc8f9881b5a77b5910c02 DIST rocprofiler-5.1.3.tar.gz 1402172 BLAKE2B 16e9b127ede94a3f96056e84a2942b6c9f3aec90579fb12796ab8ba385160aa020e3dc77f7a475dadbc0a813a823ae733ca9560f6a09e55c4c82b13dd792dfa4 SHA512 6e9932a425eaaa2a1e1741280d7525c6360700f85edb3bcf4967fe9be4fed662bae0d2ba609701f0d9733769c340e93e32076024b27bab3303449c1d68d9e1ce +DIST rocprofiler-5.3.3.tar.gz 1412740 BLAKE2B 29a63fc9df589787d18a28664002d35ec1b61e6b36f61cc1f2dc2dc14270d0aee4da594f735fceba71a7e29225bd0739b923a05bd36ec2a09a36e1ba95d8d971 SHA512 92b22272229c2c9a91983ded640a1b20f80538800f8e996dbf4e33e9f1f64a286a933f73b975e61c5b321883a11574c71ce91fd6ed7ddac32cd32da3bbea577c diff --git a/dev-util/rocprofiler/files/rocprofiler-5.3.3-gentoo-location.patch b/dev-util/rocprofiler/files/rocprofiler-5.3.3-gentoo-location.patch new file mode 100644 index 000000000000..48e6f6973ac8 --- /dev/null +++ b/dev-util/rocprofiler/files/rocprofiler-5.3.3-gentoo-location.patch @@ -0,0 +1,102 @@ +Index: rocprofiler-rocm-5.3.3/bin/rpl_run.sh +=================================================================== +--- rocprofiler-rocm-5.3.3.orig/bin/rpl_run.sh ++++ rocprofiler-rocm-5.3.3/bin/rpl_run.sh +@@ -29,11 +29,12 @@ RUN_DIR=`pwd` + TMP_DIR="/tmp" + DATA_DIR="rpl_data_${time_stamp}_$$" + +-RPL_PATH=$ROOT_DIR/lib +-TLIB_PATH=$RPL_PATH/rocprofiler +-TTLIB_PATH=$ROOT_DIR/lib/roctracer +-ROCM_LIB_PATH=$ROOT_DIR/lib +-PROF_BIN_DIR=$ROOT_DIR/libexec/rocprofiler ++RPL_PATH=$ROOT_DIR/@LIB_DIR@ ++TLIB_PATH=$RPL_PATH ++TTLIB_PATH=$ROOT_DIR/@LIB_DIR@ ++ROCM_LIB_PATH=$ROOT_DIR/@LIB_DIR@ ++PROF_BIN_DIR=$ROOT_DIR/bin ++PROF_LIBEXEC_DIR=$ROOT_DIR/libexec/rocprofiler + + if [ -z "$ROCP_PYTHON_VERSION" ] ; then + ROCP_PYTHON_VERSION=python3 +@@ -69,7 +70,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=$TLIB_PATH/metrics.xml ++export ROCP_METRICS=$ROOT_DIR/share/rocprofiler/metrics.xml + # Disable AQL-profile read API + export AQLPROFILE_READ_API=0 + # ROC Profiler package path +@@ -103,7 +104,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: $TLIB_PATH/metrics.xml" ++ echo "Metrics definition: $ROOT_DIR/share/rocprofiler/metrics.xml" + echo "" + echo "Usage:" + echo " $bin_name [-h] [--list-basic] [--list-derived] [-i ] [-o ] " +@@ -211,7 +212,7 @@ fi + # setting ROCM_LIB_PATH + set_rocm_lib_path() { + +- for ROCM_LIB_PATH in "$ROOT_DIR/lib" "$ROOT_DIR/lib64" ; do ++ for ROCM_LIB_PATH in $TLIB_PATH ; do + if [ -d "$ROCM_LIB_PATH" ]; then + return 0 + fi +@@ -385,11 +386,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 "$TLIB_PATH/rocprof-ctrl" ++ HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PROF_BIN_DIR/rocprof-ctrl" + exit 1 + elif [ "$1" = "--list-derived" ] ; then + export ROCP_INFO=d +- HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$TLIB_PATH/rocprof-ctrl" ++ HSA_TOOLS_LIB="$MY_HSA_TOOLS_LIB" eval "$PROF_BIN_DIR/rocprof-ctrl" + exit 1 + elif [ "$1" = "--basenames" ] ; then + if [ "$2" = "on" ] ; then +@@ -550,7 +551,7 @@ elif [ "$input_type" = "txt" -o "$input_ + mkdir -p $RES_DIR + echo "RPL: output dir '$RES_DIR'" + if [ "$input_type" = "txt" ] ; then +- $PROF_BIN_DIR/txt2xml.sh $INPUT_FILE $RES_DIR ++ $PROF_LIBEXEC_DIR/txt2xml.sh $INPUT_FILE $RES_DIR + else + echo "" > $RES_DIR/input.xml + fi +@@ -582,9 +583,9 @@ if [ -n "$csv_output" ] ; then + merge_output $OUTPUT_LIST + if [ "$GEN_STATS" = "1" ] ; then + db_output=$(echo $csv_output | sed "s/\.csv/.db/") +- $ROCP_PYTHON_VERSION $PROF_BIN_DIR/tblextr.py $db_output $OUTPUT_LIST ++ $ROCP_PYTHON_VERSION $PROF_LIBEXEC_DIR/tblextr.py $db_output $OUTPUT_LIST + else +- $ROCP_PYTHON_VERSION $PROF_BIN_DIR/tblextr.py $csv_output $OUTPUT_LIST ++ $ROCP_PYTHON_VERSION $PROF_LIBEXEC_DIR/tblextr.py $csv_output $OUTPUT_LIST + fi + if [ "$?" -ne 0 ] ; then + echo "Profiling data corrupted: '$OUTPUT_LIST'" | tee "$ROCPROFILER_SESS/error" +Index: rocprofiler-rocm-5.3.3/CMakeLists.txt +=================================================================== +--- rocprofiler-rocm-5.3.3.orig/CMakeLists.txt ++++ rocprofiler-rocm-5.3.3/CMakeLists.txt +@@ -159,10 +159,10 @@ install ( FILES + install ( FILES + ${CMAKE_CURRENT_SOURCE_DIR}/test/tool/metrics.xml + ${CMAKE_CURRENT_SOURCE_DIR}/test/tool/gfx_metrics.xml +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/${DEST_NAME} ) ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/${DEST_NAME} ) + # librocprof-tool.so +-install ( FILES ${PROJECT_BINARY_DIR}/test/librocprof-tool.so DESTINATION ${CMAKE_INSTALL_LIBDIR}/${DEST_NAME} ) +-install ( FILES ${PROJECT_BINARY_DIR}/test/rocprof-ctrl DESTINATION ${CMAKE_INSTALL_LIBDIR}/${DEST_NAME} ++install ( FILES ${PROJECT_BINARY_DIR}/test/librocprof-tool.so DESTINATION ${CMAKE_INSTALL_LIBDIR} ) ++install ( FILES ${PROJECT_BINARY_DIR}/test/rocprof-ctrl DESTINATION ${CMAKE_INSTALL_BINDIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) + + # File reorg Backward compatibility diff --git a/dev-util/rocprofiler/files/rocprofiler-5.3.3-remove-aql-in-cmake.patch b/dev-util/rocprofiler/files/rocprofiler-5.3.3-remove-aql-in-cmake.patch new file mode 100644 index 000000000000..19619f9606f5 --- /dev/null +++ b/dev-util/rocprofiler/files/rocprofiler-5.3.3-remove-aql-in-cmake.patch @@ -0,0 +1,13 @@ +Index: rocprofiler-rocm-5.3.3/cmake_modules/env.cmake +=================================================================== +--- rocprofiler-rocm-5.3.3.orig/cmake_modules/env.cmake ++++ rocprofiler-rocm-5.3.3/cmake_modules/env.cmake +@@ -119,8 +119,3 @@ message ( "---------GPU_TARGETS: ${GPU_T + if ( "${ROCM_ROOT_DIR}" STREQUAL "" ) + message ( FATAL_ERROR "ROCM_ROOT_DIR is not found." ) + endif () +- +-find_library ( FIND_AQL_PROFILE_LIB "libhsa-amd-aqlprofile64.so" HINTS ${CMAKE_INSTALL_PREFIX} PATHS ${ROCM_ROOT_DIR}) +-if ( NOT FIND_AQL_PROFILE_LIB ) +- message ( FATAL_ERROR "AQL_PROFILE not installed. Please install AQL_PROFILE" ) +-endif() diff --git a/dev-util/rocprofiler/rocprofiler-5.3.3.ebuild b/dev-util/rocprofiler/rocprofiler-5.3.3.ebuild new file mode 100644 index 000000000000..2c18d7475a6f --- /dev/null +++ b/dev-util/rocprofiler/rocprofiler-5.3.3.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) + +inherit cmake python-any-r1 + +DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's" +HOMEPAGE="https://github.com/ROCm-Developer-Tools/rocprofiler.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:${SLOT} + " +DEPEND="${RDEPEND}" +BDEPEND=" + $(python_gen_any_dep ' + dev-python/CppHeaderParser[${PYTHON_USEDEP}] + ') +" + +PATCHES=( "${FILESDIR}/${PN}-4.3.0-nostrip.patch" + "${FILESDIR}/${PN}-4.3.0-no-aqlprofile.patch" + "${FILESDIR}/${PN}-5.1.3-remove-Werror.patch" + "${FILESDIR}/${PN}-5.3.3-gentoo-location.patch" + "${FILESDIR}/${PN}-5.3.3-remove-aql-in-cmake.patch" ) + +python_check_deps() { + python_has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]" +} + +src_prepare() { + cmake_src_prepare + + sed -e "s,@LIB_DIR@,$(get_libdir),g" -i bin/rpl_run.sh || die +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=On + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa" + -DPROF_API_HEADER_PATH="${EPREFIX}"/usr/include/roctracer/ext + -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DUSE_PROF_API=1 + ) + + cmake_src_configure +} -- cgit v1.2.3-65-gdbad