Mesa (master): r600/sb: Correct SB disassambler for better debugging

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 829107819db50a74971dd3854e407f7df23a5216
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=829107819db50a74971dd3854e407f7df23a5216

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Sat Dec 28 15:35:39 2019 +0100

r600/sb: Correct SB disassambler for better debugging

Signed-off-by: Gert Wollny <gert.wollny at collabora.com>
Reviewed-by: Konstantin Kharlamov <hi-angel at yandex.ru>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3286>

---

 src/gallium/drivers/r600/sb/sb_bc_dump.cpp | 2 ++
 src/gallium/drivers/r600/sb/sb_dump.cpp    | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/r600/sb/sb_bc_dump.cpp b/src/gallium/drivers/r600/sb/sb_bc_dump.cpp
index 9b2674daf27..de3c38805b8 100644
--- a/src/gallium/drivers/r600/sb/sb_bc_dump.cpp
+++ b/src/gallium/drivers/r600/sb/sb_bc_dump.cpp
@@ -157,6 +157,8 @@ void bc_dump::dump(cf_node& n) {
 
 		s << "  ES:" << n.bc.elem_size;
 
+      s << " OP:" << n.bc.rat_inst;
+
 		if (n.bc.mark)
 			s << " MARK";
 
diff --git a/src/gallium/drivers/r600/sb/sb_dump.cpp b/src/gallium/drivers/r600/sb/sb_dump.cpp
index 70892e1c8c4..57dded5ef00 100644
--- a/src/gallium/drivers/r600/sb/sb_dump.cpp
+++ b/src/gallium/drivers/r600/sb/sb_dump.cpp
@@ -367,7 +367,12 @@ void dump::dump_op(node &n, const char *name) {
 		sblog << ",       ";
 	}
 
-	dump_vec(n.src);
+   if (n.subtype == NST_FETCH_INST) {
+      fetch_node *f = static_cast<fetch_node*>(&n);
+      if (f->bc.indexed)
+         dump_vec(n.src);
+   } else
+      dump_vec(n.src);
 }
 
 void dump::dump_set(shader &sh, val_set& v) {