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

intel/tools/aubinator_error_decode: tag hanging instruction

Browse source 
Signed-off-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11957>
This commit is contained in:
Marcin Ślusarz 2021-07-19 18:29:21 +02:00 • committed by Marge Bot
parent 18fa820506
commit b6843d990b
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/intel/common/intel_batch_decoder.c
View file

@ -1289,8 +1289,9 @@ intel_print_batch(struct intel_batch_decode_ctx *ctx,
reset_color = "";
}
fprintf(ctx->fp, "%s0x%08"PRIx64": 0x%08x: %-80s%s\n",
color, offset, p[0], inst_name, reset_color);
fprintf(ctx->fp, "%s0x%08"PRIx64"%s: 0x%08x: %-80s%s\n", color, offset,
ctx->acthd && offset == ctx->acthd ? " (ACTHD)" : "", p[0],
inst_name, reset_color);
if (ctx->flags & INTEL_BATCH_DECODE_FULL) {
ctx_print_group(ctx, inst, offset, p);

1
src/intel/common/intel_decoder.h
View file

@ -252,6 +252,7 @@ struct intel_batch_decode_ctx {
enum drm_i915_gem_engine_class engine;
int n_batch_buffer_start;
uint64_t acthd;
};
void intel_batch_decode_ctx_init(struct intel_batch_decode_ctx *ctx,

6
src/intel/tools/aubinator_error_decode.c
View file

@ -418,6 +418,7 @@ read_data_file(FILE *file)
bool ring_wraps = false;
char *ring_name = NULL;
struct intel_device_info devinfo;
uint64_t acthd = 0;
while (getline(&line, &line_size, file) > 0) {
char *new_ring_name = NULL;
@ -538,6 +539,10 @@ read_data_file(FILE *file)
ring_name), reg);
}
matched = sscanf(line, " ACTHD: 0x%08x %08x\n", &reg, &reg2);
if (matched == 2)
acthd = ((uint64_t)reg << 32) | reg2;
matched = sscanf(line, " PGTBL_ER: 0x%08x\n", &reg);
if (matched == 1 && reg)
print_pgtbl_err(reg, &devinfo);
@ -659,6 +664,7 @@ read_data_file(FILE *file)
struct intel_batch_decode_ctx batch_ctx;
intel_batch_decode_ctx_init(&batch_ctx, &devinfo, stdout, batch_flags,
xml_path, get_intel_batch_bo, NULL, NULL);
batch_ctx.acthd = acthd;
for (int s = 0; s < num_sections; s++) {