From: Alyssa Rosenzweig <alyssa@collabora.com>
Date: Tue, 1 Mar 2022 19:13:53 +0000 (-0500)
Subject: pan/bi: Wire Valhall disassembler into compiler
X-Git-Tag: upstream/22.3.5~12173
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec9c1f8fa603b6213ab4ba172ce413c63b4249c3;p=platform%2Fupstream%2Fmesa.git

pan/bi: Wire Valhall disassembler into compiler

Useful when we grow Valhall support (soon!)

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

diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c
index 9a1feb2..3c7baec 100644
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -30,6 +30,7 @@
 #include "util/u_debug.h"
 
 #include "disassemble.h"
+#include "valhall/disassemble.h"
 #include "bifrost_compile.h"
 #include "compiler.h"
 #include "bi_quirks.h"
@@ -4083,8 +4084,16 @@ bi_compile_variant_nir(nir_shader *nir,
         }
 
         if (bifrost_debug & BIFROST_DBG_SHADERS && !skip_internal) {
-                disassemble_bifrost(stdout, binary->data + offset, binary->size - offset,
-                                    bifrost_debug & BIFROST_DBG_VERBOSE);
+                if (ctx->arch <= 8) {
+                        disassemble_bifrost(stdout, binary->data + offset,
+                                            binary->size - offset,
+                                            bifrost_debug & BIFROST_DBG_VERBOSE);
+                } else {
+                        disassemble_valhall(stdout, binary->data + offset,
+                                            binary->size - offset,
+                                            bifrost_debug & BIFROST_DBG_VERBOSE);
+                }
+
                 fflush(stdout);
         }