KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pan/midgard: Index blocks for printing 

Better than having pointers flying about.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Alyssa Rosenzweig 2019-08-15 10:43:56 -07:00
parent 2f92479ffc
commit e3a418fe86
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/panfrost/midgard/compiler.h
View File

@ -160,6 +160,9 @@ typedef struct midgard_block {
/* List of midgard_instructions emitted for the current block */
struct list_head instructions;
/* Index of the block in source order */
unsigned source_id;
bool is_scheduled;
/* List of midgard_bundles emitted (after the scheduler has run) */
@ -229,6 +232,9 @@ typedef struct compiler_context {
int block_count;
struct list_head blocks;
/* TODO merge with block_count? */
unsigned block_source_count;
/* List of midgard_instructions emitted for the current block */
midgard_block *current_block;

2
src/panfrost/midgard/midgard_compile.c
View File

@ -2264,6 +2264,8 @@ create_empty_block(compiler_context *ctx)
_mesa_hash_pointer,
_mesa_key_pointer_equal);
blk->source_id = ctx->block_source_count++;
return blk;
}

4
src/panfrost/midgard/midgard_print.c
View File

@ -162,7 +162,7 @@ mir_print_instruction(midgard_instruction *ins)
void
mir_print_block(midgard_block *block)
{
printf("%p: {\n", block);
printf("block%d: {\n", block->source_id);
mir_foreach_instr_in_block(block, ins) {
mir_print_instruction(ins);
@ -173,7 +173,7 @@ mir_print_block(midgard_block *block)
if (block->nr_successors) {
printf(" -> ");
for (unsigned i = 0; i < block->nr_successors; ++i) {
printf("%p%s", block->successors[i],
printf("block%d%s", block->successors[i]->source_id,
(i + 1) != block->nr_successors ? ", " : "");
}
}