* [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-device-libs/, dev-libs/rocm-device-libs/files/
@ 2023-02-22 16:16 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-02-22 16:16 UTC (permalink / raw
To: gentoo-commits
commit: 1adcab955fdbd4f3de4ff9f3a0900ebe8ce06fa3
Author: Niccolò Belli <niccolo.belli <AT> linuxsystems <DOT> it>
AuthorDate: Mon Feb 20 15:29:57 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 16:14:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1adcab95
dev-libs/rocm-device-libs: add 5.4.3
Signed-off-by: Niccolò Belli <niccolo.belli <AT> linuxsystems.it>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/rocm-device-libs/Manifest | 1 +
...bs-5.4.3-Revert-Update-counters-for-gfx11.patch | 216 +++++++++++++++++++++
.../rocm-device-libs/rocm-device-libs-5.4.3.ebuild | 48 +++++
3 files changed, 265 insertions(+)
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index cf3568d4925e..2b7764830070 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -1,2 +1,3 @@
DIST rocm-device-libs-5.1.3.tar.gz 242862 BLAKE2B 68d66de897f461e9f876de5fe2214803d4c00665651dea6af0952f0ce579c6704a5ec41b08971fa613ade309a0a85cb611b56b592dc2a25e247183e634ea3378 SHA512 cc3dfb8d4b4841ba777355c537175259d0019159ff462358320674b85082cccd99f6462f60fee66228ddfb88fade043445c1bac62504aa1462ba61b7e2751de7
DIST rocm-device-libs-5.3.3.tar.gz 245690 BLAKE2B 475c0d818b8b0f090a8daeca2910cd4002e4cdf505d020327f46eb5f864a26937a6a3dfe4ff7b188ebda0f936b1c396f2163bb27b9e2a62c5976e60fa60856ac SHA512 8f6f2fc1534e348e02ba30a25cfc6017f8eab768968b5d0344a5ea7d65c4f0a874072f9e53919c74545814330602ef7c190753c7ff019137230e02f58a5d3a5d
+DIST rocm-device-libs-5.4.3.tar.gz 246095 BLAKE2B eb749346c96d465a5f22831968ccbd71f02749e6aa0d9c2becc0f378641ca0f65c1a131bfd3ed226f838b4208091fcc920b1e31b427adbd69a42881898668e6a SHA512 67b904363a3cff6c15bbd032cbc72cb5cd5f82acaa68c74391dbcf415266e8f35486a496b69b69e1fc0721e0e4e21fb6a6b9c180a46cb59cdcf53916be846ca4
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-5.4.3-Revert-Update-counters-for-gfx11.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.4.3-Revert-Update-counters-for-gfx11.patch
new file mode 100644
index 000000000000..bf9b2c372600
--- /dev/null
+++ b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.4.3-Revert-Update-counters-for-gfx11.patch
@@ -0,0 +1,216 @@
+From 8ce920dddac9846254aaf6261bafd8b22976b04e Mon Sep 17 00:00:00 2001
+From: Jeremy Newton <alexjnewt@hotmail.com>
+Date: Sun, 18 Dec 2022 20:48:21 -0500
+Subject: [PATCH] Revert "Update counters for gfx11"
+
+This reverts commit 85f95b94960c6f7ff4ff0242a399deb4a204fb6a.
+---
+ doc/OCKL.md | 4 ++--
+ ockl/inc/ockl.h | 3 ---
+ ockl/src/dm.cl | 15 +++++++++++----
+ ockl/src/mtime.cl | 35 ++---------------------------------
+ ockl/src/wait.cl | 18 +++++++++---------
+ 5 files changed, 24 insertions(+), 51 deletions(-)
+
+diff --git a/doc/OCKL.md b/doc/OCKL.md
+index 07574f6..05c5c49 100644
+--- a/doc/OCKL.md
++++ b/doc/OCKL.md
+@@ -99,8 +99,8 @@ The following table lists the available functions along with a brief description
+ | `int __ockl_mul24_i32(int,int);` | Multiply assuming operands fit in 24 bits |
+ | `uint __ockl_mul24_u32(uint,uint);` | |
+ | - | |
+-| `ulong __ockl_cyclectr_u64(void);` | Current value of free running 64-bit clock counter |
+-| `ulong __ockl_steadyctr_u64(void);` | Current value of constant speed 64-bit clock counter |
++| `ulong __ockl_memtime_u64(void);` | Current value of free running 64-bit clock counter |
++| `ulong __ockl_memrealtime_u64(void);` | Current value of constant speed 64-bit clock counter |
+ | - | |
+ | `uint __ockl_activelane_u32(void);` | Index of currently lane counting only active lanes in wavefront |
+ | - | |
+diff --git a/ockl/inc/ockl.h b/ockl/inc/ockl.h
+index d0b98d4..6300279 100644
+--- a/ockl/inc/ockl.h
++++ b/ockl/inc/ockl.h
+@@ -143,9 +143,6 @@ DECL_OCKL_NULLARY_U32(activelane)
+
+ DECL_OCKL_NULLARY_U64(memtime)
+ DECL_OCKL_NULLARY_U64(memrealtime)
+-DECL_OCKL_NULLARY_U64(cyclectr)
+-DECL_OCKL_NULLARY_U64(steadyctr)
+-
+
+ extern half OCKL_MANGLE_T(wfred_add,f16)(half x);
+ extern float OCKL_MANGLE_T(wfred_add,f32)(float x);
+diff --git a/ockl/src/dm.cl b/ockl/src/dm.cl
+index 245b4a1..26373dd 100644
+--- a/ockl/src/dm.cl
++++ b/ockl/src/dm.cl
+@@ -201,6 +201,13 @@ get_heap_ptr(void) {
+ }
+ }
+
++// realtime
++__attribute__((target("s-memrealtime"))) static ulong
++realtime(void)
++{
++ return __builtin_amdgcn_s_memrealtime();
++}
++
+ // The actual number of blocks in a slab with blocks of kind k
+ static uint
+ num_blocks(kind_t k)
+@@ -466,7 +473,7 @@ new_slab_wait(__global heap_t *hp, kind_t k)
+ uint aid = __ockl_activelane_u32();
+ if (aid == 0) {
+ ulong expected = AL(&hp->salloc_time[k].value, memory_order_relaxed);
+- ulong now = __ockl_steadyctr_u64();
++ ulong now = realtime();
+ ulong dt = now - expected;
+ if (dt < SLAB_TICKS)
+ __ockl_rtcwait_u32(SLAB_TICKS - (uint)dt);
+@@ -480,7 +487,7 @@ grow_recordable_wait(__global heap_t *hp, kind_t k)
+ uint aid = __ockl_activelane_u32();
+ if (aid == 0) {
+ ulong expected = AL(&hp->grow_time[k].value, memory_order_relaxed);
+- ulong now = __ockl_steadyctr_u64();
++ ulong now = realtime();
+ ulong dt = now - expected;
+ if (dt < GROW_TICKS)
+ __ockl_rtcwait_u32(GROW_TICKS - (uint)dt);
+@@ -540,7 +547,7 @@ try_grow_num_recordable_slabs(__global heap_t *hp, kind_t k)
+ uint ret = GROW_BUSY;
+ if (aid == 0) {
+ ulong expected = AL(&hp->grow_time[k].value, memory_order_relaxed);
+- ulong now = __ockl_steadyctr_u64();
++ ulong now = realtime();
+ if (now - expected >= GROW_TICKS &&
+ ACE(&hp->grow_time[k].value, &expected, now, memory_order_relaxed))
+ ret = GROW_FAILURE;
+@@ -687,7 +694,7 @@ try_allocate_new_slab(__global heap_t *hp, kind_t k)
+
+ if (aid == 0) {
+ ulong expected = AL(&hp->salloc_time[k].value, memory_order_relaxed);
+- ulong now = __ockl_steadyctr_u64();
++ ulong now = realtime();
+ if (now - expected >= SLAB_TICKS &&
+ ACE(&hp->salloc_time[k].value, &expected, now, memory_order_relaxed))
+ ret = (__global sdata_t *)0;
+diff --git a/ockl/src/mtime.cl b/ockl/src/mtime.cl
+index 43f4161..543aaa3 100644
+--- a/ockl/src/mtime.cl
++++ b/ockl/src/mtime.cl
+@@ -5,48 +5,17 @@
+ * License. See LICENSE.TXT for details.
+ *===------------------------------------------------------------------------*/
+
+-#include "oclc.h"
+ #include "ockl.h"
+
+-__attribute__((target("s-memrealtime"))) static ulong
+-mem_realtime(void)
+-{
+- return __builtin_amdgcn_s_memrealtime();
+-}
+-
+-__attribute__((target("gfx11-insts"))) static ulong
+-msg_realtime(void)
+-{
+- return __builtin_amdgcn_s_sendmsg_rtnl(0x83);
+-}
+-
+-// Deprecated
+ __attribute__((target("s-memtime-inst"))) ulong
+ OCKL_MANGLE_U64(memtime)(void)
+ {
+ return __builtin_amdgcn_s_memtime();
+ }
+
+-// Deprecated
+-ulong
++__attribute__((target("s-memrealtime"))) ulong
+ OCKL_MANGLE_U64(memrealtime)(void)
+ {
+- return mem_realtime();
+-}
+-
+-ulong
+-OCKL_MANGLE_U64(cyclectr)(void)
+-{
+- return __builtin_readcyclecounter();
+-}
+-
+-ulong
+-OCKL_MANGLE_U64(steadyctr)(void)
+-{
+- if (__oclc_ISA_version >= 11000) {
+- return msg_realtime();
+- } else {
+- return mem_realtime();
+- }
++ return __builtin_amdgcn_s_memrealtime();
+ }
+
+diff --git a/ockl/src/wait.cl b/ockl/src/wait.cl
+index 49b038e..b249599 100644
+--- a/ockl/src/wait.cl
++++ b/ockl/src/wait.cl
+@@ -10,47 +10,47 @@
+ #include "ockl.h"
+ #include "oclc.h"
+
+-void
++__attribute__((target("s-memrealtime"))) void
+ OCKL_MANGLE_T(rtcwait,u32)(uint ticks)
+ {
+- ulong now = __ockl_steadyctr_u64();
++ ulong now = __builtin_amdgcn_s_memrealtime();
+ ulong end = now + __builtin_amdgcn_readfirstlane(ticks);
+
+ if (__oclc_ISA_version >= 9000) {
+ while (end > now + 1625) {
+ __builtin_amdgcn_s_sleep(127);
+- now = __ockl_steadyctr_u64();
++ now = __builtin_amdgcn_s_memrealtime();
+ }
+
+ while (end > now + 806) {
+ __builtin_amdgcn_s_sleep(63);
+- now = __ockl_steadyctr_u64();
++ now = __builtin_amdgcn_s_memrealtime();
+ }
+
+ while (end > now + 396) {
+ __builtin_amdgcn_s_sleep(31);
+- now = __ockl_steadyctr_u64();
++ now = __builtin_amdgcn_s_memrealtime();
+ }
+ }
+
+ while (end > now + 192) {
+ __builtin_amdgcn_s_sleep(15);
+- now = __ockl_steadyctr_u64();
++ now = __builtin_amdgcn_s_memrealtime();
+ }
+
+ while (end > now + 89) {
+ __builtin_amdgcn_s_sleep(7);
+- now = __ockl_steadyctr_u64();
++ now = __builtin_amdgcn_s_memrealtime();
+ }
+
+ while (end > now + 38) {
+ __builtin_amdgcn_s_sleep(3);
+- now = __ockl_steadyctr_u64();
++ now = __builtin_amdgcn_s_memrealtime();
+ }
+
+ while (end > now) {
+ __builtin_amdgcn_s_sleep(1);
+- now = __ockl_steadyctr_u64();
++ now = __builtin_amdgcn_s_memrealtime();
+ }
+ }
+
+--
+2.34.1
+
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-5.4.3.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-5.4.3.ebuild
new file mode 100644
index 000000000000..cab37f4bebff
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-5.4.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake llvm
+
+LLVM_MAX_SLOT=15
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
+ inherit git-r3
+ S="${WORKDIR}/${P}/src"
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-devel/clang:${LLVM_MAX_SLOT}"
+DEPEND="${RDEPEND}"
+
+CMAKE_BUILD_TYPE=Release
+
+PATCHES=( "${FILESDIR}/${PN}-5.1.3-test-bitcode-dir.patch"
+ "${FILESDIR}/${PN}-5.1.3-llvm-link.patch"
+ "${FILESDIR}/${PN}-5.4.3-Revert-Update-counters-for-gfx11.patch" )
+
+src_prepare() {
+ sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
+ sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DLLVM_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
+ )
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-device-libs/, dev-libs/rocm-device-libs/files/
@ 2025-02-13 8:38 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2025-02-13 8:38 UTC (permalink / raw
To: gentoo-commits
commit: 1e675014700e3260e1068441ce95d8b128e40f5e
Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Thu Jan 30 14:02:28 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 08:35:17 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e675014
dev-libs/rocm-device-libs: drop 5.1.3-r1, 5.3.3, 5.4.3, 5.5.1
Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/rocm-device-libs/Manifest | 4 -
.../files/rocm-device-libs-5.1.3-llvm-link.patch | 13 --
.../rocm-device-libs-5.1.3-test-bitcode-dir.patch | 24 ---
...bs-5.4.3-Revert-Update-counters-for-gfx11.patch | 216 ---------------------
.../rocm-device-libs-5.1.3-r1.ebuild | 47 -----
.../rocm-device-libs/rocm-device-libs-5.3.3.ebuild | 47 -----
.../rocm-device-libs/rocm-device-libs-5.4.3.ebuild | 48 -----
.../rocm-device-libs/rocm-device-libs-5.5.1.ebuild | 49 -----
8 files changed, 448 deletions(-)
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index 7a9ac0e660ec..f88c464b8dff 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -2,8 +2,4 @@ DIST llvm-project-rocm-6.1.1.tar.gz 196027084 BLAKE2B 3ef0b6e3c47c66fd80289373e6
DIST llvm-project-rocm-6.1.2.tar.gz 195992927 BLAKE2B d821f29f2f1f7c1ff414c63a710281f16d2a394b21f3365d01b86710cc09ed27e514b49fb744bf6a36b38815afa56cc26d44f0238f38479a0c2db9bf9989f389 SHA512 5f7e5dbe5976141de35e96e603624bd9d5a2c08b0690ba9fcd81d1b32f540f94bb9f4b74539e2838fd60ae1312dbe5e0b429ba80a03871782cdf3bd834940ce0
DIST llvm-project-rocm-6.3.0.tar.gz 206677330 BLAKE2B f3e68a8c94599e3a938d3e761af163b9f010a06421680ee70aaaaf8073fb18da9151729c311fc4bd12b281b3afdd15e61cea31c970f0e4d36bb97838fa17ca5f SHA512 674fc3242c6dbb6962f1002dc34ccbd618da6adeb640bac15265d22fdcedf9de16ea3d79899891734ccc1099cb5b5ed9110b1162f4515c4cbc0d847810682b59
DIST llvm-project-rocm-6.3.2.tar.gz 206671202 BLAKE2B a280e2be22b8eb9fd51814074447baed3637231d4bfbe391047a1fb2409197c8d8ba58cebb3aeaec15aa4daee9371311274b30ede48e0039d7c84e432b15de1a SHA512 314e27577af76268635f3c96ee3516829e4622913c3d0c4c68eccbaee0c9f7f5fc031cbd35827deb4bc29712592c424e296c15ce8c500c897bfb3eb19455899c
-DIST rocm-device-libs-5.1.3.tar.gz 242862 BLAKE2B 68d66de897f461e9f876de5fe2214803d4c00665651dea6af0952f0ce579c6704a5ec41b08971fa613ade309a0a85cb611b56b592dc2a25e247183e634ea3378 SHA512 cc3dfb8d4b4841ba777355c537175259d0019159ff462358320674b85082cccd99f6462f60fee66228ddfb88fade043445c1bac62504aa1462ba61b7e2751de7
-DIST rocm-device-libs-5.3.3.tar.gz 245690 BLAKE2B 475c0d818b8b0f090a8daeca2910cd4002e4cdf505d020327f46eb5f864a26937a6a3dfe4ff7b188ebda0f936b1c396f2163bb27b9e2a62c5976e60fa60856ac SHA512 8f6f2fc1534e348e02ba30a25cfc6017f8eab768968b5d0344a5ea7d65c4f0a874072f9e53919c74545814330602ef7c190753c7ff019137230e02f58a5d3a5d
-DIST rocm-device-libs-5.4.3.tar.gz 246095 BLAKE2B eb749346c96d465a5f22831968ccbd71f02749e6aa0d9c2becc0f378641ca0f65c1a131bfd3ed226f838b4208091fcc920b1e31b427adbd69a42881898668e6a SHA512 67b904363a3cff6c15bbd032cbc72cb5cd5f82acaa68c74391dbcf415266e8f35486a496b69b69e1fc0721e0e4e21fb6a6b9c180a46cb59cdcf53916be846ca4
-DIST rocm-device-libs-5.5.1.tar.gz 245900 BLAKE2B f713b1f12c7be33a4854d79791f592b8e89e2bc463769ec8cdd807483f0e5ca93d7fc852b6cf41d5ad0401d07adc97de9fb1fa54b77af83f665e282d6c0a43e7 SHA512 0138ddc94ce4a81202bdafccbbecef8145c6ddf82c3a14d92bb80b2bed3d3b73898f84279cef89110c50a9cc51e32de1323cc11a1f97c5da4f7f843b393425d0
DIST rocm-device-libs-5.7.1.tar.gz 248357 BLAKE2B 829704382e9420ad79724a250ccfd65278eb697498805297d1a52b8ea35dbff46e11514b681243d61bfac05b8a9734f0cf22d721603e48fe2f9864368222b0bc SHA512 8755d0584fa3b8239f5642b4fb8f5e8dea20bbaca2ff8883894d3583913e9a1fd1552492b36e8ceff092f795783b734e68b002ee0c93711dccdf8e72c528c27c
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-5.1.3-llvm-link.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.1.3-llvm-link.patch
deleted file mode 100644
index 9e6dc38921e2..000000000000
--- a/dev-libs/rocm-device-libs/files/rocm-device-libs-5.1.3-llvm-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/851702#c4
-Adapt to libLLVM.so instead of the seperated libs
-===================================================================
---- ROCm-Device-Libs-rocm-5.0.2.orig/utils/prepare-builtins/CMakeLists.txt
-+++ ROCm-Device-Libs-rocm-5.0.2/utils/prepare-builtins/CMakeLists.txt
-@@ -26,5 +26,5 @@ set_target_properties(prepare-builtins P
- CXX_STANDARD_REQUIRED Yes
- CXX_EXTENSIONS No)
- llvm_update_compile_flags(prepare-builtins)
--llvm_map_components_to_libnames(llvm_libs support core bitreader bitwriter)
--target_link_libraries(prepare-builtins ${llvm_libs})
-+llvm_map_components_to_libnames(llvm_libs support)
-+target_link_libraries(prepare-builtins ${llvm_libs} LLVM)
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-5.1.3-test-bitcode-dir.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.1.3-test-bitcode-dir.patch
deleted file mode 100644
index 9047f8ef90e5..000000000000
--- a/dev-libs/rocm-device-libs/files/rocm-device-libs-5.1.3-test-bitcode-dir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-lib/amdgcn/bitcode is not among the default bitcode dirs of clang
-Add --rocm-device-lib-path to the clang argument
-Excerpt from https://salsa.debian.org/rocm-team/rocm-device-libs/-/blob/d2014eed680ccce5f9bd61ff4fc28a89682575f3/debian/patches/cmake-amdgcn-bitcode.patch
-==============================================
---- rocm-device-libs.orig/test/constant_folding/RunConstantFoldTest.cmake
-+++ rocm-device-libs/test/constant_folding/RunConstantFoldTest.cmake
-@@ -16,6 +16,7 @@
- -target amdgcn-amd-amdhsa -mcpu=${TEST_CPU}
- -Xclang -finclude-default-header
- --rocm-path=${BINARY_DIR}
-+ --rocm-device-lib-path=${AMDGCN_BITCODES}
- -mllvm -amdgpu-simplify-libcall=0
- -o ${OUTPUT_FILE} ${INPUT_FILE}
- RESULT_VARIABLE CLANG_RESULT
---- rocm-device-libs.orig/test/constant_folding/CMakeLists.txt
-+++ rocm-device-libs/test/constant_folding/CMakeLists.txt
-@@ -30,6 +30,7 @@
- -DFILECHECK_BIN=${FILECHECK_BIN}
- -DOUTPUT_FILE=output.${name}.ll
- -DINPUT_FILE=${CMAKE_CURRENT_SOURCE_DIR}/${name}.cl
-+ -DAMDGCN_BITCODES=${PROJECT_BINARY_DIR}/lib/amdgcn/bitcode
- -DTEST_CPU=gfx900
- -P ${CMAKE_CURRENT_SOURCE_DIR}/RunConstantFoldTest.cmake)
- endfunction()
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-5.4.3-Revert-Update-counters-for-gfx11.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.4.3-Revert-Update-counters-for-gfx11.patch
deleted file mode 100644
index bf9b2c372600..000000000000
--- a/dev-libs/rocm-device-libs/files/rocm-device-libs-5.4.3-Revert-Update-counters-for-gfx11.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From 8ce920dddac9846254aaf6261bafd8b22976b04e Mon Sep 17 00:00:00 2001
-From: Jeremy Newton <alexjnewt@hotmail.com>
-Date: Sun, 18 Dec 2022 20:48:21 -0500
-Subject: [PATCH] Revert "Update counters for gfx11"
-
-This reverts commit 85f95b94960c6f7ff4ff0242a399deb4a204fb6a.
----
- doc/OCKL.md | 4 ++--
- ockl/inc/ockl.h | 3 ---
- ockl/src/dm.cl | 15 +++++++++++----
- ockl/src/mtime.cl | 35 ++---------------------------------
- ockl/src/wait.cl | 18 +++++++++---------
- 5 files changed, 24 insertions(+), 51 deletions(-)
-
-diff --git a/doc/OCKL.md b/doc/OCKL.md
-index 07574f6..05c5c49 100644
---- a/doc/OCKL.md
-+++ b/doc/OCKL.md
-@@ -99,8 +99,8 @@ The following table lists the available functions along with a brief description
- | `int __ockl_mul24_i32(int,int);` | Multiply assuming operands fit in 24 bits |
- | `uint __ockl_mul24_u32(uint,uint);` | |
- | - | |
--| `ulong __ockl_cyclectr_u64(void);` | Current value of free running 64-bit clock counter |
--| `ulong __ockl_steadyctr_u64(void);` | Current value of constant speed 64-bit clock counter |
-+| `ulong __ockl_memtime_u64(void);` | Current value of free running 64-bit clock counter |
-+| `ulong __ockl_memrealtime_u64(void);` | Current value of constant speed 64-bit clock counter |
- | - | |
- | `uint __ockl_activelane_u32(void);` | Index of currently lane counting only active lanes in wavefront |
- | - | |
-diff --git a/ockl/inc/ockl.h b/ockl/inc/ockl.h
-index d0b98d4..6300279 100644
---- a/ockl/inc/ockl.h
-+++ b/ockl/inc/ockl.h
-@@ -143,9 +143,6 @@ DECL_OCKL_NULLARY_U32(activelane)
-
- DECL_OCKL_NULLARY_U64(memtime)
- DECL_OCKL_NULLARY_U64(memrealtime)
--DECL_OCKL_NULLARY_U64(cyclectr)
--DECL_OCKL_NULLARY_U64(steadyctr)
--
-
- extern half OCKL_MANGLE_T(wfred_add,f16)(half x);
- extern float OCKL_MANGLE_T(wfred_add,f32)(float x);
-diff --git a/ockl/src/dm.cl b/ockl/src/dm.cl
-index 245b4a1..26373dd 100644
---- a/ockl/src/dm.cl
-+++ b/ockl/src/dm.cl
-@@ -201,6 +201,13 @@ get_heap_ptr(void) {
- }
- }
-
-+// realtime
-+__attribute__((target("s-memrealtime"))) static ulong
-+realtime(void)
-+{
-+ return __builtin_amdgcn_s_memrealtime();
-+}
-+
- // The actual number of blocks in a slab with blocks of kind k
- static uint
- num_blocks(kind_t k)
-@@ -466,7 +473,7 @@ new_slab_wait(__global heap_t *hp, kind_t k)
- uint aid = __ockl_activelane_u32();
- if (aid == 0) {
- ulong expected = AL(&hp->salloc_time[k].value, memory_order_relaxed);
-- ulong now = __ockl_steadyctr_u64();
-+ ulong now = realtime();
- ulong dt = now - expected;
- if (dt < SLAB_TICKS)
- __ockl_rtcwait_u32(SLAB_TICKS - (uint)dt);
-@@ -480,7 +487,7 @@ grow_recordable_wait(__global heap_t *hp, kind_t k)
- uint aid = __ockl_activelane_u32();
- if (aid == 0) {
- ulong expected = AL(&hp->grow_time[k].value, memory_order_relaxed);
-- ulong now = __ockl_steadyctr_u64();
-+ ulong now = realtime();
- ulong dt = now - expected;
- if (dt < GROW_TICKS)
- __ockl_rtcwait_u32(GROW_TICKS - (uint)dt);
-@@ -540,7 +547,7 @@ try_grow_num_recordable_slabs(__global heap_t *hp, kind_t k)
- uint ret = GROW_BUSY;
- if (aid == 0) {
- ulong expected = AL(&hp->grow_time[k].value, memory_order_relaxed);
-- ulong now = __ockl_steadyctr_u64();
-+ ulong now = realtime();
- if (now - expected >= GROW_TICKS &&
- ACE(&hp->grow_time[k].value, &expected, now, memory_order_relaxed))
- ret = GROW_FAILURE;
-@@ -687,7 +694,7 @@ try_allocate_new_slab(__global heap_t *hp, kind_t k)
-
- if (aid == 0) {
- ulong expected = AL(&hp->salloc_time[k].value, memory_order_relaxed);
-- ulong now = __ockl_steadyctr_u64();
-+ ulong now = realtime();
- if (now - expected >= SLAB_TICKS &&
- ACE(&hp->salloc_time[k].value, &expected, now, memory_order_relaxed))
- ret = (__global sdata_t *)0;
-diff --git a/ockl/src/mtime.cl b/ockl/src/mtime.cl
-index 43f4161..543aaa3 100644
---- a/ockl/src/mtime.cl
-+++ b/ockl/src/mtime.cl
-@@ -5,48 +5,17 @@
- * License. See LICENSE.TXT for details.
- *===------------------------------------------------------------------------*/
-
--#include "oclc.h"
- #include "ockl.h"
-
--__attribute__((target("s-memrealtime"))) static ulong
--mem_realtime(void)
--{
-- return __builtin_amdgcn_s_memrealtime();
--}
--
--__attribute__((target("gfx11-insts"))) static ulong
--msg_realtime(void)
--{
-- return __builtin_amdgcn_s_sendmsg_rtnl(0x83);
--}
--
--// Deprecated
- __attribute__((target("s-memtime-inst"))) ulong
- OCKL_MANGLE_U64(memtime)(void)
- {
- return __builtin_amdgcn_s_memtime();
- }
-
--// Deprecated
--ulong
-+__attribute__((target("s-memrealtime"))) ulong
- OCKL_MANGLE_U64(memrealtime)(void)
- {
-- return mem_realtime();
--}
--
--ulong
--OCKL_MANGLE_U64(cyclectr)(void)
--{
-- return __builtin_readcyclecounter();
--}
--
--ulong
--OCKL_MANGLE_U64(steadyctr)(void)
--{
-- if (__oclc_ISA_version >= 11000) {
-- return msg_realtime();
-- } else {
-- return mem_realtime();
-- }
-+ return __builtin_amdgcn_s_memrealtime();
- }
-
-diff --git a/ockl/src/wait.cl b/ockl/src/wait.cl
-index 49b038e..b249599 100644
---- a/ockl/src/wait.cl
-+++ b/ockl/src/wait.cl
-@@ -10,47 +10,47 @@
- #include "ockl.h"
- #include "oclc.h"
-
--void
-+__attribute__((target("s-memrealtime"))) void
- OCKL_MANGLE_T(rtcwait,u32)(uint ticks)
- {
-- ulong now = __ockl_steadyctr_u64();
-+ ulong now = __builtin_amdgcn_s_memrealtime();
- ulong end = now + __builtin_amdgcn_readfirstlane(ticks);
-
- if (__oclc_ISA_version >= 9000) {
- while (end > now + 1625) {
- __builtin_amdgcn_s_sleep(127);
-- now = __ockl_steadyctr_u64();
-+ now = __builtin_amdgcn_s_memrealtime();
- }
-
- while (end > now + 806) {
- __builtin_amdgcn_s_sleep(63);
-- now = __ockl_steadyctr_u64();
-+ now = __builtin_amdgcn_s_memrealtime();
- }
-
- while (end > now + 396) {
- __builtin_amdgcn_s_sleep(31);
-- now = __ockl_steadyctr_u64();
-+ now = __builtin_amdgcn_s_memrealtime();
- }
- }
-
- while (end > now + 192) {
- __builtin_amdgcn_s_sleep(15);
-- now = __ockl_steadyctr_u64();
-+ now = __builtin_amdgcn_s_memrealtime();
- }
-
- while (end > now + 89) {
- __builtin_amdgcn_s_sleep(7);
-- now = __ockl_steadyctr_u64();
-+ now = __builtin_amdgcn_s_memrealtime();
- }
-
- while (end > now + 38) {
- __builtin_amdgcn_s_sleep(3);
-- now = __ockl_steadyctr_u64();
-+ now = __builtin_amdgcn_s_memrealtime();
- }
-
- while (end > now) {
- __builtin_amdgcn_s_sleep(1);
-- now = __ockl_steadyctr_u64();
-+ now = __builtin_amdgcn_s_memrealtime();
- }
- }
-
---
-2.34.1
-
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-5.1.3-r1.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-5.1.3-r1.ebuild
deleted file mode 100644
index b7ff41518668..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-5.1.3-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake llvm
-
-LLVM_MAX_SLOT=15
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
- inherit git-r3
- S="${WORKDIR}/${P}/src"
-else
- SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Device Libraries"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="llvm-core/clang:${LLVM_MAX_SLOT}"
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=( "${FILESDIR}/${PN}-5.1.3-test-bitcode-dir.patch"
- "${FILESDIR}/${PN}-5.1.3-llvm-link.patch" )
-
-src_prepare() {
- sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
- sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLLVM_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
- )
- cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-5.3.3.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-5.3.3.ebuild
deleted file mode 100644
index b7ff41518668..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-5.3.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake llvm
-
-LLVM_MAX_SLOT=15
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
- inherit git-r3
- S="${WORKDIR}/${P}/src"
-else
- SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Device Libraries"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="llvm-core/clang:${LLVM_MAX_SLOT}"
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=( "${FILESDIR}/${PN}-5.1.3-test-bitcode-dir.patch"
- "${FILESDIR}/${PN}-5.1.3-llvm-link.patch" )
-
-src_prepare() {
- sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
- sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLLVM_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
- )
- cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-5.4.3.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-5.4.3.ebuild
deleted file mode 100644
index b6add6d0f153..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-5.4.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake llvm
-
-LLVM_MAX_SLOT=15
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
- inherit git-r3
- S="${WORKDIR}/${P}/src"
-else
- SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Device Libraries"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="llvm-core/clang:${LLVM_MAX_SLOT}"
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=( "${FILESDIR}/${PN}-5.1.3-test-bitcode-dir.patch"
- "${FILESDIR}/${PN}-5.1.3-llvm-link.patch"
- "${FILESDIR}/${PN}-5.4.3-Revert-Update-counters-for-gfx11.patch" )
-
-src_prepare() {
- sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
- sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLLVM_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
- )
- cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-5.5.1.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-5.5.1.ebuild
deleted file mode 100644
index 223583f417aa..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-5.5.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake llvm
-
-LLVM_MAX_SLOT=16
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
- inherit git-r3
- S="${WORKDIR}/${P}/src"
-else
- SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Device Libraries"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="llvm-core/clang:${LLVM_MAX_SLOT}"
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.4.3-Revert-Update-counters-for-gfx11.patch"
- "${FILESDIR}/${PN}-5.5.1-fix-llvm-link.patch"
- )
-
-src_prepare() {
- sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
- sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLLVM_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
- )
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-02-13 8:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-22 16:16 [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-device-libs/, dev-libs/rocm-device-libs/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-02-13 8:38 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox