fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 11:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panfrost: Create an enumeration for the counter categories

Browse source 
The Mali-Gx10 series (G710, G610 and G510) introduce one new category of
counters which needs to be accounted for in the setup code. Adding this
into an enum ensures relevant structs are updated automatically.

v2:
- Modified generator script to use the enum

Signed-off-by: Lukas Zapolskas <lukas.zapolskas@arm.com>
This commit is contained in:
Lukas Zapolskas 2025-03-19 15:04:24 +00:00 • committed by Christoph Pillmayer
parent 0c0b2a4d38
commit 1749999200
3 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/panfrost/perf/pan_gen_perf.py
View file

@ -120,7 +120,7 @@ def main():
c.indent(tab_size) c.indent(tab_size)
n_categories = len(prod.categories) n_categories = len(prod.categories)
c.write("STATIC_ASSERT(%u <= PAN_PERF_MAX_CATEGORIES);" % n_categories) c.write("STATIC_ASSERT(%u <= PAN_PERF_COUNTER_CAT_MAX);" % n_categories)
n_counters = 0 n_counters = 0
for category in prod.categories: for category in prod.categories:
category_counters_count = len(category.counters) category_counters_count = len(category.counters)

20
src/panfrost/perf/pan_perf.c
View file

@ -17,18 +17,16 @@
#include <lib/pan_props.h> #include <lib/pan_props.h>
#include <pan_perf_metrics.h> #include <pan_perf_metrics.h>
#define PAN_SHADER_CORE_INDEX 3
int64_t int64_t
pan_perf_counter_read_raw(const struct pan_perf *perf, uint8_t category_index, pan_perf_counter_read_raw(const struct pan_perf *perf,
enum pan_perf_counter_categories category,
uint8_t block_index, uint32_t counter_index) uint8_t block_index, uint32_t counter_index)
{ {
assert(perf->session->data != NULL); assert(perf->session->data != NULL);
const uint32_t val_offset = const uint32_t val_offset = perf->mem_layout.category[category].offset +
perf->mem_layout.category[category_index].offset + perf->mem_layout.block_stride * block_index +
perf->mem_layout.block_stride * block_index + perf->mem_layout.counter_stride * counter_index;
perf->mem_layout.counter_stride * counter_index;
uint8_t *val_ptr = ((uint8_t *)perf->session->data) + val_offset; uint8_t *val_ptr = ((uint8_t *)perf->session->data) + val_offset;
return pan_kmod_perf_load_counter(perf->session, val_ptr); return pan_kmod_perf_load_counter(perf->session, val_ptr);
@ -42,12 +40,12 @@ pan_perf_counter_read(const struct pan_perf_counter *counter,
counter->offset); counter->offset);
/* If counter belongs to shader core, sum values for all cores. */ /* If counter belongs to shader core, sum values for all cores. */
if (counter->category_index == PAN_SHADER_CORE_INDEX) { if (counter->category_index == PAN_PERF_COUNTER_CAT_SHADER) {
uint32_t n_cores = uint32_t n_cores =
perf->mem_layout.category[PAN_SHADER_CORE_INDEX].n_blocks; perf->mem_layout.category[PAN_PERF_COUNTER_CAT_SHADER].n_blocks;
for (uint32_t core = 1; core < n_cores; ++core) { for (uint32_t core = 1; core < n_cores; ++core) {
ret += pan_perf_counter_read_raw(perf, PAN_SHADER_CORE_INDEX, core, ret += pan_perf_counter_read_raw(perf, PAN_PERF_COUNTER_CAT_SHADER,
counter->offset); core, counter->offset);
assert(ret >= 0 && "counter sum should not overflow"); assert(ret >= 0 && "counter sum should not overflow");
} }
} }

16
src/panfrost/perf/pan_perf.h
View file

@ -14,9 +14,17 @@
extern "C" { extern "C" {
#endif #endif
#define PAN_PERF_MAX_CATEGORIES 4
#define PAN_PERF_MAX_COUNTERS 64 #define PAN_PERF_MAX_COUNTERS 64
enum pan_perf_counter_categories {
PAN_PERF_COUNTER_CAT_FRONTEND,
PAN_PERF_COUNTER_CAT_TILER,
PAN_PERF_COUNTER_CAT_MEMSYS,
PAN_PERF_COUNTER_CAT_SHADER,
/* Must be last. */
PAN_PERF_COUNTER_CAT_MAX,
};
enum pan_perf_counter_units { enum pan_perf_counter_units {
PAN_PERF_COUNTER_UNITS_CYCLES, PAN_PERF_COUNTER_UNITS_CYCLES,
PAN_PERF_COUNTER_UNITS_JOBS, PAN_PERF_COUNTER_UNITS_JOBS,
@ -59,7 +67,7 @@ struct pan_perf_category {
struct pan_perf_config { struct pan_perf_config {
const char *name; const char *name;
struct pan_perf_category categories[PAN_PERF_MAX_CATEGORIES]; struct pan_perf_category categories[PAN_PERF_COUNTER_CAT_MAX];
uint32_t n_categories; uint32_t n_categories;
}; };
@ -71,8 +79,8 @@ struct pan_perf {
}; };
int64_t pan_perf_counter_read_raw(const struct pan_perf *perf, int64_t pan_perf_counter_read_raw(const struct pan_perf *perf,
uint8_t category_index, uint8_t block_index, enum pan_perf_counter_categories category,
uint32_t counter_index); uint8_t block_index, uint32_t counter_index);
int64_t pan_perf_counter_read(const struct pan_perf_counter *counter, int64_t pan_perf_counter_read(const struct pan_perf_counter *counter,
const struct pan_perf *perf); const struct pan_perf *perf);