fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-09 01:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

panfrost/pps: fix omitting several counters

Browse source 
The cid loop in the previous implementation stopped at n_counters for a
given category, even though cid is a global id that does not start
counting from zero at the beginning of each category. As a result, we
missed most of the counters outside of the first category.

Signed-off-by: Benjamin Lee <benjamin.lee@collabora.com>
Fixes: 513d1baaea ("pps: Panfrost pps driver")
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34202>
(cherry picked from commit 3b66e4a438)
This commit is contained in:
Benjamin Lee 2025-03-14 15:24:04 -07:00 • committed by Eric Engestrom
parent 91759a943f
commit e8ccf9bd1f
2 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1944,7 +1944,7 @@
"description": "panfrost/pps: fix omitting several counters",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "513d1baaea5eeef3d9bcfdf9f6e2180db8924236",
"notes": null

28
src/panfrost/ds/pan_pps_driver.cpp
View file

@ -35,21 +35,6 @@ PanfrostDriver::get_min_sampling_period_ns()
return 1000000;
}
uint32_t
find_id_within_group(uint32_t counter_id,
const struct panfrost_perf_config *cfg)
{
for (uint32_t cat_id = 0; cat_id < cfg->n_categories; ++cat_id) {
const struct panfrost_perf_category *cat = &cfg->categories[cat_id];
if (counter_id < cat->n_counters) {
break;
}
counter_id -= cat->n_counters;
}
return counter_id;
}
std::pair<std::vector<CounterGroup>, std::vector<Counter>>
PanfrostDriver::create_available_counters(const PanfrostPerf &perf)
{
@ -64,24 +49,21 @@ PanfrostDriver::create_available_counters(const PanfrostPerf &perf)
group.id = gid;
group.name = category.name;
for (; cid < category.n_counters; ++cid) {
for (size_t id = 0; id < category.n_counters; ++id) {
Counter counter = {};
counter.id = cid;
counter.group = gid;
uint32_t id_within_group = find_id_within_group(cid, perf.perf->cfg);
counter.name = category.counters[id_within_group].name;
counter.name = category.counters[id].name;
counter.set_getter([](const Counter &c, const Driver &d) {
counter.set_getter([=](const Counter &c, const Driver &d) {
auto &pan_driver = PanfrostDriver::into(d);
struct panfrost_perf *perf = pan_driver.perf->perf;
uint32_t id_within_group = find_id_within_group(c.id, perf->cfg);
const auto counter =
&perf->cfg->categories[c.group].counters[id_within_group];
const auto counter = &perf->cfg->categories[gid].counters[id];
return int64_t(panfrost_perf_counter_read(counter, perf));
});
group.counters.push_back(cid);
group.counters.push_back(cid++);
counters.emplace_back(counter);
}