diff --git a/src/panfrost/bifrost/bi_print.c b/src/panfrost/bifrost/bi_print.c
index c3e21b77c2f..295ff8efcab 100644
--- a/src/panfrost/bifrost/bi_print.c
+++ b/src/panfrost/bifrost/bi_print.c
@@ -70,20 +70,22 @@ bi_print_tuple(bi_tuple *tuple, FILE *fp)
         bi_instr *ins[2] = { tuple->fma, tuple->add };
 
         for (unsigned i = 0; i < 2; ++i) {
+                fprintf(fp, (i == 0) ? "\t* " : "\t+ ");
+
                 if (ins[i])
                         bi_print_instr(ins[i], fp);
                 else
-                        fprintf(fp, "nop\n");
+                        fprintf(fp, "NOP\n");
         }
 }
 
 void
 bi_print_clause(bi_clause *clause, FILE *fp)
 {
-        fprintf(fp, "\tid(%u)", clause->scoreboard_id);
+        fprintf(fp, "id(%u)", clause->scoreboard_id);
 
         if (clause->dependencies) {
-                fprintf(fp, ", wait(");
+                fprintf(fp, " wait(");
 
                 for (unsigned i = 0; i < 8; ++i) {
                         if (clause->dependencies & (1 << i))
@@ -118,6 +120,8 @@ bi_print_clause(bi_clause *clause, FILE *fp)
 
                 fprintf(fp, "\n");
         }
+
+        fprintf(fp, "\n");
 }
 
 void