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

pan/midgard: Sync midgard_block field names with Bifrost

Browse source 
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4150>
This commit is contained in:
Alyssa Rosenzweig 2020-03-11 08:22:08 -04:00 • committed by Marge Bot
parent 4998925d6a
commit c5dd1d542d
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/panfrost/midgard/compiler.h
View file

@ -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;

4
src/panfrost/midgard/midgard_compile.c
View file

@ -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 */

8
src/panfrost/midgard/midgard_print.c
View file

@ -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");

2
src/panfrost/midgard/midgard_schedule.c
View file

@ -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