From 9d4810f84de876ec9d0ae03d0d44224500b41188 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 19 May 2024 00:01:59 +0100 Subject: gentoo auto-resync : 19:05:2024 - 00:01:59 --- dev-util/rocprofiler/Manifest | 5 +- .../rocprofiler-5.3.3-fix-python3.12-warning.patch | 88 ++++++++++++++++++++++ dev-util/rocprofiler/metadata.xml | 2 +- dev-util/rocprofiler/rocprofiler-5.3.3-r1.ebuild | 57 ++++++++++++++ dev-util/rocprofiler/rocprofiler-5.3.3.ebuild | 56 -------------- 5 files changed, 149 insertions(+), 59 deletions(-) create mode 100644 dev-util/rocprofiler/files/rocprofiler-5.3.3-fix-python3.12-warning.patch create mode 100644 dev-util/rocprofiler/rocprofiler-5.3.3-r1.ebuild delete mode 100644 dev-util/rocprofiler/rocprofiler-5.3.3.ebuild (limited to 'dev-util/rocprofiler') diff --git a/dev-util/rocprofiler/Manifest b/dev-util/rocprofiler/Manifest index 66d1a80f5494..b7fadc3198a9 100644 --- a/dev-util/rocprofiler/Manifest +++ b/dev-util/rocprofiler/Manifest @@ -2,10 +2,11 @@ AUX rocprofiler-4.3.0-no-aqlprofile.patch 1708 BLAKE2B ab7054d368332f39fd4ddcb37 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 AUX rocprofiler-5.1.3-remove-Werror.patch 665 BLAKE2B d5a906d446e7f348c97ddd1359757c0dbf68bd501e4f60d6536702a154b489ce48c77da28621301cf410cff3d521c29cb0b0be9dc9e0ed7c232d9d3b9d2b1877 SHA512 914a9ab2a9efc539a13afd02b36812bbdd4452f78c7b890925c3a6a3d8ae5a1052506f7f4d2a344a085d2002296136f8f63459166551cee636e0eaf5d97cc38b +AUX rocprofiler-5.3.3-fix-python3.12-warning.patch 4011 BLAKE2B 00d438521ae435f5d845cf8ffbc3cf920af061771b733b2b03f4dfcc2d473c650ffd3adaa4a64123e2d67a28905dba2d6921f9213db42c90dc6a554ea2ee32aa SHA512 43226d8f6e3dd0fb94a59907daf5f054c5ccb17cc2529b7b1fa4537bac98db9fafa0d2b071f43c492574de2b92b82272b3ff46eaba11a591a0cb9ccdfd2aa2d2 AUX rocprofiler-5.3.3-gentoo-location.patch 4439 BLAKE2B aa97006a55cb088ddf4f09efa1ef6b866d1840207d6f7d8c36fe08b35885c8e3a979ba5a823abcd47069498a8b5dac7f2b9030c91da8733ce5815fe323d2bd50 SHA512 1f2e10597565cf2011f3319ff5abfeb6374cea9a1bbc672e7ad318f9b434750f3b69dc8ff1132fd44001fa51d54631abf6dc09678361bd97a2279762aa191d20 AUX rocprofiler-5.3.3-remove-aql-in-cmake.patch 644 BLAKE2B 76b2c28d9ea542700f2a327e083b2499559b098117ee44c8d092e00e264573fdc64731cf0839ca459e2650773937019a65765077931befe04d47e8e83ffd8d83 SHA512 6713ff66427592f554e221047b94e5af82aafbf92f3466fe42e1bbd8bff706f4228e02be158d178f577ea37045ff28c946cced9c65083db42ba3b128a39a2623 DIST rocprofiler-5.1.3.tar.gz 1402172 BLAKE2B 16e9b127ede94a3f96056e84a2942b6c9f3aec90579fb12796ab8ba385160aa020e3dc77f7a475dadbc0a813a823ae733ca9560f6a09e55c4c82b13dd792dfa4 SHA512 6e9932a425eaaa2a1e1741280d7525c6360700f85edb3bcf4967fe9be4fed662bae0d2ba609701f0d9733769c340e93e32076024b27bab3303449c1d68d9e1ce DIST rocprofiler-5.3.3.tar.gz 1412740 BLAKE2B 29a63fc9df589787d18a28664002d35ec1b61e6b36f61cc1f2dc2dc14270d0aee4da594f735fceba71a7e29225bd0739b923a05bd36ec2a09a36e1ba95d8d971 SHA512 92b22272229c2c9a91983ded640a1b20f80538800f8e996dbf4e33e9f1f64a286a933f73b975e61c5b321883a11574c71ce91fd6ed7ddac32cd32da3bbea577c EBUILD rocprofiler-5.1.3-r1.ebuild 1654 BLAKE2B f5a12c1ee6b51e51af1328bfc4519b35f3c16fa237f16ae6d8612ef9a52e1876bd80409f9baabce0f8aebc239dbf81449cba6aee677877f4049febcb8385bb8f SHA512 1a82ff8ec38048f1b573880481f8e47c5fbf3612c6bd5790660770d4c1a7b501f272d7c3237bb274107e87b7a572f62d67d9c632fb1d9e0f45883132e3e7fa65 -EBUILD rocprofiler-5.3.3.ebuild 1438 BLAKE2B 482e77aeec369fde9f9f7dca7d236a1553f85ed4a5c7e1bb2768947fa3ed4e9969af3a996aeffc225f89e21911e0f54c2cfce6e74b4d8e31cb205d5ffc043219 SHA512 387b53eac4e82dd348cf9a9c70a9b6cd51ca70ca961df96079b731ef431aac98a025e5b4b719bc686af2697dddd36d61734c3357992f0278933981affaa10f32 -MISC metadata.xml 493 BLAKE2B 79000a74b13a0d35e0bcdb8254471fde9027c498ca75e761a3f694690315149e711ae8f7b73ae9bc5aa462358784fac055b975149109829e00cb2acac73ef138 SHA512 3f49c336aee801fb73d26b9d43a52816ca15c75061bed885c1b1406929ae1a3b9b01ce6f3c71b17ca9e121dcbc73f525d5a843c526ea8d4b433642eeff89ccd5 +EBUILD rocprofiler-5.3.3-r1.ebuild 1443 BLAKE2B 8d466412e9fa5458d93ff09df0938d1ce0123a046e76f6013e6f04fc6f177c95c23e168cbaf24a479a1e8c34a9135f8eb7d35fe841cd22a909bd4de35f06e359 SHA512 eddc2fdfb7a2ba846e0b8d64724613ba26af76d643d96d0186983fa2fa4b7645d67970ba26652145a5db7798177d08f6a4ccadd190e266285b135cd222701a70 +MISC metadata.xml 477 BLAKE2B 2ace1c4829fe8b4ab056cd60cfc6261d34e0721bfdff4018557102020ff870d3adae611825ba39ef67f30d856bb08a2538bc5057966d75249ec24ba9a8111e52 SHA512 871206ed4cdb4c1951e9ccf9959039767578675c3b527012f68a1d66a647ce5b8236a839f48097f5c2b411d31f3ce3ecf8bf1dbbd05705f77464d88acae51f96 diff --git a/dev-util/rocprofiler/files/rocprofiler-5.3.3-fix-python3.12-warning.patch b/dev-util/rocprofiler/files/rocprofiler-5.3.3-fix-python3.12-warning.patch new file mode 100644 index 000000000000..315ae6b880d9 --- /dev/null +++ b/dev-util/rocprofiler/files/rocprofiler-5.3.3-fix-python3.12-warning.patch @@ -0,0 +1,88 @@ +From c503cea17d6619d95c026fcf661333b3a587936b Mon Sep 17 00:00:00 2001 +From: Yiyang Wu +Date: Sat, 18 May 2024 16:14:43 +0800 +Subject: [PATCH] Fix python3.12 SyntaxWarning: invalid escape sequence + +--- + bin/mem_manager.py | 4 ++-- + bin/tblextr.py | 18 +++++++++--------- + 2 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/bin/mem_manager.py b/bin/mem_manager.py +index b5bed79..10ca971 100755 +--- a/bin/mem_manager.py ++++ b/bin/mem_manager.py +@@ -91,7 +91,7 @@ class MemManager: + event = rec_vals[2] # 'Name' + procid = rec_vals[3] # 'pid' + recordid = rec_vals[5] # 'Index' +- size_ptrn = re.compile(DELIM + 'Size=(\d+)' + DELIM) ++ size_ptrn = re.compile(DELIM + r'Size=(\d+)' + DELIM) + filled_ptrn = re.compile('BW=') + # query syncronous memcopy API record + key = (recordid, procid, 0) +@@ -129,7 +129,7 @@ class MemManager: + event = rec_vals[4] # 'Name' + procid = rec_vals[5] # 'pid' + recordid = rec_vals[7] # 'Index' +- size_ptrn = re.compile(DELIM + 'Size=(\d+)' + DELIM) ++ size_ptrn = re.compile(DELIM + r'Size=(\d+)' + DELIM) + + # query syncronous memcopy API record + key = (recordid, procid, 0) +diff --git a/bin/tblextr.py b/bin/tblextr.py +index 9f4abb4..81d0851 100755 +--- a/bin/tblextr.py ++++ b/bin/tblextr.py +@@ -112,14 +112,14 @@ def parse_res(infile): + if not os.path.isfile(infile): return + inp = open(infile, 'r') + +- beg_pattern = re.compile("^dispatch\[(\d*)\], (.*) kernel-name\(\"([^\"]*)\"\)") +- prop_pattern = re.compile("([\w-]+)\((\w+)\)"); +- ts_pattern = re.compile(", time\((\d*),(\d*),(\d*),(\d*)\)") ++ beg_pattern = re.compile(r"^dispatch\[(\d*)\], (.*) kernel-name\(\"([^\"]*)\"\)") ++ prop_pattern = re.compile(r"([\w-]+)\((\w+)\)"); ++ ts_pattern = re.compile(r", time\((\d*),(\d*),(\d*),(\d*)\)") + # var pattern below matches a variable name and a variable value from a one + # line text in the format of for example "WRITE_SIZE (0.2500000000)" or + # "GRBM_GUI_ACTIVE (27867)" or "TA_TA_BUSY[0]" +- var_pattern = re.compile("^\s*([a-zA-Z0-9_]+(?:\[\d+\])?)\s+\((\d+(?:\.\d+)?)\)") +- pid_pattern = re.compile("pid\((\d*)\)") ++ var_pattern = re.compile(r"^\s*([a-zA-Z0-9_]+(?:\[\d+\])?)\s+\((\d+(?:\.\d+)?)\)") ++ pid_pattern = re.compile(r"pid\((\d*)\)") + + dispatch_number = 0 + var_table_pid = 0 +@@ -340,7 +340,7 @@ def fill_ext_db(table_name, db, indir, trace_name, api_pid): + ############################################################# + # arguments manipulation routines + def get_field(args, field): +- ptrn1_field = re.compile(r'^.* ' + field + '\('); ++ ptrn1_field = re.compile(r'^.* ' + field + r'\('); + ptrn2_field = re.compile(r'\) .*$'); + ptrn3_field = re.compile(r'\)\)$'); + (field_name, n) = ptrn1_field.subn('', args, count=1); +@@ -351,7 +351,7 @@ def get_field(args, field): + return (field_name, n) + + def set_field(args, field, val): +- return re.subn(field + '\(\w+\)([ \)])', field + '(' + str(val) + ')\\1', args, count=1) ++ return re.subn(field + r'\(\w+\)([ \)])', field + '(' + str(val) + ')\\1', args, count=1) + + hsa_patch_data = {} + ops_patch_data = {} +@@ -384,8 +384,8 @@ def fill_api_db(table_name, db, indir, api_name, api_pid, dep_pid, dep_list, dep + hip_sync_dev_event_ptrn = re.compile(r'hipDeviceSynchronize') + wait_event_ptrn = re.compile(r'WaitEvent|hipStreamSynchronize|hipDeviceSynchronize') + hip_stream_wait_write_ptrn = re.compile(r'hipStreamWaitValue64|hipStreamWriteValue64|hipStreamWaitValue32|hipStreamWriteValue32') +- prop_pattern = re.compile("([\w-]+)\((\w+)\)"); +- beg_pattern = re.compile("^dispatch\[(\d*)\], (.*) kernel-name\(\"([^\"]*)\"\)") ++ prop_pattern = re.compile(r"([\w-]+)\((\w+)\)"); ++ beg_pattern = re.compile(r"^dispatch\[(\d*)\], (.*) kernel-name\(\"([^\"]*)\"\)") + hip_strm_cr_event_ptrn = re.compile(r'hipStreamCreate') + hsa_mcopy_ptrn = re.compile(r'hsa_amd_memory_async_copy') + ptrn_fixformat = re.compile(r'(\d+:\d+ \d+:\d+ \w+)\(\s*(.*)\)$') +-- +2.44.0 + diff --git a/dev-util/rocprofiler/metadata.xml b/dev-util/rocprofiler/metadata.xml index 922afe7981b0..4742f26158a4 100644 --- a/dev-util/rocprofiler/metadata.xml +++ b/dev-util/rocprofiler/metadata.xml @@ -10,6 +10,6 @@ Yiyang Wu - ROCm-Developer-Tools/rocprofiler + ROCm/rocprofiler diff --git a/dev-util/rocprofiler/rocprofiler-5.3.3-r1.ebuild b/dev-util/rocprofiler/rocprofiler-5.3.3-r1.ebuild new file mode 100644 index 000000000000..428554f757ab --- /dev/null +++ b/dev-util/rocprofiler/rocprofiler-5.3.3-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake python-any-r1 + +DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's" +HOMEPAGE="https://github.com/ROCm/rocprofiler" +SRC_URI="https://github.com/ROCm/${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 + dev-util/roctracer + " +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-fix-python3.12-warning.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 +} diff --git a/dev-util/rocprofiler/rocprofiler-5.3.3.ebuild b/dev-util/rocprofiler/rocprofiler-5.3.3.ebuild deleted file mode 100644 index 2c18d7475a6f..000000000000 --- a/dev-util/rocprofiler/rocprofiler-5.3.3.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# 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