pan/midgard: Remove util/ra support

[mesa.git] / src / panfrost / midgard / midgard_print.c

diff --git a/src/panfrost/midgard/midgard_print.c b/src/panfrost/midgard/midgard_print.c
index 871d1c5a6de54b28e424b4d43c3baace09bdd6e1..44fd888d584ce2d0ed81465bb2a314905c79e903 100644 (file)
--- a/src/panfrost/midgard/midgard_print.c
+++ b/src/panfrost/midgard/midgard_print.c
@@ -66,6 +66,15 @@ mir_print_mask(unsigned mask)
         }
 }
 
+static void
+mir_print_swizzle(unsigned *swizzle)
+{
+        printf(".");
+
+        for (unsigned i = 0; i < 16; ++i)
+                putchar(components[swizzle[i]]);
+}
+
 static const char *
 mir_get_unit(unsigned unit)
 {
@@ -99,6 +108,13 @@ mir_print_instruction(midgard_instruction *ins)
                 midgard_alu_op op = ins->alu.op;
                 const char *name = alu_opcode_props[op].name;
 
+                const char *branch_target_names[] = {
+                        "goto", "break", "continue", "discard"
+                };
+
+                if (ins->compact_branch && !ins->prepacked_branch)
+                        name = branch_target_names[ins->branch.target_type];
+
                 if (ins->unit)
                         printf("%s.", mir_get_unit(ins->unit));
 
@@ -108,7 +124,7 @@ mir_print_instruction(midgard_instruction *ins)
 
         case TAG_LOAD_STORE_4: {
                 midgard_load_store_op op = ins->load_store.op;
-                const char *name = load_store_opcode_names[op];
+                const char *name = load_store_opcode_props[op].name;
 
                 assert(name);
                 printf("%s", name);
@@ -124,29 +140,31 @@ mir_print_instruction(midgard_instruction *ins)
                 assert(0);
         }
 
-        if (ins->invert)
+        if (ins->invert || (ins->compact_branch && !ins->prepacked_branch && ins->branch.invert_conditional))
                 printf(".not");
 
-        ssa_args *args = &ins->ssa_args;
-
         printf(" ");
-        mir_print_index(args->dest);
+        mir_print_index(ins->dest);
 
         if (ins->mask != 0xF)
                 mir_print_mask(ins->mask);
 
         printf(", ");
 
-        mir_print_index(args->src[0]);
+        mir_print_index(ins->src[0]);
+        mir_print_swizzle(ins->swizzle[0]);
         printf(", ");
 
-        if (args->inline_constant)
+        if (ins->has_inline_constant)
                 printf("#%d", ins->inline_constant);
-        else
-                mir_print_index(args->src[1]);
+        else {
+                mir_print_index(ins->src[1]);
+                mir_print_swizzle(ins->swizzle[1]);
+        }
 
         printf(", ");
-        mir_print_index(args->src[2]);
+        mir_print_index(ins->src[2]);
+        mir_print_swizzle(ins->swizzle[2]);
 
         if (ins->has_constants) {
                 uint32_t *uc = ins->constants;
@@ -169,10 +187,19 @@ mir_print_instruction(midgard_instruction *ins)
 void
 mir_print_block(midgard_block *block)
 {
-        printf("block%d: {\n", block->source_id);
+        printf("block%u: {\n", block->source_id);
+
+        if (block->is_scheduled) {
+                mir_foreach_bundle_in_block(block, bundle) {
+                        for (unsigned i = 0; i < bundle->instruction_count; ++i)
+                                mir_print_instruction(bundle->instructions[i]);
 
-        mir_foreach_instr_in_block(block, ins) {
-                mir_print_instruction(ins);
+                        printf("\n");
+                }
+        } else {
+                mir_foreach_instr_in_block(block, ins) {
+                        mir_print_instruction(ins);
+                }
         }
 
         printf("}");
@@ -180,14 +207,14 @@ mir_print_block(midgard_block *block)
         if (block->nr_successors) {
                 printf(" -> ");
                 for (unsigned i = 0; i < block->nr_successors; ++i) {
-                        printf("block%d%s", block->successors[i]->source_id,
+                        printf("block%u%s", block->successors[i]->source_id,
                                         (i + 1) != block->nr_successors ? ", " : "");
                 }
         }
 
         printf(" from { ");
         mir_foreach_predecessor(block, pred)
-                printf("block%d ", pred->source_id);
+                printf("block%u ", pred->source_id);
         printf("}");
 
         printf("\n\n");
@@ -200,16 +227,3 @@ mir_print_shader(compiler_context *ctx)
                 mir_print_block(block);
         }
 }
-
-void
-mir_print_bundle(midgard_bundle *bundle)
-{
-        printf("[\n");
-
-        for (unsigned i = 0; i < bundle->instruction_count; ++i) {
-                midgard_instruction *ins = bundle->instructions[i];
-                mir_print_instruction(ins);
-        }
-
-        printf("]\n");
-}