From d2efcd3f06c7891963a2743468864716498d2aa6 Mon Sep 17 00:00:00 2001
From: Rob Clark <robdclark@chromium.org>
Date: Tue, 7 Sep 2021 14:36:39 -0700
Subject: [PATCH] freedreno/ir3: Fix double printing of branch suffix

print_instr_name() already prints the suffix.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12742>
---
 src/freedreno/ir3/ir3_print.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/freedreno/ir3/ir3_print.c b/src/freedreno/ir3/ir3_print.c
index 32c84b44af9..f862014e34f 100644
--- a/src/freedreno/ir3/ir3_print.c
+++ b/src/freedreno/ir3/ir3_print.c
@@ -366,23 +366,20 @@ print_instr(struct log_stream *stream, struct ir3_instruction *instr, int lvl)
       /* the predicate register src is implied: */
       if (instr->opc == OPC_B) {
          static const struct {
-            const char *suffix;
             int nsrc;
             bool idx;
          } brinfo[7] = {
             /* clang-format off */
-            [BRANCH_PLAIN] = {"r",   1, false},
-            [BRANCH_OR]    = {"rao", 2, false},
-            [BRANCH_AND]   = {"raa", 2, false},
-            [BRANCH_CONST] = {"rac", 0, true},
-            [BRANCH_ANY]   = {"any", 1, false},
-            [BRANCH_ALL]   = {"all", 1, false},
-            [BRANCH_X]     = {"rax", 0, false},
+            [BRANCH_PLAIN] = {1, false},
+            [BRANCH_OR]    = {2, false},
+            [BRANCH_AND]   = {2, false},
+            [BRANCH_CONST] = {0, true},
+            [BRANCH_ANY]   = {1, false},
+            [BRANCH_ALL]   = {1, false},
+            [BRANCH_X]     = {0, false},
             /* clang-format on */
          };
 
-         mesa_log_stream_printf(stream, "%s",
-                                brinfo[instr->cat0.brtype].suffix);
          if (brinfo[instr->cat0.brtype].idx) {
             mesa_log_stream_printf(stream, ".%u", instr->cat0.idx);
          }