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

intel: Give the batch decoder a callback to ask about state size.

Browse source 
Given an arbitrary batch, we don't always know what the size of certain
things are, such as how many entries are in a binding table.  But it's
easy for the driver to track that information, so with a simple callback
we can calculate this correctly for INTEL_DEBUG=bat.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Kenneth Graunke 2018-05-01 21:49:17 -07:00
parent 7c22c150c4
commit bf91b81a0b
4 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/intel/common/gen_batch_decoder.c
View file

@ -33,11 +33,13 @@ gen_batch_decode_ctx_init(struct gen_batch_decode_ctx *ctx,
const char *xml_path,
struct gen_batch_decode_bo (*get_bo)(void *,
uint64_t),
unsigned (*get_state_size)(void *, uint32_t),
void *user_data)
{
memset(ctx, 0, sizeof(*ctx));
ctx->get_bo = get_bo;
ctx->get_state_size = get_state_size;
ctx->user_data = user_data;
ctx->fp = fp;
ctx->flags = flags;
@ -103,6 +105,24 @@ ctx_get_bo(struct gen_batch_decode_ctx *ctx, uint64_t addr)
return bo;
}
static int
update_count(struct gen_batch_decode_ctx *ctx,
uint32_t offset_from_dsba,
unsigned element_dwords,
unsigned guess)
{
unsigned size = 0;
if (ctx->get_state_size)
size = ctx->get_state_size(ctx->user_data, offset_from_dsba);
if (size > 0)
return size / (sizeof(uint32_t) * element_dwords);
/* In the absence of any information, just guess arbitrarily. */
return guess;
}
static void
ctx_disassemble_program(struct gen_batch_decode_ctx *ctx,
uint32_t ksp, const char *type)
@ -196,9 +216,8 @@ dump_binding_table(struct gen_batch_decode_ctx *ctx, uint32_t offset, int count)
return;
}
/* If we don't know the actual count, guess. */
if (count < 0)
count = 8;
count = update_count(ctx, offset, 1, 8);
if (ctx->surface_base.map == NULL) {
fprintf(ctx->fp, " binding table unavailable\n");
@ -233,9 +252,8 @@ dump_samplers(struct gen_batch_decode_ctx *ctx, uint32_t offset, int count)
{
struct gen_group *strct = gen_spec_find_struct(ctx->spec, "SAMPLER_STATE");
/* If we don't know the actual count, guess. */
if (count < 0)
count = 4;
count = update_count(ctx, offset, strct->dw_length, 4);
if (ctx->dynamic_base.map == NULL) {
fprintf(ctx->fp, " samplers unavailable\n");

4
src/intel/common/gen_decoder.h
View file

@ -207,6 +207,8 @@ struct gen_disasm *disasm;
struct gen_batch_decode_ctx {
struct gen_batch_decode_bo (*get_bo)(void *user_data,
uint64_t base_address);
unsigned (*get_state_size)(void *user_data,
uint32_t offset_from_dynamic_state_base_addr);
void *user_data;
FILE *fp;
@ -226,6 +228,8 @@ void gen_batch_decode_ctx_init(struct gen_batch_decode_ctx *ctx,
const char *xml_path,
struct gen_batch_decode_bo (*get_bo)(void *,
uint64_t),
unsigned (*get_state_size)(void *, uint32_t),
void *user_data);
void gen_batch_decode_ctx_finish(struct gen_batch_decode_ctx *ctx);

2
src/intel/tools/aubinator.c
View file

@ -178,7 +178,7 @@ aubinator_init(uint16_t aub_pci_id, const char *app_name)
batch_flags |= GEN_BATCH_DECODE_FLOATS;
gen_batch_decode_ctx_init(&batch_ctx, &devinfo, outfile, batch_flags,
xml_path, get_gen_batch_bo, NULL);
xml_path, get_gen_batch_bo, NULL, NULL);
char *color = GREEN_HEADER, *reset_color = NORMAL;
if (option_color == COLOR_NEVER)

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

@ -595,7 +595,7 @@ read_data_file(FILE *file)
struct gen_batch_decode_ctx batch_ctx;
gen_batch_decode_ctx_init(&batch_ctx, &devinfo, stdout, batch_flags,
xml_path, get_gen_batch_bo, NULL);
xml_path, get_gen_batch_bo, NULL, NULL);
for (int s = 0; s < sect_num; s++) {