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

u_trace: Indirect capture fixes

Browse source 
Fixes a missing sizeof parenthesis.
Fixes multiple indirects writing to the same address.

Fixes: 0a17035b5c ("u_trace: add support for indirect data")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Christoph Pillmayer <christoph.pillmayer@arm.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36519>
(cherry picked from commit 78ca5ef87f)
This commit is contained in:
Lars-Ivar Hesselberg Simonsen 2025-07-29 16:26:27 +02:00 • committed by Eric Engestrom
parent d7eb552051
commit 1a474a31fe
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1334,7 +1334,7 @@
"description": "u_trace: Indirect capture fixes", "description": "u_trace: Indirect capture fixes",
"nominated": true, "nominated": true,
"nomination_type": 2, "nomination_type": 2,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": "0a17035b5cd3e181a2bf4ab6feea8b4d5763b613", "because_sha": "0a17035b5cd3e181a2bf4ab6feea8b4d5763b613",
"notes": null "notes": null

10
src/util/perf/u_trace.c
View file

@ -980,11 +980,13 @@ u_trace_appendv(struct u_trace *ut,
tp->flags); tp->flags);
if (ut->utctx->enabled_traces & U_TRACE_TYPE_INDIRECTS) { if (ut->utctx->enabled_traces & U_TRACE_TYPE_INDIRECTS) {
uint64_t dst_offset = 0;
for (unsigned i = 0; i < n_indirects; i++) { for (unsigned i = 0; i < n_indirects; i++) {
ut->utctx->capture_data(ut, cs, chunk->indirects, ut->utctx->capture_data(
ut->utctx->max_indirect_size_bytes * tp_idx, ut, cs, chunk->indirects,
addresses[i].bo, addresses[i].offset, ut->utctx->max_indirect_size_bytes * tp_idx + dst_offset,
indirect_sizes_B[i]); addresses[i].bo, addresses[i].offset, indirect_sizes_B[i]);
dst_offset += indirect_sizes_B[i];
} }
chunk->has_indirect |= n_indirects > 0; chunk->has_indirect |= n_indirects > 0;
} }

2
src/util/perf/u_trace.py
View file

@ -89,7 +89,7 @@ class Tracepoint(object):
indirect_sizes = [] indirect_sizes = []
for indirect in self.indirect_args: for indirect in self.indirect_args:
indirect.indirect_offset = ' + '.join(indirect_sizes) if len(indirect_sizes) > 0 else 0 indirect.indirect_offset = ' + '.join(indirect_sizes) if len(indirect_sizes) > 0 else 0
indirect_sizes.append(f"sizeof({indirect.type}") indirect_sizes.append(f"sizeof({indirect.type})")
self.tp_perfetto = tp_perfetto self.tp_perfetto = tp_perfetto
self.tp_markers = tp_markers self.tp_markers = tp_markers