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

freedreno/ir3: Improve error msg for block level validation

Browse source 
Printing whatever happened to be the last instruction is misleading.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12742>
This commit is contained in:
Rob Clark 2021-09-07 14:45:51 -07:00 • committed by Marge Bot
parent ac5df8c5c9
commit 137471ca89
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/freedreno/ir3/ir3_validate.c
View file

@ -30,6 +30,9 @@
struct ir3_validate_ctx {
struct ir3 *ir;
/* Current block being validated: */
struct ir3_block *current_block;
/* Current instruction being validated: */
struct ir3_instruction *current_instr;
@ -43,8 +46,12 @@ static void
validate_error(struct ir3_validate_ctx *ctx, const char *condstr)
{
fprintf(stderr, "validation fail: %s\n", condstr);
fprintf(stderr, " -> for instruction: ");
ir3_print_instr(ctx->current_instr);
if (ctx->current_instr) {
fprintf(stderr, " -> for instruction: ");
ir3_print_instr(ctx->current_instr);
} else {
fprintf(stderr, " -> for block%u\n", block_id(ctx->current_block));
}
abort();
}
@ -363,6 +370,9 @@ ir3_validate(struct ir3 *ir)
ctx->defs = _mesa_pointer_set_create(ctx);
foreach_block (block, &ir->block_list) {
ctx->current_block = block;
ctx->current_instr = NULL;
/* We require that the first block does not have any predecessors,
* which allows us to assume that phi nodes and meta:input's do not
* appear in the same basic block.
@ -387,6 +397,8 @@ ir3_validate(struct ir3 *ir)
if (block->successors[i]) {
validate_phi_src(ctx, block->successors[i], block);
ctx->current_instr = NULL;
/* Each logical successor should also be a physical successor: */
validate_assert(ctx, is_physical_successor(block, block->successors[i]));
}