freedreno/a2xx: formats update

[mesa.git] / src / freedreno / ir3 / ir3_print.c

diff --git a/src/freedreno/ir3/ir3_print.c b/src/freedreno/ir3/ir3_print.c
index b6ef6e4b5a793c797fb56f955e69166af4f02732..cc6572d90565f38f56c84a6a1b9e3375e2afa43c 100644 (file)
--- a/src/freedreno/ir3/ir3_print.c
+++ b/src/freedreno/ir3/ir3_print.c
@@ -40,7 +40,8 @@ static void print_instr_name(struct ir3_instruction *instr)
 #endif
        printf("%04u:", instr->name);
        printf("%04u:", instr->ip);
-       printf("%03u: ", instr->depth);
+       printf("%03u:", instr->depth);
+       printf("%03u: ", instr->sun);
 
        if (instr->flags & IR3_INSTR_SY)
                printf("(sy)");
@@ -125,6 +126,8 @@ static void print_reg_name(struct ir3_register *reg)
                else
                        printf("\x1b[0;31mr<a0.x + %d>\x1b[0m (%u)", reg->array.offset, reg->size);
        } else {
+               if (reg->flags & IR3_REG_HIGH)
+                       printf("H");
                if (reg->flags & IR3_REG_HALF)
                        printf("h");
                if (reg->flags & IR3_REG_CONST)
@@ -212,13 +215,15 @@ print_block(struct ir3_block *block, int lvl)
 {
        tab(lvl); printf("block%u {\n", block_id(block));
 
-       if (block->predecessors_count > 0) {
+       if (block->predecessors->entries > 0) {
+               unsigned i = 0;
                tab(lvl+1);
                printf("pred: ");
-               for (unsigned i = 0; i < block->predecessors_count; i++) {
-                       if (i)
+               set_foreach(block->predecessors, entry) {
+                       struct ir3_block *pred = (struct ir3_block *)entry->key;
+                       if (i++)
                                printf(", ");
-                       printf("block%u", block_id(block->predecessors[i]));
+                       printf("block%u", block_id(pred));
                }
                printf("\n");
        }