| 1 |
commit: e1d053dbfe4fa017dff9bb79e6e0fc794fc105f0 |
| 2 |
Author: Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Aug 6 08:14:32 2022 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 6 14:20:14 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1d053db |
| 7 |
|
| 8 |
dev-util/rocprofiler: Skip loading proprietary AQLProfile lib |
| 9 |
|
| 10 |
This should be in d4034da0890695292c0c2d24aba60446bcf8a465 as the commit |
| 11 |
message suggests, but missed there. |
| 12 |
|
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/26755 |
| 14 |
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com> |
| 15 |
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> |
| 16 |
|
| 17 |
.../files/rocprofiler-4.3.0-no-aqlprofile.patch | 35 ++++++++++++++++++++++ |
| 18 |
dev-util/rocprofiler/rocprofiler-4.3.0.ebuild | 1 + |
| 19 |
dev-util/rocprofiler/rocprofiler-5.0.2.ebuild | 1 + |
| 20 |
3 files changed, 37 insertions(+) |
| 21 |
|
| 22 |
diff --git a/dev-util/rocprofiler/files/rocprofiler-4.3.0-no-aqlprofile.patch b/dev-util/rocprofiler/files/rocprofiler-4.3.0-no-aqlprofile.patch |
| 23 |
new file mode 100644 |
| 24 |
index 000000000000..12480d0baa0a |
| 25 |
--- /dev/null |
| 26 |
+++ b/dev-util/rocprofiler/files/rocprofiler-4.3.0-no-aqlprofile.patch |
| 27 |
@@ -0,0 +1,35 @@ |
| 28 |
+Skip loading proprietary AQLProfile lib |
| 29 |
+--- a/src/util/hsa_rsrc_factory.cpp 2021-06-28 23:09:44.000000000 +0800 |
| 30 |
++++ b/src/util/hsa_rsrc_factory.cpp 2022-05-11 10:48:23.431989766 +0800 |
| 31 |
+@@ -138,14 +138,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 |
+--- a/test/util/hsa_rsrc_factory.cpp 2021-06-28 23:09:44.000000000 +0800 |
| 47 |
++++ b/test/util/hsa_rsrc_factory.cpp 2022-05-11 10:50:44.571990702 +0800 |
| 48 |
+@@ -135,14 +135,6 @@ HsaRsrcFactory::HsaRsrcFactory(bool init |
| 49 |
+ if (cpu_pool_ == NULL) CHECK_STATUS("CPU memory pool is not found", HSA_STATUS_ERROR); |
| 50 |
+ if (kern_arg_pool_ == NULL) CHECK_STATUS("Kern-arg memory pool is not found", HSA_STATUS_ERROR); |
| 51 |
+ |
| 52 |
+- // Get AqlProfile API table |
| 53 |
+- aqlprofile_api_ = {0}; |
| 54 |
+-#ifdef ROCP_LD_AQLPROFILE |
| 55 |
+- status = LoadAqlProfileLib(&aqlprofile_api_); |
| 56 |
+-#else |
| 57 |
+- status = hsa_api_.hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_); |
| 58 |
+-#endif |
| 59 |
+- CHECK_STATUS("aqlprofile API table load failed", status); |
| 60 |
+ |
| 61 |
+ // Get Loader API table |
| 62 |
+ loader_api_ = {0}; |
| 63 |
|
| 64 |
diff --git a/dev-util/rocprofiler/rocprofiler-4.3.0.ebuild b/dev-util/rocprofiler/rocprofiler-4.3.0.ebuild |
| 65 |
index 630f4754fc8f..33982694c17f 100644 |
| 66 |
--- a/dev-util/rocprofiler/rocprofiler-4.3.0.ebuild |
| 67 |
+++ b/dev-util/rocprofiler/rocprofiler-4.3.0.ebuild |
| 68 |
@@ -28,6 +28,7 @@ BDEPEND=" |
| 69 |
|
| 70 |
PATCHES=( "${FILESDIR}/${P}-fix-gcc11.patch" |
| 71 |
"${FILESDIR}/${PN}-4.3.0-nostrip.patch" |
| 72 |
+ "${FILESDIR}/${PN}-4.3.0-no-aqlprofile.patch" |
| 73 |
"${FILESDIR}/${PN}-4.3.0-ldflag.patch" |
| 74 |
"${FILESDIR}/${PN}-4.3.0-gentoo-location.patch" ) |
| 75 |
|
| 76 |
|
| 77 |
diff --git a/dev-util/rocprofiler/rocprofiler-5.0.2.ebuild b/dev-util/rocprofiler/rocprofiler-5.0.2.ebuild |
| 78 |
index 7e8f0346636d..23d1b9cc746c 100644 |
| 79 |
--- a/dev-util/rocprofiler/rocprofiler-5.0.2.ebuild |
| 80 |
+++ b/dev-util/rocprofiler/rocprofiler-5.0.2.ebuild |
| 81 |
@@ -28,6 +28,7 @@ BDEPEND=" |
| 82 |
|
| 83 |
PATCHES=( "${FILESDIR}/${PN}-4.3.0-nostrip.patch" |
| 84 |
"${FILESDIR}/${PN}-4.3.0-ldflag.patch" |
| 85 |
+ "${FILESDIR}/${PN}-4.3.0-no-aqlprofile.patch" |
| 86 |
"${FILESDIR}/${PN}-5.0.2-gentoo-location.patch" ) |
| 87 |
|
| 88 |
python_check_deps() { |
Archives