Mesa (main): amd/common: Add fallback for misreported clocks for RGP.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 33065149c149d0650e8848db6b65f81f32e9cf22
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=33065149c149d0650e8848db6b65f81f32e9cf22

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Tue Oct 12 03:23:21 2021 +0200

amd/common: Add fallback for misreported clocks for RGP.

Traces with clock = 0 are totally useless due to RGP getting very
confused.

Cc: mesa-stable
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13301>

---

 src/amd/common/ac_rgp.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/amd/common/ac_rgp.c b/src/amd/common/ac_rgp.c
index 7d0d48a91c0..5d02004ab05 100644
--- a/src/amd/common/ac_rgp.c
+++ b/src/amd/common/ac_rgp.c
@@ -461,6 +461,13 @@ static void ac_sqtt_fill_asic_info(struct radeon_info *rad_info,
    chunk->trace_shader_core_clock = rad_info->max_shader_clock * 1000000;
    chunk->trace_memory_clock = rad_info->max_memory_clock * 1000000;
 
+   /* RGP gets very confused if these clocks are 0. The 1 GHz clocks are not necessarily correct,
+    * but the resulting traces are at least somewhat useful. */
+   if (!chunk->trace_shader_core_clock)
+      chunk->trace_shader_core_clock = 1e9;
+   if (!chunk->trace_memory_clock)
+      chunk->trace_memory_clock = 1e9;
+
    chunk->device_id = rad_info->pci_id;
    chunk->device_revision_id = rad_info->pci_rev_id;
    chunk->vgprs_per_simd = rad_info->num_physical_wave64_vgprs_per_simd * (has_wave32 ? 2 : 1);