pan/bi: Space out disassembly

Makes things much more legible with some "room to breathe".

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8139>

diff --git a/src/panfrost/bifrost/disassemble.c b/src/panfrost/bifrost/disassemble.c
index 1bc33de2636a4578bf080378f86dba966437b106..49bde8ca0923b4d60d9df6d8ecee15abcdf1c794 100644 (file)
--- a/src/panfrost/bifrost/disassemble.c
+++ b/src/panfrost/bifrost/disassemble.c
@@ -162,7 +162,7 @@ static struct bifrost_reg_ctrl DecodeRegCtrl(FILE *fp, struct bifrost_regs regs,
 static void dump_regs(FILE *fp, struct bifrost_regs srcs, bool first)
 {
         struct bifrost_reg_ctrl ctrl = DecodeRegCtrl(fp, srcs, first);
-        fprintf(fp, "# ");
+        fprintf(fp, "    # ");
         if (ctrl.read_reg0)
                 fprintf(fp, "slot 0: r%d ", get_reg0(srcs));
         if (ctrl.read_reg1)
@@ -664,7 +664,7 @@ static bool dump_clause(FILE *fp, uint32_t *words, unsigned *size, unsigned offs
                 memcpy((char *) &regs, (char *) &instrs[i].reg_bits, sizeof(regs));
 
                 if (verbose) {
-                        fprintf(fp, "# regs: %016" PRIx64 "\n", instrs[i].reg_bits);
+                        fprintf(fp, "    # regs: %016" PRIx64 "\n", instrs[i].reg_bits);
                         dump_regs(fp, regs, i == 0);
                 }
 
@@ -684,6 +684,8 @@ static bool dump_clause(FILE *fp, uint32_t *words, unsigned *size, unsigned offs
                         fprintf(fp, "# const%d: %08" PRIx64 "\n", 2 * i + 1, consts.raw[i] >> 32);
                 }
         }
+
+        fprintf(fp, "\n");
         return stopbit;
 }
 

diff --git a/src/panfrost/bifrost/gen_disasm.py b/src/panfrost/bifrost/gen_disasm.py
index 4df7b1bf728f64b7797b7585d10972aca718c087..a4aa66a803b89d1ab786ac1b77785e5e926fc656 100644 (file)
--- a/src/panfrost/bifrost/gen_disasm.py
+++ b/src/panfrost/bifrost/gen_disasm.py
@@ -66,6 +66,8 @@ def decode_op(instructions, is_fma):
     template = """void
 bi_disasm_${unit}(FILE *fp, unsigned bits, struct bifrost_regs *srcs, struct bifrost_regs *next_regs, unsigned staging_register, unsigned branch_offset, struct bi_constants *consts, bool last)
 {
+    fputs("    ", fp);
+
 % for (i, (name, (emask, ebits), derived)) in enumerate(options):
 % if len(derived) > 0:
     ${"else " if i > 0 else ""}if (unlikely(((bits & ${hex(emask)}) == ${hex(ebits)})