| 1 |
commit: bd9ffa661677c66e9a1b1208db16d4b709cf5a7c |
| 2 |
Author: Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Aug 7 10:28:40 2022 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 8 01:35:11 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd9ffa66 |
| 7 |
|
| 8 |
dev-util/roctracer: Skip loading proprietary AQLProfile lib |
| 9 |
|
| 10 |
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com> |
| 11 |
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/roctracer-4.3.0-no-aqlprofile.patch | 20 +++++++++++ |
| 14 |
.../files/roctracer-5.1.3-no-aqlprofile.patch | 39 ++++++++++++++++++++++ |
| 15 |
...r-4.3.0-r2.ebuild => roctracer-4.3.0-r3.ebuild} | 1 + |
| 16 |
...acer-5.0.2.ebuild => roctracer-5.0.2-r1.ebuild} | 1 + |
| 17 |
...acer-5.1.3.ebuild => roctracer-5.1.3-r1.ebuild} | 1 + |
| 18 |
5 files changed, 62 insertions(+) |
| 19 |
|
| 20 |
diff --git a/dev-util/roctracer/files/roctracer-4.3.0-no-aqlprofile.patch b/dev-util/roctracer/files/roctracer-4.3.0-no-aqlprofile.patch |
| 21 |
new file mode 100644 |
| 22 |
index 000000000000..0548953f3089 |
| 23 |
--- /dev/null |
| 24 |
+++ b/dev-util/roctracer/files/roctracer-4.3.0-no-aqlprofile.patch |
| 25 |
@@ -0,0 +1,20 @@ |
| 26 |
+Skip loading proprietary AQLProfile lib |
| 27 |
+Index: roctracer-rocm-5.1.3/src/util/hsa_rsrc_factory.cpp |
| 28 |
+=================================================================== |
| 29 |
+--- roctracer-rocm-5.1.3.orig/src/util/hsa_rsrc_factory.cpp |
| 30 |
++++ roctracer-rocm-5.1.3/src/util/hsa_rsrc_factory.cpp |
| 31 |
+@@ -127,14 +127,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool init |
| 32 |
+ if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR); |
| 33 |
+ if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR); |
| 34 |
+ |
| 35 |
+- // Get AqlProfile API table |
| 36 |
+- aqlprofile_api_ = {0}; |
| 37 |
+-#ifdef ROCP_LD_AQLPROFILE |
| 38 |
+- status = LoadAqlProfileLib(&aqlprofile_api_); |
| 39 |
+-#else |
| 40 |
+- status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_); |
| 41 |
+-#endif |
| 42 |
+- CHECK_STATUS("aqlprofile API table load failed", status); |
| 43 |
+ |
| 44 |
+ // Get Loader API table |
| 45 |
+ loader_api_ = {0}; |
| 46 |
|
| 47 |
diff --git a/dev-util/roctracer/files/roctracer-5.1.3-no-aqlprofile.patch b/dev-util/roctracer/files/roctracer-5.1.3-no-aqlprofile.patch |
| 48 |
new file mode 100644 |
| 49 |
index 000000000000..93ddee3e5b43 |
| 50 |
--- /dev/null |
| 51 |
+++ b/dev-util/roctracer/files/roctracer-5.1.3-no-aqlprofile.patch |
| 52 |
@@ -0,0 +1,39 @@ |
| 53 |
+Skip loading proprietary AQLProfile lib |
| 54 |
+Index: roctracer-rocm-5.1.3/src/util/hsa_rsrc_factory.cpp |
| 55 |
+=================================================================== |
| 56 |
+--- roctracer-rocm-5.1.3.orig/src/util/hsa_rsrc_factory.cpp |
| 57 |
++++ roctracer-rocm-5.1.3/src/util/hsa_rsrc_factory.cpp |
| 58 |
+@@ -127,14 +127,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool init |
| 59 |
+ if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR); |
| 60 |
+ if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR); |
| 61 |
+ |
| 62 |
+- // Get AqlProfile API table |
| 63 |
+- aqlprofile_api_ = {0}; |
| 64 |
+-#ifdef ROCP_LD_AQLPROFILE |
| 65 |
+- status = LoadAqlProfileLib(&aqlprofile_api_); |
| 66 |
+-#else |
| 67 |
+- status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_); |
| 68 |
+-#endif |
| 69 |
+- CHECK_STATUS("aqlprofile API table load failed", status); |
| 70 |
+ |
| 71 |
+ // Get Loader API table |
| 72 |
+ loader_api_ = {0}; |
| 73 |
+Index: roctracer-rocm-5.1.3/test/hsa/src/hsa_rsrc_factory.cpp |
| 74 |
+=================================================================== |
| 75 |
+--- roctracer-rocm-5.1.3.orig/test/hsa/src/hsa_rsrc_factory.cpp |
| 76 |
++++ roctracer-rocm-5.1.3/test/hsa/src/hsa_rsrc_factory.cpp |
| 77 |
+@@ -125,14 +125,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool init |
| 78 |
+ if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR); |
| 79 |
+ if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR); |
| 80 |
+ |
| 81 |
+- // Get AqlProfile API table |
| 82 |
+- aqlprofile_api_ = {0}; |
| 83 |
+-#ifdef ROCP_LD_AQLPROFILE |
| 84 |
+- status = LoadAqlProfileLib(&aqlprofile_api_); |
| 85 |
+-#else |
| 86 |
+- status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_); |
| 87 |
+-#endif |
| 88 |
+- CHECK_STATUS("aqlprofile API table load failed", status); |
| 89 |
+ |
| 90 |
+ // Get Loader API table |
| 91 |
+ loader_api_ = {0}; |
| 92 |
|
| 93 |
diff --git a/dev-util/roctracer/roctracer-4.3.0-r2.ebuild b/dev-util/roctracer/roctracer-4.3.0-r3.ebuild |
| 94 |
similarity index 98% |
| 95 |
rename from dev-util/roctracer/roctracer-4.3.0-r2.ebuild |
| 96 |
rename to dev-util/roctracer/roctracer-4.3.0-r3.ebuild |
| 97 |
index e5c7872fe3a1..c0573fc9cb13 100644 |
| 98 |
--- a/dev-util/roctracer/roctracer-4.3.0-r2.ebuild |
| 99 |
+++ b/dev-util/roctracer/roctracer-4.3.0-r3.ebuild |
| 100 |
@@ -33,6 +33,7 @@ PATCHES=( |
| 101 |
"${FILESDIR}"/${PN}-4.3.0-glibc-2.34.patch |
| 102 |
"${FILESDIR}"/${PN}-4.3.0-ldflag.patch |
| 103 |
"${FILESDIR}"/${PN}-4.3.0-tracer_tool.patch |
| 104 |
+ "${FILESDIR}"/${PN}-4.3.0-no-aqlprofile.patch |
| 105 |
) |
| 106 |
|
| 107 |
python_check_deps() { |
| 108 |
|
| 109 |
diff --git a/dev-util/roctracer/roctracer-5.0.2.ebuild b/dev-util/roctracer/roctracer-5.0.2-r1.ebuild |
| 110 |
similarity index 98% |
| 111 |
rename from dev-util/roctracer/roctracer-5.0.2.ebuild |
| 112 |
rename to dev-util/roctracer/roctracer-5.0.2-r1.ebuild |
| 113 |
index efabd899d252..a95a1732ef5e 100644 |
| 114 |
--- a/dev-util/roctracer/roctracer-5.0.2.ebuild |
| 115 |
+++ b/dev-util/roctracer/roctracer-5.0.2-r1.ebuild |
| 116 |
@@ -36,6 +36,7 @@ PATCHES=( |
| 117 |
"${FILESDIR}"/${PN}-5.0.2-Werror.patch |
| 118 |
"${FILESDIR}"/${PN}-5.0.2-headers.patch |
| 119 |
"${FILESDIR}"/${PN}-5.0.2-strip-license.patch |
| 120 |
+ "${FILESDIR}"/${PN}-4.3.0-no-aqlprofile.patch |
| 121 |
) |
| 122 |
|
| 123 |
python_check_deps() { |
| 124 |
|
| 125 |
diff --git a/dev-util/roctracer/roctracer-5.1.3.ebuild b/dev-util/roctracer/roctracer-5.1.3-r1.ebuild |
| 126 |
similarity index 98% |
| 127 |
rename from dev-util/roctracer/roctracer-5.1.3.ebuild |
| 128 |
rename to dev-util/roctracer/roctracer-5.1.3-r1.ebuild |
| 129 |
index b378cfcc340d..1154d03f8c16 100644 |
| 130 |
--- a/dev-util/roctracer/roctracer-5.1.3.ebuild |
| 131 |
+++ b/dev-util/roctracer/roctracer-5.1.3-r1.ebuild |
| 132 |
@@ -34,6 +34,7 @@ PATCHES=( |
| 133 |
"${FILESDIR}"/${PN}-5.0.2-Werror.patch |
| 134 |
"${FILESDIR}"/${PN}-5.0.2-headers.patch |
| 135 |
"${FILESDIR}"/${PN}-5.0.2-strip-license.patch |
| 136 |
+ "${FILESDIR}"/${PN}-5.1.3-no-aqlprofile.patch |
| 137 |
) |
| 138 |
|
| 139 |
python_check_deps() { |
Archives