pan/mdg: eliminate references to ins->alu.op

[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 64dceda3d5e390c4cc06bd095b93bddce1b9349b..44e21966091d217eeee54de9925afde5926552bd 100644 (file)
--- a/src/panfrost/midgard/midgard_print.c
+++ b/src/panfrost/midgard/midgard_print.c
@@ -244,9 +244,9 @@ mir_print_embedded_constant(midgard_instruction *ins, unsigned src_idx)
                 src = vector_alu_from_unsigned(ins->alu.src2);
 
         unsigned *swizzle = ins->swizzle[src_idx];
-        unsigned comp_mask = effective_writemask(&ins->alu, ins->mask);
+        unsigned comp_mask = effective_writemask(ins->op, ins->mask);
         unsigned num_comp = util_bitcount(comp_mask);
-        unsigned max_comp = mir_components_for_type(ins->dest_type) >> 1;
+        unsigned max_comp = mir_components_for_type(ins->dest_type);
         bool first = true;
 
         printf("#");
@@ -265,7 +265,7 @@ mir_print_embedded_constant(midgard_instruction *ins, unsigned src_idx)
 
                 mir_print_constant_component(stdout, &ins->constants,
                                              swizzle[comp], ins->alu.reg_mode,
-                                             src.half, src.mod, ins->alu.op);
+                                             src.half, src.mod, ins->op);
         }
 
         if (num_comp > 1)
@@ -307,6 +307,16 @@ mir_print_instruction(midgard_instruction *ins)
                 else
                         printf("true");
 
+                if (ins->writeout) {
+                        printf(" (c: ");
+                        PRINT_SRC(ins, 0);
+                        printf(", z: ");
+                        PRINT_SRC(ins, 2);
+                        printf(", s: ");
+                        PRINT_SRC(ins, 3);
+                        printf(")");
+                }
+
                 if (ins->branch.target_type != TARGET_DISCARD)
                         printf(" %s -> block(%d)\n",
                                ins->branch.target_type < 4 ?
@@ -318,7 +328,7 @@ mir_print_instruction(midgard_instruction *ins)
 
         switch (ins->type) {
         case TAG_ALU_4: {
-                midgard_alu_op op = ins->alu.op;
+                midgard_alu_op op = ins->op;
                 const char *name = alu_opcode_props[op].name;
 
                 if (ins->unit)