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

freedreno/perfcntrs: Refactor derived counter setup

Browse source 
Most of what is done here doesn't need to be duplicated per hw gen.

Signed-off-by: Rob Clark <rob.clark@oss.qualcomm.com>
This commit is contained in:
Rob Clark 2026-05-01 16:36:41 -07:00
parent c642bc8c27
commit b5461ca40b
3 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/freedreno/perfcntrs/fd7_perfcntr.c
View file

@ -102,10 +102,7 @@ static_assert(DERIVED_COUNTER_PERFCNTR_MAX_VALUE <= FD_DERIVED_COUNTER_COLLECTIO
#define DERIVED_COUNTER_PERFCNTR_BV(_enum, _counter) \
[DERIVED_COUNTER_PERFCNTR_BV_##_enum] = { .counter = _counter, .countable = A7XX_PERF_##_enum }
static const struct {
const struct fd_perfcntr_counter *counter;
unsigned countable;
} a7xx_derived_counter_perfcntrs[] = {
const struct fd_derived_counter_perfcntr a7xx_derived_counter_perfcntrs[] = {
/* CP: 3/14 counters */
DERIVED_COUNTER_PERFCNTR(CP_ALWAYS_COUNT, &cp_counters[0]),
DERIVED_COUNTER_PERFCNTR(CP_NUM_PREEMPTIONS, &cp_counters[1]),
@ -985,50 +982,3 @@ const struct fd_derived_counter *a7xx_derived_counters[] = {
const unsigned a7xx_num_derived_counters = ARRAY_SIZE(a7xx_derived_counters);
static_assert(ARRAY_SIZE(a7xx_derived_counters) <= FD_DERIVED_COUNTER_COLLECTION_MAX_DERIVED_COUNTERS, "");
/* Prototype for linking purposes. */
void
a7xx_generate_derived_counter_collection(const struct fd_dev_id *id, struct fd_derived_counter_collection *collection);
void
a7xx_generate_derived_counter_collection(const struct fd_dev_id *id, struct fd_derived_counter_collection *collection)
{
/* The provided collection should already specify the derived counters that will be measured.
* This function will set up enabled_perfcntrs_map and enabled_perfcntrs array so that each
* used DERIVED_COUNTER_PERFCNTR_* enum value will map to the corresponding index in the
* array where the relevant fd_perfcntr_counter and fd_perfcntr_countable are stored.
*/
collection->num_enabled_perfcntrs = 0;
memset(collection->enabled_perfcntrs_map, 0xff, ARRAY_SIZE(collection->enabled_perfcntrs_map));
for (unsigned i = 0; i < collection->num_counters; ++i) {
const struct fd_derived_counter *counter = collection->counters[i];
for (unsigned j = 0; j < counter->num_perfcntrs; ++j) {
uint8_t perfcntr = counter->perfcntrs[j];
collection->enabled_perfcntrs_map[perfcntr] = 0x00;
}
}
/* Note if CP_ALWAYS_COUNT is enabled. This is the zero-index perfcntr. */
collection->cp_always_count_enabled = !collection->enabled_perfcntrs_map[0];
for (unsigned i = 0; i < ARRAY_SIZE(collection->enabled_perfcntrs_map); ++i) {
if (collection->enabled_perfcntrs_map[i] == 0xff)
continue;
uint8_t enabled_perfcntr_index = collection->num_enabled_perfcntrs++;
collection->enabled_perfcntrs_map[i] = enabled_perfcntr_index;
collection->enabled_perfcntrs[enabled_perfcntr_index].counter =
a7xx_derived_counter_perfcntrs[i].counter;
collection->enabled_perfcntrs[enabled_perfcntr_index].countable =
a7xx_derived_counter_perfcntrs[i].countable;
}
const struct fd_dev_info *info = fd_dev_info_raw(id);
collection->derivation_context.a7xx.number_of_usptp = info->num_sp_cores * 2;
collection->derivation_context.a7xx.number_of_alus_per_usptp = 128;
}

51
src/freedreno/perfcntrs/freedreno_perfcntr.c
View file

@ -302,6 +302,7 @@ fd_perfcntr_release(struct fd_perfcntr_state *perfcntrs,
simple_mtx_unlock(&perfcntrs->lock);
}
extern const struct fd_derived_counter_perfcntr a7xx_derived_counter_perfcntrs[];
extern const struct fd_derived_counter *a7xx_derived_counters[];
extern const unsigned a7xx_num_derived_counters;
@ -318,14 +319,58 @@ fd_derived_counters(const struct fd_dev_id *id, unsigned *count)
}
}
extern void a7xx_generate_derived_counter_collection(const struct fd_dev_id *id, struct fd_derived_counter_collection *collection);
void
fd_generate_derived_counter_collection(const struct fd_dev_id *id, struct fd_derived_counter_collection *collection)
{
const struct fd_derived_counter_perfcntr *derived_counter_perfcntrs = NULL;
switch (fd_dev_gen(id)) {
case 7:
a7xx_generate_derived_counter_collection(id, collection);
derived_counter_perfcntrs = a7xx_derived_counter_perfcntrs;
break;
default:
return;
}
/* The provided collection should already specify the derived counters that will be measured.
* This function will set up enabled_perfcntrs_map and enabled_perfcntrs array so that each
* used DERIVED_COUNTER_PERFCNTR_* enum value will map to the corresponding index in the
* array where the relevant fd_perfcntr_counter and fd_perfcntr_countable are stored.
*/
collection->num_enabled_perfcntrs = 0;
memset(collection->enabled_perfcntrs_map, 0xff, ARRAY_SIZE(collection->enabled_perfcntrs_map));
for (unsigned i = 0; i < collection->num_counters; ++i) {
const struct fd_derived_counter *counter = collection->counters[i];
for (unsigned j = 0; j < counter->num_perfcntrs; ++j) {
uint8_t perfcntr = counter->perfcntrs[j];
collection->enabled_perfcntrs_map[perfcntr] = 0x00;
}
}
/* Note if CP_ALWAYS_COUNT is enabled. This is the zero-index perfcntr. */
collection->cp_always_count_enabled = !collection->enabled_perfcntrs_map[0];
for (unsigned i = 0; i < ARRAY_SIZE(collection->enabled_perfcntrs_map); ++i) {
if (collection->enabled_perfcntrs_map[i] == 0xff)
continue;
uint8_t enabled_perfcntr_index = collection->num_enabled_perfcntrs++;
collection->enabled_perfcntrs_map[i] = enabled_perfcntr_index;
collection->enabled_perfcntrs[enabled_perfcntr_index].counter =
derived_counter_perfcntrs[i].counter;
collection->enabled_perfcntrs[enabled_perfcntr_index].countable =
derived_counter_perfcntrs[i].countable;
}
const struct fd_dev_info *info = fd_dev_info_raw(id);
switch (fd_dev_gen(id)) {
case 7:
collection->derivation_context.a7xx.number_of_usptp = info->num_sp_cores * 2;
collection->derivation_context.a7xx.number_of_alus_per_usptp = 128;
break;
default:
break;

5
src/freedreno/perfcntrs/freedreno_perfcntr.h
View file

@ -152,6 +152,11 @@ struct fd_derived_counter {
uint64_t (*derive)(struct fd_derivation_context *context, uint64_t *values);
};
struct fd_derived_counter_perfcntr {
const struct fd_perfcntr_counter *counter;
unsigned countable;
};
const struct fd_derived_counter **fd_derived_counters(const struct fd_dev_id *id, unsigned *count);
#define FD_DERIVED_COUNTER_COLLECTION_MAX_DERIVED_COUNTERS 64