nir,amd: remove trinary_minmax opcodes

[mesa.git] / src / amd / common / ac_debug.c

diff --git a/src/amd/common/ac_debug.c b/src/amd/common/ac_debug.c
index e4cb6a13a3ac48bdaba21591ac30d2fe66839ae6..f095b0b45dabeb40fd43aab6695d56bc1926ce8b 100644 (file)
--- a/src/amd/common/ac_debug.c
+++ b/src/amd/common/ac_debug.c
@@ -28,7 +28,7 @@
 #include <memcheck.h>
 #define VG(x) x
 #else
-#define VG(x)
+#define VG(x) ((void)0)
 #endif
 
 #include <inttypes.h>
@@ -99,10 +99,37 @@ static void print_named_value(FILE *file, const char *name, uint32_t value,
        print_value(file, value, bits);
 }
 
-static const struct si_reg *find_register(const struct si_reg *table,
-                                         unsigned table_size,
-                                         unsigned offset)
+static const struct si_reg *find_register(enum chip_class chip_class, unsigned offset)
 {
+       const struct si_reg *table;
+       unsigned table_size;
+
+       switch (chip_class) {
+       case GFX10_3:
+       case GFX10:
+               table = gfx10_reg_table;
+               table_size = ARRAY_SIZE(gfx10_reg_table);
+               break;
+       case GFX9:
+               table = gfx9_reg_table;
+               table_size = ARRAY_SIZE(gfx9_reg_table);
+               break;
+       case GFX8:
+               table = gfx8_reg_table;
+               table_size = ARRAY_SIZE(gfx8_reg_table);
+               break;
+       case GFX7:
+               table = gfx7_reg_table;
+               table_size = ARRAY_SIZE(gfx7_reg_table);
+               break;
+       case GFX6:
+               table = gfx6_reg_table;
+               table_size = ARRAY_SIZE(gfx6_reg_table);
+               break;
+       default:
+               return NULL;
+       }
+
        for (unsigned i = 0; i < table_size; i++) {
                const struct si_reg *reg = &table[i];
 
@@ -113,21 +140,17 @@ static const struct si_reg *find_register(const struct si_reg *table,
        return NULL;
 }
 
+const char *ac_get_register_name(enum chip_class chip_class, unsigned offset)
+{
+       const struct si_reg *reg = find_register(chip_class, offset);
+
+       return reg ? sid_strings + reg->name_offset : "(no name)";
+}
+
 void ac_dump_reg(FILE *file, enum chip_class chip_class, unsigned offset,
                 uint32_t value, uint32_t field_mask)
 {
-       const struct si_reg *reg = NULL;
-
-       if (chip_class >= GFX10)
-               reg = find_register(gfx10_reg_table, ARRAY_SIZE(gfx10_reg_table), offset);
-       else if (chip_class >= GFX9)
-               reg = find_register(gfx9_reg_table, ARRAY_SIZE(gfx9_reg_table), offset);
-       else if (chip_class >= GFX8)
-               reg = find_register(gfx8_reg_table, ARRAY_SIZE(gfx8_reg_table), offset);
-       else if (chip_class >= GFX7)
-               reg = find_register(gfx7_reg_table, ARRAY_SIZE(gfx7_reg_table), offset);
-       else
-               reg = find_register(gfx6_reg_table, ARRAY_SIZE(gfx6_reg_table), offset);
+       const struct si_reg *reg = find_register(chip_class, offset);
 
        if (reg) {
                const char *reg_name = sid_strings + reg->name_offset;
@@ -441,7 +464,7 @@ static void ac_parse_packet3(FILE *f, uint32_t header, struct ac_ib_parser *ib,
        case PKT3_PFP_SYNC_ME:
                break;
        case PKT3_NOP:
-               if (header == 0xffff1000) {
+               if (header == PKT3_NOP_PAD) {
                        count = -1; /* One dword NOP. */
                } else if (count == 0 && ib->cur_dw < ib->num_dw &&
                           AC_IS_TRACE_POINT(ib->ib[ib->cur_dw])) {
@@ -542,7 +565,7 @@ static void format_ib_output(FILE *f, char *out)
                if (indent)
                        print_spaces(f, indent);
 
-               char *end = util_strchrnul(out, '\n');
+               char *end = strchrnul(out, '\n');
                fwrite(out, end - out, 1, f);
                fputc('\n', f); /* always end with a new line */
                if (!*end)
@@ -769,12 +792,15 @@ static int compare_wave(const void *p1, const void *p2)
 }
 
 /* Return wave information. "waves" should be a large enough array. */
-unsigned ac_get_wave_info(struct ac_wave_info waves[AC_MAX_WAVES_PER_CHIP])
+unsigned ac_get_wave_info(enum chip_class chip_class,
+                         struct ac_wave_info waves[AC_MAX_WAVES_PER_CHIP])
 {
-       char line[2000];
+       char line[2000], cmd[128];
        unsigned num_waves = 0;
 
-       FILE *p = popen("umr -O halt_waves -wa", "r");
+       sprintf(cmd, "umr -O halt_waves -wa %s", chip_class >= GFX10 ? "gfx_0.0.0" : "gfx");
+
+       FILE *p = popen(cmd, "r");
        if (!p)
                return 0;