Mesa (main): intel/perf: add new layout for Gfx12.5 products

[GitLab Mirror]

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

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Wed Jul  7 00:15:28 2021 -0700

intel/perf: add new layout for Gfx12.5 products

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16144>

---

 src/intel/perf/intel_perf.c      | 15 ++++++++++++++-
 src/intel/perf/intel_perf_regs.h |  2 ++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/intel/perf/intel_perf.c b/src/intel/perf/intel_perf.c
index d0baa0b8291..88ab9595846 100644
--- a/src/intel/perf/intel_perf.c
+++ b/src/intel/perf/intel_perf.c
@@ -1360,7 +1360,20 @@ intel_perf_init_query_fields(struct intel_perf_config *perf_cfg,
                add_query_register(layout, INTEL_PERF_QUERY_FIELD_TYPE_SRM_OA_C,
                                   GFX8_OA_PERF_C32(i), 4, i);
             }
-         } else if (devinfo->ver == 12) {
+         } else if (devinfo->verx10 == 120) {
+            for (uint32_t i = 0; i < GFX12_N_OAG_PERF_B32; i++) {
+               add_query_register(layout, INTEL_PERF_QUERY_FIELD_TYPE_SRM_OA_B,
+                                  GFX12_OAG_PERF_B32(i), 4, i);
+            }
+            for (uint32_t i = 0; i < GFX12_N_OAG_PERF_C32; i++) {
+               add_query_register(layout, INTEL_PERF_QUERY_FIELD_TYPE_SRM_OA_C,
+                                  GFX12_OAG_PERF_C32(i), 4, i);
+            }
+         } else if (devinfo->verx10 == 125) {
+            add_query_register(layout, INTEL_PERF_QUERY_FIELD_TYPE_SRM_OA_A,
+                               GFX125_OAG_PERF_A36, 4, 36);
+            add_query_register(layout, INTEL_PERF_QUERY_FIELD_TYPE_SRM_OA_A,
+                               GFX125_OAG_PERF_A37, 4, 37);
             for (uint32_t i = 0; i < GFX12_N_OAG_PERF_B32; i++) {
                add_query_register(layout, INTEL_PERF_QUERY_FIELD_TYPE_SRM_OA_B,
                                   GFX12_OAG_PERF_B32(i), 4, i);
diff --git a/src/intel/perf/intel_perf_regs.h b/src/intel/perf/intel_perf_regs.h
index 43834cf098b..ae406cb9c2b 100644
--- a/src/intel/perf/intel_perf_regs.h
+++ b/src/intel/perf/intel_perf_regs.h
@@ -71,6 +71,8 @@
 #define GFX12_OAG_PERF_A32(idx)            (0xda80 + (idx) * 4)
 #define GFX12_OAG_PERF_B32(idx)            (0xda94 + (idx) * 4)
 #define GFX12_OAG_PERF_C32(idx)            (0xdab4 + (idx) * 4)
+#define GFX125_OAG_PERF_A36                (0xdb20)
+#define GFX125_OAG_PERF_A37                (0xdb28)
 
 /* Pipeline statistic counters */
 #define IA_VERTICES_COUNT          0x2310