1 |
commit: df54a6d886d585e4b07181268f715aed752e9506 |
2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 2 12:58:45 2020 +0000 |
4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 2 12:58:45 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df54a6d8 |
7 |
|
8 |
dev-libs/rocr-runtime: Remove unused patches |
9 |
|
10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
11 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
12 |
|
13 |
.../rocr-runtime-2.0.0-cmake-install-paths.patch | 42 ---------------- |
14 |
.../rocr-runtime-2.8.0-fix_doorbell_map.patch | 57 ---------------------- |
15 |
2 files changed, 99 deletions(-) |
16 |
|
17 |
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 |
18 |
deleted file mode 100644 |
19 |
index 2caeebb2bbb..00000000000 |
20 |
--- a/dev-libs/rocr-runtime/files/rocr-runtime-2.0.0-cmake-install-paths.patch |
21 |
+++ /dev/null |
22 |
@@ -1,42 +0,0 @@ |
23 |
-https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/51/ |
24 |
- |
25 |
-commit 2d51a6133f32b72f60fba0e95234aee2b63aa682 (HEAD -> patch-6) |
26 |
-Author: Craig Andrews <candrews@××××××××××××.com> |
27 |
-Date: Mon Jan 7 21:06:14 2019 -0500 |
28 |
- |
29 |
- Correctly install the library into the system |
30 |
- |
31 |
- Install to standard locations in /usr/{lib,include}/lib (as opposed to /usr/hsa/{lib,include}/hsa) |
32 |
- Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR from GNUInstallDirs instead of using "lib" and "include" |
33 |
- |
34 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
35 |
-index 37a9b09..545f183 100644 |
36 |
---- a/CMakeLists.txt |
37 |
-+++ b/CMakeLists.txt |
38 |
-@@ -53,6 +53,7 @@ project( ${CORE_RUNTIME_TARGET} ) |
39 |
- |
40 |
- list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" ) |
41 |
- include ( utils ) |
42 |
-+include ( GNUInstallDirs ) |
43 |
- include ( hsa_common ) |
44 |
- |
45 |
- ## Find LibElf |
46 |
-@@ -176,15 +177,9 @@ if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release ) |
47 |
- add_custom_command ( TARGET ${CORE_RUNTIME_TARGET} POST_BUILD COMMAND ${CMAKE_STRIP} *.so ) |
48 |
- endif () |
49 |
- |
50 |
--## Create symlinks for packaging and install |
51 |
--add_custom_target ( hsa-link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/include/hsa hsa-link ) |
52 |
--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 ) |
53 |
-- |
54 |
- ## Set install information |
55 |
--install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION hsa/lib ) |
56 |
--install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION hsa/include/hsa ) |
57 |
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa-link DESTINATION include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa ) |
58 |
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}.so-link DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so ) |
59 |
-+install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) |
60 |
-+install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa ) |
61 |
- |
62 |
- ## Packaging directives |
63 |
- set ( CPACK_PACKAGE_NAME "hsa-rocr-dev" ) |
64 |
- |
65 |
|
66 |
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 |
67 |
deleted file mode 100644 |
68 |
index aef3d297034..00000000000 |
69 |
--- a/dev-libs/rocr-runtime/files/rocr-runtime-2.8.0-fix_doorbell_map.patch |
70 |
+++ /dev/null |
71 |
@@ -1,57 +0,0 @@ |
72 |
-https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/71 |
73 |
- |
74 |
-From d2a6ad97eb96a28d8f8b658b26ab94e911886cf2 Mon Sep 17 00:00:00 2001 |
75 |
-From: Sean Keely <Sean.Keely@×××.com> |
76 |
-Date: Thu, 5 Sep 2019 20:58:57 -0500 |
77 |
-Subject: [PATCH] Correct doorbell_queue_map allocation. |
78 |
- |
79 |
-doorbell_queue_map should be allocated unconditionally. |
80 |
---- |
81 |
- core/runtime/amd_gpu_agent.cpp | 22 +++++++++++----------- |
82 |
- 1 file changed, 11 insertions(+), 11 deletions(-) |
83 |
- |
84 |
-diff --git a/core/runtime/amd_gpu_agent.cpp b/core/runtime/amd_gpu_agent.cpp |
85 |
-index 9b79a6b..76df913 100644 |
86 |
---- a/core/runtime/amd_gpu_agent.cpp |
87 |
-+++ b/core/runtime/amd_gpu_agent.cpp |
88 |
-@@ -1182,12 +1182,22 @@ void GpuAgent::SyncClocks() { |
89 |
- } |
90 |
- |
91 |
- void GpuAgent::BindTrapHandler() { |
92 |
-+ // Make an empty map from doorbell index to queue. |
93 |
-+ // The trap handler uses this to retrieve a wave's amd_queue_t*. |
94 |
-+ auto doorbell_queue_map_size = MAX_NUM_DOORBELLS * sizeof(amd_queue_t*); |
95 |
-+ |
96 |
-+ doorbell_queue_map_ = (amd_queue_t**)core::Runtime::runtime_singleton_->system_allocator()( |
97 |
-+ doorbell_queue_map_size, 0x1000, 0); |
98 |
-+ assert(doorbell_queue_map_ != NULL && "Doorbell queue map allocation failed"); |
99 |
-+ |
100 |
-+ memset(doorbell_queue_map_, 0, doorbell_queue_map_size); |
101 |
-+ |
102 |
- if (isa_->GetMajorVersion() == 7) { |
103 |
- // No trap handler support on Gfx7, soft error. |
104 |
- return; |
105 |
- } |
106 |
- |
107 |
-- // Disable trap handler on Carrizo until KFD is fixed. |
108 |
-+ // Disable trap handler on APUs until KFD is fixed. |
109 |
- if (profile_ == HSA_PROFILE_FULL) { |
110 |
- return; |
111 |
- } |
112 |
-@@ -1195,16 +1205,6 @@ void GpuAgent::BindTrapHandler() { |
113 |
- // Assemble the trap handler source code. |
114 |
- AssembleShader("TrapHandler", AssembleTarget::ISA, trap_code_buf_, trap_code_buf_size_); |
115 |
- |
116 |
-- // Make an empty map from doorbell index to queue. |
117 |
-- // The trap handler uses this to retrieve a wave's amd_queue_t*. |
118 |
-- auto doorbell_queue_map_size = MAX_NUM_DOORBELLS * sizeof(amd_queue_t*); |
119 |
-- |
120 |
-- doorbell_queue_map_ = (amd_queue_t**)core::Runtime::runtime_singleton_->system_allocator()( |
121 |
-- doorbell_queue_map_size, 0x1000, 0); |
122 |
-- assert(doorbell_queue_map_ != NULL && "Doorbell queue map allocation failed"); |
123 |
-- |
124 |
-- memset(doorbell_queue_map_, 0, doorbell_queue_map_size); |
125 |
-- |
126 |
- // Bind the trap handler to this node. |
127 |
- HSAKMT_STATUS err = hsaKmtSetTrapHandler(node_id(), trap_code_buf_, trap_code_buf_size_, |
128 |
- doorbell_queue_map_, doorbell_queue_map_size); |