radeonsi/gfx9: add IB parser support

Both GFX6 and GFX9 fields are printed next to each other in parsed IBs.

The Python script parses both headers like one stream and tries to merge
all definitions.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/amd/Makefile.common.am b/src/amd/Makefile.common.am
index e492fbcb393d7673d1bb5fce6bfffd1e402d69a0..595876f610aa04e80d8fb49b1d030625aff47f2f 100644 (file)
--- a/src/amd/Makefile.common.am
+++ b/src/amd/Makefile.common.am
@@ -65,8 +65,8 @@ common_libamd_common_la_SOURCES += $(AMD_NIR_FILES)
 endif
 endif
 
-common/sid_tables.h: $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h
+common/sid_tables.h: $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h
        $(AM_V_at)$(MKDIR_P) $(@D)
-       $(AM_V_GEN) $(PYTHON2) $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h > $@
+       $(AM_V_GEN) $(PYTHON2) $(srcdir)/common/sid_tables.py $(srcdir)/common/sid.h $(srcdir)/common/gfx9d.h > $@
 
 BUILT_SOURCES = $(AMD_GENERATED_FILES)

diff --git a/src/amd/common/ac_debug.c b/src/amd/common/ac_debug.c
index 989dfda4ff9c97863a1e6cc1f038264c6aec0cbf..9d051f9159ec2fd3b824686ae81a4d1e09bee02a 100644 (file)
--- a/src/amd/common/ac_debug.c
+++ b/src/amd/common/ac_debug.c
@@ -27,6 +27,7 @@
 #include "ac_debug.h"
 
 #include "sid.h"
+#include "gfx9d.h"
 #include "sid_tables.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"

diff --git a/src/amd/common/sid_tables.py b/src/amd/common/sid_tables.py
index df2d7ec5b055b3292853f4d2daa028d32ec2d6a3..fd88d3c9d5ddc06ba90a1d771fe86a8c5330496f 100644 (file)
--- a/src/amd/common/sid_tables.py
+++ b/src/amd/common/sid_tables.py
@@ -145,11 +145,8 @@ def strip_prefix(s):
     '''Strip prefix in the form ._.*_, e.g. R_001234_'''
     return s[s[2:].find('_')+3:]
 
-
-def parse(filename):
+def parse(filename, regs, packets):
     stream = open(filename)
-    regs = []
-    packets = []
 
     for line in stream:
         if not line.startswith('#define '):
@@ -158,16 +155,38 @@ def parse(filename):
         line = line[8:].strip()
 
         if line.startswith('R_'):
-            reg = Reg(line.split()[0])
-            regs.append(reg)
+            name = line.split()[0]
+
+            for it in regs:
+                if it.r_name == name:
+                    reg = it
+                    break
+            else:
+                reg = Reg(name)
+                regs.append(reg)
 
         elif line.startswith('S_'):
-            field = Field(reg, line[:line.find('(')])
-            reg.fields.append(field)
+            name = line[:line.find('(')]
+
+            for it in reg.fields:
+                if it.s_name == name:
+                    field = it
+                    break
+            else:
+                field = Field(reg, name)
+                reg.fields.append(field)
 
         elif line.startswith('V_'):
             split = line.split()
-            field.values.append((split[0], int(split[1], 0)))
+            name = split[0]
+            value = int(split[1], 0)
+
+            for (n,v) in field.values:
+                if n == name:
+                    if v != value:
+                        sys.exit('Value mismatch: name = ' + name)
+
+            field.values.append((name, value))
 
         elif line.startswith('PKT3_') and line.find('0x') != -1 and line.find('(') == -1:
             packets.append(line.split()[0])
@@ -192,12 +211,8 @@ def parse(filename):
                 reg.fields_owner = reg0
                 reg.own_fields = False
 
-    return (regs, packets)
-
 
-def write_tables(tables):
-    regs = tables[0]
-    packets = tables[1]
+def write_tables(regs, packets):
 
     strings = StringTable()
     strings_offsets = IntTable("int")
@@ -282,10 +297,11 @@ struct si_packet3 {
 
 
 def main():
-    tables = []
+    regs = []
+    packets = []
     for arg in sys.argv[1:]:
-        tables.extend(parse(arg))
-    write_tables(tables)
+        parse(arg, regs, packets)
+    write_tables(regs, packets)
 
 
 if __name__ == '__main__':

diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c
index 1092aa2761afbbbd2bf5f1b017b825b63e0b3c7d..db310b7cfaf09c8f0f6cda8c58b0be16395970c7 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_debug.c
+++ b/src/gallium/drivers/radeonsi/si_debug.c
@@ -26,6 +26,7 @@
 
 #include "si_pipe.h"
 #include "sid.h"
+#include "gfx9d.h"
 #include "sid_tables.h"
 #include "ddebug/dd_util.h"
 #include "util/u_memory.h"