* [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocr-runtime/files/
@ 2025-01-09 15:13 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2025-01-09 15:13 UTC (permalink / raw
To: gentoo-commits
commit: 6dd20b51d6620cc37484afa1564fd0b44bc60c7d
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jan 7 19:14:46 2025 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jan 9 15:12:29 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dd20b51
dev-libs/rocr-runtime: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/rocr-runtime-6.2.0-ld-lld.patch | 17 --------------
.../files/rocr-runtime-6.2.0-no-aqlprofiler.patch | 27 ----------------------
2 files changed, 44 deletions(-)
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-6.2.0-ld-lld.patch b/dev-libs/rocr-runtime/files/rocr-runtime-6.2.0-ld-lld.patch
deleted file mode 100644
index e35ee8c0e46b..000000000000
--- a/dev-libs/rocr-runtime/files/rocr-runtime-6.2.0-ld-lld.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix "symbol not defined" when linking with ld.lld >= 17
-https://github.com/ROCm/ROCR-Runtime/issues/204
---- a/hsacore.so.def
-+++ b/hsacore.so.def
-@@ -247,12 +247,6 @@ global:
- hsa_amd_vmem_retain_alloc_handle;
- hsa_amd_vmem_get_alloc_properties_from_handle;
- hsa_amd_agent_set_async_scratch_limit;
-- hsa_tools_scratch_event_alloc_start;
-- hsa_tools_scratch_event_alloc_end;
-- hsa_tools_scratch_event_free_start;
-- hsa_tools_scratch_event_free_end;
-- hsa_tools_scratch_event_async_reclaim_start;
-- hsa_tools_scratch_event_async_reclaim_end;
- hsa_ven_amd_pcs_iterate_configuration;
- hsa_ven_amd_pcs_create;
- hsa_ven_amd_pcs_create_from_id;
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-6.2.0-no-aqlprofiler.patch b/dev-libs/rocr-runtime/files/rocr-runtime-6.2.0-no-aqlprofiler.patch
deleted file mode 100644
index 018c3298ed8d..000000000000
--- a/dev-libs/rocr-runtime/files/rocr-runtime-6.2.0-no-aqlprofiler.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-libhsa-amd-aqlprofile64 library is not packaged
-Bug: https://github.com/ROCm/ROCm/issues/1781
---- a/core/runtime/amd_gpu_agent.cpp
-+++ b/core/runtime/amd_gpu_agent.cpp
-@@ -1333,11 +1333,6 @@ hsa_status_t GpuAgent::GetInfo(hsa_agent_info_t attribute, void* value) const {
- setFlag(HSA_EXTENSION_AMD_PC_SAMPLING);
- }
-
-- if (os::LibHandle lib = os::LoadLib(kAqlProfileLib)) {
-- os::CloseLib(lib);
-- setFlag(HSA_EXTENSION_AMD_AQLPROFILE);
-- }
--
- setFlag(HSA_EXTENSION_AMD_PROFILER);
-
- break;
---- a/core/runtime/hsa.cpp
-+++ b/core/runtime/hsa.cpp
-@@ -490,7 +490,7 @@ hsa_status_t hsa_system_get_major_extension_table(uint16_t extension, uint16_t v
- return HSA_STATUS_SUCCESS;
- }
-
-- if (extension == HSA_EXTENSION_AMD_AQLPROFILE) {
-+ if (0) {
- if (version_major != hsa_ven_amd_aqlprofile_VERSION_MAJOR) {
- debug_print("aqlprofile API incompatible ver %d, current ver %d\n",
- version_major, hsa_ven_amd_aqlprofile_VERSION_MAJOR);
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocr-runtime/files/
@ 2025-10-17 14:31 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2025-10-17 14:31 UTC (permalink / raw
To: gentoo-commits
commit: ead3f88c00228a5b8ee3a879e80964960b82d9f8
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Oct 17 09:27:04 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 17 14:31:24 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ead3f88c
dev-libs/rocr-runtime: drop unused patches
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44218
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/rocr-runtime-5.7.1-musl.patch | 117 ---------------------
.../files/rocr-runtime-6.1.0-ld-lld.patch | 17 ---
.../files/rocr-runtime-6.1.0-musl.patch | 106 -------------------
3 files changed, 240 deletions(-)
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-musl.patch b/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-musl.patch
deleted file mode 100644
index 13d731adb3a2..000000000000
--- a/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-musl.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-Fix compilation with musl.
-
-Bug: https://github.com/ROCm/ROCR-Runtime/issues/181
---- a/core/inc/checked.h
-+++ b/core/inc/checked.h
-@@ -58,7 +58,7 @@ template <uint64_t code, bool multiProcess = false> class Check final {
- Check(const Check&) { object_ = uintptr_t(this) ^ uintptr_t(code); }
- Check(Check&&) { object_ = uintptr_t(this) ^ uintptr_t(code); }
-
-- ~Check() { object_ = NULL; }
-+ ~Check() { object_ = uintptr_t(NULL); }
-
- const Check& operator=(Check&& rhs) { return *this; }
- const Check& operator=(const Check& rhs) { return *this; }
---- a/core/runtime/default_signal.cpp
-+++ b/core/runtime/default_signal.cpp
-@@ -57,7 +57,7 @@ int BusyWaitSignal::rtti_id_ = 0;
- BusyWaitSignal::BusyWaitSignal(SharedSignal* abi_block, bool enableIPC)
- : Signal(abi_block, enableIPC) {
- signal_.kind = AMD_SIGNAL_KIND_USER;
-- signal_.event_mailbox_ptr = NULL;
-+ signal_.event_mailbox_ptr = uint64_t(NULL);
- }
-
- hsa_signal_value_t BusyWaitSignal::LoadRelaxed() {
---- a/core/runtime/hsa.cpp
-+++ b/core/runtime/hsa.cpp
-@@ -155,7 +155,7 @@ template <class T> struct ValidityError<const T*> {
-
- template <class T>
- static __forceinline bool IsValid(T* ptr) {
-- return (ptr == NULL) ? NULL : ptr->IsValid();
-+ return (ptr == NULL) ? false : ptr->IsValid();
- }
-
- namespace AMD {
---- a/core/util/lnx/os_linux.cpp
-+++ b/core/util/lnx/os_linux.cpp
-@@ -111,9 +111,12 @@ class os_thread {
- }
- }
-
-+ int cores = 0;
-+ cpu_set_t* cpuset = nullptr;
-+
- if (core::Runtime::runtime_singleton_->flag().override_cpu_affinity()) {
-- int cores = get_nprocs_conf();
-- cpu_set_t* cpuset = CPU_ALLOC(cores);
-+ cores = get_nprocs_conf();
-+ cpuset = CPU_ALLOC(cores);
- if (cpuset == nullptr) {
- fprintf(stderr, "CPU_ALLOC failed: %s\n", strerror(errno));
- return;
-@@ -122,12 +125,6 @@ class os_thread {
- for (int i = 0; i < cores; i++) {
- CPU_SET(i, cpuset);
- }
-- err = pthread_attr_setaffinity_np(&attrib, CPU_ALLOC_SIZE(cores), cpuset);
-- CPU_FREE(cpuset);
-- if (err != 0) {
-- fprintf(stderr, "pthread_attr_setaffinity_np failed: %s\n", strerror(err));
-- return;
-- }
- }
-
- err = pthread_create(&thread, &attrib, ThreadTrampoline, args.get());
-@@ -157,6 +154,14 @@ class os_thread {
- if (err != 0) {
- fprintf(stderr, "pthread_attr_destroy failed: %s\n", strerror(err));
- }
-+
-+ if (thread && cores && cpuset) {
-+ err = pthread_setaffinity_np(thread, CPU_ALLOC_SIZE(cores), cpuset);
-+ CPU_FREE(cpuset);
-+ if (err != 0) {
-+ fprintf(stderr, "pthread_setaffinity_np failed: %s\n", strerror(err));
-+ }
-+ }
- }
-
- os_thread(os_thread&& rhs) {
-@@ -617,11 +622,13 @@ SharedMutex CreateSharedMutex() {
- fprintf(stderr, "rw lock attribute init failed: %s\n", strerror(err));
- return nullptr;
- }
-+#if defined(__GLIBC__)
- err = pthread_rwlockattr_setkind_np(&attrib, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
- if (err != 0) {
- fprintf(stderr, "Set rw lock attribute failure: %s\n", strerror(err));
- return nullptr;
- }
-+#endif
-
- pthread_rwlock_t* lock = new pthread_rwlock_t;
- err = pthread_rwlock_init(lock, &attrib);
---- a/core/util/utils.h
-+++ b/core/util/utils.h
-@@ -74,7 +74,7 @@ static __forceinline void* _aligned_malloc(size_t size, size_t alignment) {
- return aligned_alloc(alignment, size);
- #else
- void *mem = NULL;
-- if (NULL != posix_memalign(&mem, alignment, size))
-+ if (0 != posix_memalign(&mem, alignment, size))
- return NULL;
- return mem;
- #endif
---- a/image/util.h
-+++ b/image/util.h
-@@ -95,7 +95,7 @@ static __forceinline void* _aligned_malloc(size_t size, size_t alignment) {
- return aligned_alloc(alignment, size);
- #else
- void* mem = NULL;
-- if (NULL != posix_memalign(&mem, alignment, size)) return NULL;
-+ if (0 != posix_memalign(&mem, alignment, size)) return NULL;
- return mem;
- #endif
- }
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-6.1.0-ld-lld.patch b/dev-libs/rocr-runtime/files/rocr-runtime-6.1.0-ld-lld.patch
deleted file mode 100644
index fb5d3d341967..000000000000
--- a/dev-libs/rocr-runtime/files/rocr-runtime-6.1.0-ld-lld.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix "symbol not defined" when linking with ld.lld >= 17
-https://github.com/ROCm/ROCR-Runtime/issues/204
---- a/hsacore.so.def
-+++ b/hsacore.so.def
-@@ -246,12 +246,6 @@ global:
- hsa_amd_vmem_retain_alloc_handle;
- hsa_amd_vmem_get_alloc_properties_from_handle;
- hsa_amd_agent_set_async_scratch_limit;
-- hsa_tools_scratch_event_alloc_start;
-- hsa_tools_scratch_event_alloc_end;
-- hsa_tools_scratch_event_free_start;
-- hsa_tools_scratch_event_free_end;
-- hsa_tools_scratch_event_async_reclaim_start;
-- hsa_tools_scratch_event_async_reclaim_end;
-
- local:
- *;
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-6.1.0-musl.patch b/dev-libs/rocr-runtime/files/rocr-runtime-6.1.0-musl.patch
deleted file mode 100644
index 7554c8c79ec1..000000000000
--- a/dev-libs/rocr-runtime/files/rocr-runtime-6.1.0-musl.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-Fix compilation and symbol search with musl.
-
-Bug: https://github.com/ROCm/ROCR-Runtime/issues/181
---- src.orig/core/inc/checked.h
-+++ src/core/inc/checked.h
-@@ -58,7 +58,7 @@ template <uint64_t code, bool multiProce
- Check(const Check&) { object_ = uintptr_t(this) ^ uintptr_t(code); }
- Check(Check&&) { object_ = uintptr_t(this) ^ uintptr_t(code); }
-
-- ~Check() { object_ = NULL; }
-+ ~Check() { object_ = uintptr_t(NULL); }
-
- const Check& operator=(Check&& rhs) { return *this; }
- const Check& operator=(const Check& rhs) { return *this; }
---- src.orig/core/runtime/default_signal.cpp
-+++ src/core/runtime/default_signal.cpp
-@@ -57,7 +57,7 @@ int BusyWaitSignal::rtti_id_ = 0;
- BusyWaitSignal::BusyWaitSignal(SharedSignal* abi_block, bool enableIPC)
- : Signal(abi_block, enableIPC) {
- signal_.kind = AMD_SIGNAL_KIND_USER;
-- signal_.event_mailbox_ptr = NULL;
-+ signal_.event_mailbox_ptr = uint64_t(NULL);
- }
-
- hsa_signal_value_t BusyWaitSignal::LoadRelaxed() {
---- src.orig/core/util/lnx/os_linux.cpp
-+++ src/core/util/lnx/os_linux.cpp
-@@ -130,9 +130,12 @@ class os_thread {
- }
- }
-
-+ int cores = 0;
-+ cpu_set_t* cpuset = nullptr;
-+
- if (core::Runtime::runtime_singleton_->flag().override_cpu_affinity()) {
-- int cores = get_nprocs_conf();
-- cpu_set_t* cpuset = CPU_ALLOC(cores);
-+ cores = get_nprocs_conf();
-+ cpuset = CPU_ALLOC(cores);
- if (cpuset == nullptr) {
- fprintf(stderr, "CPU_ALLOC failed: %s\n", strerror(errno));
- return;
-@@ -642,11 +645,13 @@ SharedMutex CreateSharedMutex() {
- fprintf(stderr, "rw lock attribute init failed: %s\n", strerror(err));
- return nullptr;
- }
-+#if defined(__GLIBC__)
- err = pthread_rwlockattr_setkind_np(&attrib, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
- if (err != 0) {
- fprintf(stderr, "Set rw lock attribute failure: %s\n", strerror(err));
- return nullptr;
- }
-+#endif
-
- pthread_rwlock_t* lock = new pthread_rwlock_t;
- err = pthread_rwlock_init(lock, &attrib);
---- src.orig/core/util/utils.h
-+++ src/core/util/utils.h
-@@ -74,7 +74,7 @@ static __forceinline void* _aligned_mall
- return aligned_alloc(alignment, size);
- #else
- void *mem = NULL;
-- if (NULL != posix_memalign(&mem, alignment, size))
-+ if (0 != posix_memalign(&mem, alignment, size))
- return NULL;
- return mem;
- #endif
---- src.orig/image/util.h
-+++ src/image/util.h
-@@ -99,7 +99,7 @@ static __forceinline void* _aligned_mall
- return aligned_alloc(alignment, size);
- #else
- void* mem = NULL;
-- if (NULL != posix_memalign(&mem, alignment, size)) return NULL;
-+ if (0 != posix_memalign(&mem, alignment, size)) return NULL;
- return mem;
- #endif
- }
---- src.orig/core/util/lnx/os_linux.cpp
-+++ src/core/util/lnx/os_linux.cpp
-@@ -65,6 +65,16 @@
- #include <cpuid.h>
- #endif
-
-+/*
-+ * d_un.d_ptr is relative on non glibc systems
-+ * elf(5) documents it this way, glibc diverts from this documentation
-+ */
-+#ifdef __GLIBC__
-+#define ABS_ADDR(base, ptr) (ptr)
-+#else
-+#define ABS_ADDR(base, ptr) ((base) + (ptr))
-+#endif
-+
- namespace rocr {
- namespace os {
-
-@@ -299,7 +309,7 @@ static int callback(struct dl_phdr_info* info, size_t size, void* data) {
- for (int j = 0;; j++) {
- if (dyn_section[j].d_tag == DT_NULL) break;
-
-- if (dyn_section[j].d_tag == DT_STRTAB) strings = (char*)(dyn_section[j].d_un.d_ptr);
-+ if (dyn_section[j].d_tag == DT_STRTAB) strings = (char*)ABS_ADDR(info->dlpi_addr, dyn_section[j].d_un.d_ptr);
-
- if (dyn_section[j].d_tag == DT_STRSZ) limit = dyn_section[j].d_un.d_val;
- }
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocr-runtime/files/
@ 2022-12-24 7:18 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-12-24 7:18 UTC (permalink / raw
To: gentoo-commits
commit: 281c6ebfdbb4811bf0459430c12354a94087e76c
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Dec 21 17:47:12 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 07:14:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=281c6ebf
dev-libs/rocr-runtime: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28741
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../rocr-runtime-4.5.2-cmake-install-paths.patch | 40 ----------------------
1 file changed, 40 deletions(-)
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-4.5.2-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-4.5.2-cmake-install-paths.patch
deleted file mode 100644
index 063fafe336f7..000000000000
--- a/dev-libs/rocr-runtime/files/rocr-runtime-4.5.2-cmake-install-paths.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/CMakeLists.txt 2021-12-10 22:55:24.000000000 +0100
-+++ b/CMakeLists.txt 2021-12-15 15:33:43.545084656 +0100
-@@ -286,35 +286,17 @@
- install ( TARGETS ${CORE_RUNTIME_NAME} EXPORT ${CORE_RUNTIME_NAME}Targets )
- endif()
-
--## Create symlinks for legacy packaging and install
--add_custom_target ( hsa_include_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../include/hsa hsa_include_link )
--if ( ${BUILD_SHARED_LIBS} )
-- add_custom_target ( hsa_lib_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}-link.so )
-- add_custom_target ( hsa_lib_link2 ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} ${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} )
--endif()
--
- ## Set install information
- # Installs binaries and exports the library usage data to ${HSAKMT_TARGET}Targets
- # TODO: Fix me for flat directory layout. Should be ${CMAKE_INSTALL_LIBDIR}
--install ( TARGETS ${CORE_RUNTIME_TARGET} EXPORT ${CORE_RUNTIME_NAME}Targets
-- ARCHIVE DESTINATION lib COMPONENT binary
-- LIBRARY DESTINATION lib COMPONENT binary )
-+install ( TARGETS ${CORE_RUNTIME_TARGET} EXPORT ${CORE_RUNTIME_NAME}Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-
- # Install license
- #install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT binary )
-
- # Install public headers
- # TODO: Fix me for flat directory layout. Should be ${CMAKE_INSTALL_INCLUDEDIR}
--install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION include/hsa COMPONENT dev )
--
--# Legacy symlink - not packaged (CPack is bugged until ~3.18, see https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4637)
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION hsa/include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa )
--
--# Legacy symlinks.
--if ( ${BUILD_SHARED_LIBS} )
-- install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so COMPONENT binary)
-- install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} COMPONENT binary)
--endif ()
-+install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa )
-
- ## Configure and install package config file
- # Record our usage data for clients find_package calls.
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocr-runtime/files/
@ 2020-01-02 12:59 Craig Andrews
0 siblings, 0 replies; 4+ messages in thread
From: Craig Andrews @ 2020-01-02 12:59 UTC (permalink / raw
To: gentoo-commits
commit: df54a6d886d585e4b07181268f715aed752e9506
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 2 12:58:45 2020 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Thu Jan 2 12:58:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df54a6d8
dev-libs/rocr-runtime: Remove unused patches
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
.../rocr-runtime-2.0.0-cmake-install-paths.patch | 42 ----------------
.../rocr-runtime-2.8.0-fix_doorbell_map.patch | 57 ----------------------
2 files changed, 99 deletions(-)
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-2.0.0-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-2.0.0-cmake-install-paths.patch
deleted file mode 100644
index 2caeebb2bbb..00000000000
--- a/dev-libs/rocr-runtime/files/rocr-runtime-2.0.0-cmake-install-paths.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/51/
-
-commit 2d51a6133f32b72f60fba0e95234aee2b63aa682 (HEAD -> patch-6)
-Author: Craig Andrews <candrews@integralblue.com>
-Date: Mon Jan 7 21:06:14 2019 -0500
-
- Correctly install the library into the system
-
- Install to standard locations in /usr/{lib,include}/lib (as opposed to /usr/hsa/{lib,include}/hsa)
- Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR from GNUInstallDirs instead of using "lib" and "include"
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 37a9b09..545f183 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,6 +53,7 @@ project( ${CORE_RUNTIME_TARGET} )
-
- list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )
- include ( utils )
-+include ( GNUInstallDirs )
- include ( hsa_common )
-
- ## Find LibElf
-@@ -176,15 +177,9 @@ if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release )
- add_custom_command ( TARGET ${CORE_RUNTIME_TARGET} POST_BUILD COMMAND ${CMAKE_STRIP} *.so )
- endif ()
-
--## Create symlinks for packaging and install
--add_custom_target ( hsa-link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/include/hsa hsa-link )
--add_custom_target ( ${CORE_RUNTIME_TARGET}.so-link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}.so-link )
--
- ## Set install information
--install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION hsa/lib )
--install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION hsa/include/hsa )
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa-link DESTINATION include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa )
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}.so-link DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so )
-+install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-+install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa )
-
- ## Packaging directives
- set ( CPACK_PACKAGE_NAME "hsa-rocr-dev" )
-
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-2.8.0-fix_doorbell_map.patch b/dev-libs/rocr-runtime/files/rocr-runtime-2.8.0-fix_doorbell_map.patch
deleted file mode 100644
index aef3d297034..00000000000
--- a/dev-libs/rocr-runtime/files/rocr-runtime-2.8.0-fix_doorbell_map.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/71
-
-From d2a6ad97eb96a28d8f8b658b26ab94e911886cf2 Mon Sep 17 00:00:00 2001
-From: Sean Keely <Sean.Keely@amd.com>
-Date: Thu, 5 Sep 2019 20:58:57 -0500
-Subject: [PATCH] Correct doorbell_queue_map allocation.
-
-doorbell_queue_map should be allocated unconditionally.
----
- core/runtime/amd_gpu_agent.cpp | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/core/runtime/amd_gpu_agent.cpp b/core/runtime/amd_gpu_agent.cpp
-index 9b79a6b..76df913 100644
---- a/core/runtime/amd_gpu_agent.cpp
-+++ b/core/runtime/amd_gpu_agent.cpp
-@@ -1182,12 +1182,22 @@ void GpuAgent::SyncClocks() {
- }
-
- void GpuAgent::BindTrapHandler() {
-+ // Make an empty map from doorbell index to queue.
-+ // The trap handler uses this to retrieve a wave's amd_queue_t*.
-+ auto doorbell_queue_map_size = MAX_NUM_DOORBELLS * sizeof(amd_queue_t*);
-+
-+ doorbell_queue_map_ = (amd_queue_t**)core::Runtime::runtime_singleton_->system_allocator()(
-+ doorbell_queue_map_size, 0x1000, 0);
-+ assert(doorbell_queue_map_ != NULL && "Doorbell queue map allocation failed");
-+
-+ memset(doorbell_queue_map_, 0, doorbell_queue_map_size);
-+
- if (isa_->GetMajorVersion() == 7) {
- // No trap handler support on Gfx7, soft error.
- return;
- }
-
-- // Disable trap handler on Carrizo until KFD is fixed.
-+ // Disable trap handler on APUs until KFD is fixed.
- if (profile_ == HSA_PROFILE_FULL) {
- return;
- }
-@@ -1195,16 +1205,6 @@ void GpuAgent::BindTrapHandler() {
- // Assemble the trap handler source code.
- AssembleShader("TrapHandler", AssembleTarget::ISA, trap_code_buf_, trap_code_buf_size_);
-
-- // Make an empty map from doorbell index to queue.
-- // The trap handler uses this to retrieve a wave's amd_queue_t*.
-- auto doorbell_queue_map_size = MAX_NUM_DOORBELLS * sizeof(amd_queue_t*);
--
-- doorbell_queue_map_ = (amd_queue_t**)core::Runtime::runtime_singleton_->system_allocator()(
-- doorbell_queue_map_size, 0x1000, 0);
-- assert(doorbell_queue_map_ != NULL && "Doorbell queue map allocation failed");
--
-- memset(doorbell_queue_map_, 0, doorbell_queue_map_size);
--
- // Bind the trap handler to this node.
- HSAKMT_STATUS err = hsaKmtSetTrapHandler(node_id(), trap_code_buf_, trap_code_buf_size_,
- doorbell_queue_map_, doorbell_queue_map_size);
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-10-17 14:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-09 15:13 [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocr-runtime/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2025-10-17 14:31 Andreas Sturmlechner
2022-12-24 7:18 Sam James
2020-01-02 12:59 Craig Andrews
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox