diff options
Diffstat (limited to 'src/panfrost/midgard')
| -rw-r--r-- | src/panfrost/midgard/compiler.h | 4 | ||||
| -rw-r--r-- | src/panfrost/midgard/midgard_compile.c | 4 | ||||
| -rw-r--r-- | src/panfrost/midgard/midgard_print.c | 8 | ||||
| -rw-r--r-- | src/panfrost/midgard/midgard_schedule.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/panfrost/midgard/compiler.h b/src/panfrost/midgard/compiler.h index cf9420bf428..f7e69f91655 100644 --- a/src/panfrost/midgard/compiler.h +++ b/src/panfrost/midgard/compiler.h @@ -173,9 +173,9 @@ typedef struct midgard_block { struct list_head instructions; /* Index of the block in source order */ - unsigned source_id; + unsigned name; - bool is_scheduled; + bool scheduled; /* List of midgard_bundles emitted (after the scheduler has run) */ struct util_dynarray bundles; diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c index 0bc17dc719b..df51f19c762 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -78,7 +78,7 @@ create_empty_block(compiler_context *ctx) _mesa_hash_pointer, _mesa_key_pointer_equal); - blk->source_id = ctx->block_source_count++; + blk->name = ctx->block_source_count++; return blk; } @@ -2366,7 +2366,7 @@ emit_block(compiler_context *ctx, nir_block *block) list_addtail(&this_block->link, &ctx->blocks); - this_block->is_scheduled = false; + this_block->scheduled = false; ++ctx->block_count; /* Set up current block */ diff --git a/src/panfrost/midgard/midgard_print.c b/src/panfrost/midgard/midgard_print.c index e23e7d59817..c90f6465037 100644 --- a/src/panfrost/midgard/midgard_print.c +++ b/src/panfrost/midgard/midgard_print.c @@ -377,9 +377,9 @@ mir_print_instruction(midgard_instruction *ins) void mir_print_block(midgard_block *block) { - printf("block%u: {\n", block->source_id); + printf("block%u: {\n", block->name); - if (block->is_scheduled) { + if (block->scheduled) { mir_foreach_bundle_in_block(block, bundle) { for (unsigned i = 0; i < bundle->instruction_count; ++i) mir_print_instruction(bundle->instructions[i]); @@ -397,14 +397,14 @@ mir_print_block(midgard_block *block) if (block->nr_successors) { printf(" -> "); for (unsigned i = 0; i < block->nr_successors; ++i) { - printf("block%u%s", block->successors[i]->source_id, + printf("block%u%s", block->successors[i]->name, (i + 1) != block->nr_successors ? ", " : ""); } } printf(" from { "); mir_foreach_predecessor(block, pred) - printf("block%u ", pred->source_id); + printf("block%u ", pred->name); printf("}"); printf("\n\n"); diff --git a/src/panfrost/midgard/midgard_schedule.c b/src/panfrost/midgard/midgard_schedule.c index 55fdba0b546..2ca0f95656c 100644 --- a/src/panfrost/midgard/midgard_schedule.c +++ b/src/panfrost/midgard/midgard_schedule.c @@ -1156,7 +1156,7 @@ schedule_block(compiler_context *ctx, midgard_block *block) if (blend_offset) ctx->blend_constant_offset = ((ctx->quadword_count + block->quadword_count) - blend_offset - 1) * 0x10; - block->is_scheduled = true; + block->scheduled = true; ctx->quadword_count += block->quadword_count; /* Reorder instructions to match bundled. First remove existing |