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

tu/query_pool: Avoid CP counter conflict with autotune

Browse source 
With autotune allocating counters low-to-high, the conflict with
PERFORMANCE_QUERY_KHR will happen if any CP-based counters are
used. This is a temporary workaround which just drops the first
two CP counters from being usable for performance queries.

Cc: mesa-stable
Signed-off-by: Dhruv Mark Collins <mark@igalia.com>
Assisted-by: OpenAI Codex (GPT-5.4)
(cherry picked from commit 78e2bbc70f)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41104>
This commit is contained in:
Dhruv Mark Collins 2026-04-16 21:53:54 +00:00 • committed by Eric Engestrom
parent 203ae35091
commit b8e9e83bbe
2 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2104,7 +2104,7 @@
"description": "tu/query_pool: Avoid CP counter conflict with autotune",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

38
src/freedreno/vulkan/tu_query_pool.cc
View file

@ -249,6 +249,21 @@ perfcntr_index(const struct fd_perfcntr_group *group, uint32_t group_count,
assert(i < group_count);
}
static uint32_t
perfcntr_reserved_counters(const struct fd_perfcntr_group *group)
{
/* Keep raw perf queries off the CP slots reserved by autotune latency optimization.
* TODO: We need to do this in a more robust way.
*/
return strcmp(group->name, "CP") == 0 ? 2 : 0;
}
static uint32_t
perfcntr_available_counters(const struct fd_perfcntr_group *group)
{
return group->num_counters - MIN2(group->num_counters, perfcntr_reserved_counters(group));
}
static int
compare_perfcntr_pass(const void *a, const void *b)
{
@ -360,15 +375,26 @@ tu_CreateQueryPool(VkDevice _device,
perf_query->data[i].cid = cid;
perf_query->data[i].app_idx = i;
const struct fd_perfcntr_group *group = &perf_query->perf_group[gid];
uint32_t reserved_counters = perfcntr_reserved_counters(group);
uint32_t available_counters = perfcntr_available_counters(group);
if (available_counters == 0) {
vk_query_pool_destroy(&device->vk, pAllocator, &pool->vk);
return vk_errorf(device, VK_ERROR_FEATURE_NOT_PRESENT, "No raw perf counters available in group %s",
group->name);
}
/* When a counter register is over the capacity(num_counters),
* reset it for next pass.
*/
if (regs[gid] < perf_query->perf_group[gid].num_counters) {
perf_query->data[i].cntr_reg = regs[gid]++;
if (regs[gid] < available_counters) {
perf_query->data[i].cntr_reg = reserved_counters + regs[gid]++;
perf_query->data[i].pass = pass[gid];
} else {
perf_query->data[i].pass = ++pass[gid];
perf_query->data[i].cntr_reg = regs[gid] = 0;
perf_query->data[i].cntr_reg = reserved_counters;
regs[gid] = 0;
regs[gid]++;
}
}
@ -2299,7 +2325,11 @@ tu_GetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR(
}
for (uint32_t i = 0; i < group_count; i++) {
n_passes = DIV_ROUND_UP(counters_requested[i], group[i].num_counters);
uint32_t available_counters = perfcntr_available_counters(&group[i]);
if (available_counters == 0)
continue;
n_passes = DIV_ROUND_UP(counters_requested[i], available_counters);
*pNumPasses = MAX2(*pNumPasses, n_passes);
}
} else {