ac/debug: Move IB decode to common code.
authorBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Sat, 24 Dec 2016 12:08:00 +0000 (13:08 +0100)
committerBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Mon, 9 Jan 2017 20:43:59 +0000 (21:43 +0100)
Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
src/amd/Makefile.common.am
src/amd/Makefile.sources
src/amd/common/ac_debug.c [new file with mode: 0644]
src/amd/common/ac_debug.h [new file with mode: 0644]
src/gallium/drivers/radeonsi/si_debug.c
src/gallium/drivers/radeonsi/si_pipe.h
src/gallium/drivers/radeonsi/si_state_draw.c

index 1425decb90e84132d914faa275647104604eda65..533ad17de59fe68bcb4e3d6a4a1f5f1b8cdbfe19 100644 (file)
@@ -54,6 +54,7 @@ noinst_LTLIBRARIES += $(COMMON_LIBS)
 
 common_libamd_common_la_SOURCES = \
        $(AMD_COMPILER_FILES) \
 
 common_libamd_common_la_SOURCES = \
        $(AMD_COMPILER_FILES) \
+       $(AMD_DEBUG_FILES) \
        $(AMD_GENERATED_FILES)
 
 # nir_to_llvm requires LLVM 3.9, which is only required as a minimum when
        $(AMD_GENERATED_FILES)
 
 # nir_to_llvm requires LLVM 3.9, which is only required as a minimum when
index bde02d16a88dc9ec0a2feee0c22b7bbdb18d6fd6..d981453ea1250ab7fa5391869a09d1cbffd143f2 100644 (file)
@@ -37,5 +37,9 @@ AMD_NIR_FILES = \
        common/ac_nir_to_llvm.c \
        common/ac_nir_to_llvm.h
 
        common/ac_nir_to_llvm.c \
        common/ac_nir_to_llvm.h
 
+AMD_DEBUG_FILES = \
+       common/ac_debug.c \
+       common/ac_debug.h
+
 AMD_GENERATED_FILES = \
        common/sid_tables.h
 AMD_GENERATED_FILES = \
        common/sid_tables.h
diff --git a/src/amd/common/ac_debug.c b/src/amd/common/ac_debug.c
new file mode 100644 (file)
index 0000000..d068492
--- /dev/null
@@ -0,0 +1,357 @@
+/*
+ * Copyright 2015 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *      Marek Olšák <maraeo@gmail.com>
+ */
+
+#include "ac_debug.h"
+
+#include "sid.h"
+#include "sid_tables.h"
+#include "util/u_math.h"
+#include "util/u_memory.h"
+
+/* Parsed IBs are difficult to read without colors. Use "less -R file" to
+ * read them, or use "aha -b -f file" to convert them to html.
+ */
+#define COLOR_RESET    "\033[0m"
+#define COLOR_RED      "\033[31m"
+#define COLOR_GREEN    "\033[1;32m"
+#define COLOR_YELLOW   "\033[1;33m"
+#define COLOR_CYAN     "\033[1;36m"
+
+#define INDENT_PKT 8
+
+static void print_spaces(FILE *f, unsigned num)
+{
+       fprintf(f, "%*s", num, "");
+}
+
+static void print_value(FILE *file, uint32_t value, int bits)
+{
+       /* Guess if it's int or float */
+       if (value <= (1 << 15)) {
+               if (value <= 9)
+                       fprintf(file, "%u\n", value);
+               else
+                       fprintf(file, "%u (0x%0*x)\n", value, bits / 4, value);
+       } else {
+               float f = uif(value);
+
+               if (fabs(f) < 100000 && f*10 == floor(f*10))
+                       fprintf(file, "%.1ff (0x%0*x)\n", f, bits / 4, value);
+               else
+                       /* Don't print more leading zeros than there are bits. */
+                       fprintf(file, "0x%0*x\n", bits / 4, value);
+       }
+}
+
+static void print_named_value(FILE *file, const char *name, uint32_t value,
+                             int bits)
+{
+       print_spaces(file, INDENT_PKT);
+       fprintf(file, COLOR_YELLOW "%s" COLOR_RESET " <- ", name);
+       print_value(file, value, bits);
+}
+
+void ac_dump_reg(FILE *file, unsigned offset, uint32_t value,
+                uint32_t field_mask)
+{
+       int r, f;
+
+       for (r = 0; r < ARRAY_SIZE(sid_reg_table); r++) {
+               const struct si_reg *reg = &sid_reg_table[r];
+               const char *reg_name = sid_strings + reg->name_offset;
+
+               if (reg->offset == offset) {
+                       bool first_field = true;
+
+                       print_spaces(file, INDENT_PKT);
+                       fprintf(file, COLOR_YELLOW "%s" COLOR_RESET " <- ",
+                               reg_name);
+
+                       if (!reg->num_fields) {
+                               print_value(file, value, 32);
+                               return;
+                       }
+
+                       for (f = 0; f < reg->num_fields; f++) {
+                               const struct si_field *field = sid_fields_table + reg->fields_offset + f;
+                               const int *values_offsets = sid_strings_offsets + field->values_offset;
+                               uint32_t val = (value & field->mask) >>
+                                              (ffs(field->mask) - 1);
+
+                               if (!(field->mask & field_mask))
+                                       continue;
+
+                               /* Indent the field. */
+                               if (!first_field)
+                                       print_spaces(file,
+                                                    INDENT_PKT + strlen(reg_name) + 4);
+
+                               /* Print the field. */
+                               fprintf(file, "%s = ", sid_strings + field->name_offset);
+
+                               if (val < field->num_values && values_offsets[val] >= 0)
+                                       fprintf(file, "%s\n", sid_strings + values_offsets[val]);
+                               else
+                                       print_value(file, val,
+                                                   util_bitcount(field->mask));
+
+                               first_field = false;
+                       }
+                       return;
+               }
+       }
+
+       print_spaces(file, INDENT_PKT);
+       fprintf(file, COLOR_YELLOW "0x%05x" COLOR_RESET " <- 0x%08x\n", offset, value);
+}
+
+static void ac_parse_set_reg_packet(FILE *f, uint32_t *ib, unsigned count,
+                                   unsigned reg_offset)
+{
+       unsigned reg = (ib[1] << 2) + reg_offset;
+       int i;
+
+       for (i = 0; i < count; i++)
+               ac_dump_reg(f, reg + i*4, ib[2+i], ~0);
+}
+
+static uint32_t *ac_parse_packet3(FILE *f, uint32_t *ib, int *num_dw,
+                                 int trace_id, enum chip_class chip_class)
+{
+       unsigned count = PKT_COUNT_G(ib[0]);
+       unsigned op = PKT3_IT_OPCODE_G(ib[0]);
+       const char *predicate = PKT3_PREDICATE(ib[0]) ? "(predicate)" : "";
+       int i;
+
+       /* Print the name first. */
+       for (i = 0; i < ARRAY_SIZE(packet3_table); i++)
+               if (packet3_table[i].op == op)
+                       break;
+
+       if (i < ARRAY_SIZE(packet3_table)) {
+               const char *name = sid_strings + packet3_table[i].name_offset;
+
+               if (op == PKT3_SET_CONTEXT_REG ||
+                   op == PKT3_SET_CONFIG_REG ||
+                   op == PKT3_SET_UCONFIG_REG ||
+                   op == PKT3_SET_SH_REG)
+                       fprintf(f, COLOR_CYAN "%s%s" COLOR_CYAN ":\n",
+                               name, predicate);
+               else
+                       fprintf(f, COLOR_GREEN "%s%s" COLOR_RESET ":\n",
+                               name, predicate);
+       } else
+               fprintf(f, COLOR_RED "PKT3_UNKNOWN 0x%x%s" COLOR_RESET ":\n",
+                       op, predicate);
+
+       /* Print the contents. */
+       switch (op) {
+       case PKT3_SET_CONTEXT_REG:
+               ac_parse_set_reg_packet(f, ib, count, SI_CONTEXT_REG_OFFSET);
+               break;
+       case PKT3_SET_CONFIG_REG:
+               ac_parse_set_reg_packet(f, ib, count, SI_CONFIG_REG_OFFSET);
+               break;
+       case PKT3_SET_UCONFIG_REG:
+               ac_parse_set_reg_packet(f, ib, count, CIK_UCONFIG_REG_OFFSET);
+               break;
+       case PKT3_SET_SH_REG:
+               ac_parse_set_reg_packet(f, ib, count, SI_SH_REG_OFFSET);
+               break;
+       case PKT3_ACQUIRE_MEM:
+               ac_dump_reg(f, R_0301F0_CP_COHER_CNTL, ib[1], ~0);
+               ac_dump_reg(f, R_0301F4_CP_COHER_SIZE, ib[2], ~0);
+               ac_dump_reg(f, R_030230_CP_COHER_SIZE_HI, ib[3], ~0);
+               ac_dump_reg(f, R_0301F8_CP_COHER_BASE, ib[4], ~0);
+               ac_dump_reg(f, R_0301E4_CP_COHER_BASE_HI, ib[5], ~0);
+               print_named_value(f, "POLL_INTERVAL", ib[6], 16);
+               break;
+       case PKT3_SURFACE_SYNC:
+               if (chip_class >= CIK) {
+                       ac_dump_reg(f, R_0301F0_CP_COHER_CNTL, ib[1], ~0);
+                       ac_dump_reg(f, R_0301F4_CP_COHER_SIZE, ib[2], ~0);
+                       ac_dump_reg(f, R_0301F8_CP_COHER_BASE, ib[3], ~0);
+               } else {
+                       ac_dump_reg(f, R_0085F0_CP_COHER_CNTL, ib[1], ~0);
+                       ac_dump_reg(f, R_0085F4_CP_COHER_SIZE, ib[2], ~0);
+                       ac_dump_reg(f, R_0085F8_CP_COHER_BASE, ib[3], ~0);
+               }
+               print_named_value(f, "POLL_INTERVAL", ib[4], 16);
+               break;
+       case PKT3_EVENT_WRITE:
+               ac_dump_reg(f, R_028A90_VGT_EVENT_INITIATOR, ib[1],
+                           S_028A90_EVENT_TYPE(~0));
+               print_named_value(f, "EVENT_INDEX", (ib[1] >> 8) & 0xf, 4);
+               print_named_value(f, "INV_L2", (ib[1] >> 20) & 0x1, 1);
+               if (count > 0) {
+                       print_named_value(f, "ADDRESS_LO", ib[2], 32);
+                       print_named_value(f, "ADDRESS_HI", ib[3], 16);
+               }
+               break;
+       case PKT3_DRAW_INDEX_AUTO:
+               ac_dump_reg(f, R_030930_VGT_NUM_INDICES, ib[1], ~0);
+               ac_dump_reg(f, R_0287F0_VGT_DRAW_INITIATOR, ib[2], ~0);
+               break;
+       case PKT3_DRAW_INDEX_2:
+               ac_dump_reg(f, R_028A78_VGT_DMA_MAX_SIZE, ib[1], ~0);
+               ac_dump_reg(f, R_0287E8_VGT_DMA_BASE, ib[2], ~0);
+               ac_dump_reg(f, R_0287E4_VGT_DMA_BASE_HI, ib[3], ~0);
+               ac_dump_reg(f, R_030930_VGT_NUM_INDICES, ib[4], ~0);
+               ac_dump_reg(f, R_0287F0_VGT_DRAW_INITIATOR, ib[5], ~0);
+               break;
+       case PKT3_INDEX_TYPE:
+               ac_dump_reg(f, R_028A7C_VGT_DMA_INDEX_TYPE, ib[1], ~0);
+               break;
+       case PKT3_NUM_INSTANCES:
+               ac_dump_reg(f, R_030934_VGT_NUM_INSTANCES, ib[1], ~0);
+               break;
+       case PKT3_WRITE_DATA:
+               ac_dump_reg(f, R_370_CONTROL, ib[1], ~0);
+               ac_dump_reg(f, R_371_DST_ADDR_LO, ib[2], ~0);
+               ac_dump_reg(f, R_372_DST_ADDR_HI, ib[3], ~0);
+               for (i = 2; i < count; i++) {
+                       print_spaces(f, INDENT_PKT);
+                       fprintf(f, "0x%08x\n", ib[2+i]);
+               }
+               break;
+       case PKT3_CP_DMA:
+               ac_dump_reg(f, R_410_CP_DMA_WORD0, ib[1], ~0);
+               ac_dump_reg(f, R_411_CP_DMA_WORD1, ib[2], ~0);
+               ac_dump_reg(f, R_412_CP_DMA_WORD2, ib[3], ~0);
+               ac_dump_reg(f, R_413_CP_DMA_WORD3, ib[4], ~0);
+               ac_dump_reg(f, R_414_COMMAND, ib[5], ~0);
+               break;
+       case PKT3_DMA_DATA:
+               ac_dump_reg(f, R_500_DMA_DATA_WORD0, ib[1], ~0);
+               ac_dump_reg(f, R_501_SRC_ADDR_LO, ib[2], ~0);
+               ac_dump_reg(f, R_502_SRC_ADDR_HI, ib[3], ~0);
+               ac_dump_reg(f, R_503_DST_ADDR_LO, ib[4], ~0);
+               ac_dump_reg(f, R_504_DST_ADDR_HI, ib[5], ~0);
+               ac_dump_reg(f, R_414_COMMAND, ib[6], ~0);
+               break;
+       case PKT3_INDIRECT_BUFFER_SI:
+       case PKT3_INDIRECT_BUFFER_CONST:
+       case PKT3_INDIRECT_BUFFER_CIK:
+               ac_dump_reg(f, R_3F0_IB_BASE_LO, ib[1], ~0);
+               ac_dump_reg(f, R_3F1_IB_BASE_HI, ib[2], ~0);
+               ac_dump_reg(f, R_3F2_CONTROL, ib[3], ~0);
+               break;
+       case PKT3_CLEAR_STATE:
+       case PKT3_INCREMENT_DE_COUNTER:
+       case PKT3_PFP_SYNC_ME:
+               break;
+       case PKT3_NOP:
+               if (ib[0] == 0xffff1000) {
+                       count = -1; /* One dword NOP. */
+                       break;
+               } else if (count == 0 && AC_IS_TRACE_POINT(ib[1])) {
+                       unsigned packet_id = AC_GET_TRACE_POINT_ID(ib[1]);
+
+                       print_spaces(f, INDENT_PKT);
+                       fprintf(f, COLOR_RED "Trace point ID: %u\n", packet_id);
+
+                       if (trace_id == -1)
+                               break; /* tracing was disabled */
+
+                       print_spaces(f, INDENT_PKT);
+                       if (packet_id < trace_id)
+                               fprintf(f, COLOR_RED
+                                       "This trace point was reached by the CP."
+                                       COLOR_RESET "\n");
+                       else if (packet_id == trace_id)
+                               fprintf(f, COLOR_RED
+                                       "!!!!! This is the last trace point that "
+                                       "was reached by the CP !!!!!"
+                                       COLOR_RESET "\n");
+                       else if (packet_id+1 == trace_id)
+                               fprintf(f, COLOR_RED
+                                       "!!!!! This is the first trace point that "
+                                       "was NOT been reached by the CP !!!!!"
+                                       COLOR_RESET "\n");
+                       else
+                               fprintf(f, COLOR_RED
+                                       "!!!!! This trace point was NOT reached "
+                                       "by the CP !!!!!"
+                                       COLOR_RESET "\n");
+                       break;
+               }
+               /* fall through, print all dwords */
+       default:
+               for (i = 0; i < count+1; i++) {
+                       print_spaces(f, INDENT_PKT);
+                       fprintf(f, "0x%08x\n", ib[1+i]);
+               }
+       }
+
+       ib += count + 2;
+       *num_dw -= count + 2;
+       return ib;
+}
+
+/**
+ * Parse and print an IB into a file.
+ *
+ * \param f            file
+ * \param ib           IB
+ * \param num_dw       size of the IB
+ * \param chip_class   chip class
+ * \param trace_id     the last trace ID that is known to have been reached
+ *                     and executed by the CP, typically read from a buffer
+ */
+void ac_parse_ib(FILE *f, uint32_t *ib, int num_dw, int trace_id,
+                const char *name, enum chip_class chip_class)
+{
+       fprintf(f, "------------------ %s begin ------------------\n", name);
+
+       while (num_dw > 0) {
+               unsigned type = PKT_TYPE_G(ib[0]);
+
+               switch (type) {
+               case 3:
+                       ib = ac_parse_packet3(f, ib, &num_dw, trace_id,
+                                             chip_class);
+                       break;
+               case 2:
+                       /* type-2 nop */
+                       if (ib[0] == 0x80000000) {
+                               fprintf(f, COLOR_GREEN "NOP (type 2)" COLOR_RESET "\n");
+                               ib++;
+                               break;
+                       }
+                       /* fall through */
+               default:
+                       fprintf(f, "Unknown packet type %i\n", type);
+                       return;
+               }
+       }
+
+       fprintf(f, "------------------- %s end -------------------\n", name);
+       if (num_dw < 0) {
+               printf("Packet ends after the end of IB.\n");
+               exit(0);
+       }
+       fprintf(f, "\n");
+}
diff --git a/src/amd/common/ac_debug.h b/src/amd/common/ac_debug.h
new file mode 100644 (file)
index 0000000..f72b67a
--- /dev/null
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2015 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *      Marek Olšák <maraeo@gmail.com>
+ */
+#ifndef AC_DEBUG_H
+#define AC_DEBUG_H
+
+#include <stdint.h>
+#include <stdio.h>
+
+#include "amd_family.h"
+
+#define AC_ENCODE_TRACE_POINT(id)       (0xcafe0000 | ((id) & 0xffff))
+#define AC_IS_TRACE_POINT(x)            (((x) & 0xcafe0000) == 0xcafe0000)
+#define AC_GET_TRACE_POINT_ID(x)        ((x) & 0xffff)
+
+void ac_dump_reg(FILE *file, unsigned offset, uint32_t value,
+                uint32_t field_mask);
+void ac_parse_ib(FILE *f, uint32_t *ib, int num_dw, int trace_id,
+                const char *name, enum chip_class chip_class);
+
+#endif
index 9f381fe12579f29ba07f9b13bb6f274bf0a31b5a..43fc9c1f3e03a626c879e18de4e336fb912cb11d 100644 (file)
@@ -30,6 +30,7 @@
 #include "radeon/radeon_elf_util.h"
 #include "ddebug/dd_util.h"
 #include "util/u_memory.h"
 #include "radeon/radeon_elf_util.h"
 #include "ddebug/dd_util.h"
 #include "util/u_memory.h"
+#include "ac_debug.h"
 
 DEBUG_GET_ONCE_OPTION(replace_shaders, "RADEON_REPLACE_SHADERS", NULL)
 
 
 DEBUG_GET_ONCE_OPTION(replace_shaders, "RADEON_REPLACE_SHADERS", NULL)
 
@@ -149,322 +150,6 @@ file_error:
 #define COLOR_YELLOW   "\033[1;33m"
 #define COLOR_CYAN     "\033[1;36m"
 
 #define COLOR_YELLOW   "\033[1;33m"
 #define COLOR_CYAN     "\033[1;36m"
 
-#define INDENT_PKT 8
-
-static void print_spaces(FILE *f, unsigned num)
-{
-       fprintf(f, "%*s", num, "");
-}
-
-static void print_value(FILE *file, uint32_t value, int bits)
-{
-       /* Guess if it's int or float */
-       if (value <= (1 << 15)) {
-               if (value <= 9)
-                       fprintf(file, "%u\n", value);
-               else
-                       fprintf(file, "%u (0x%0*x)\n", value, bits / 4, value);
-       } else {
-               float f = uif(value);
-
-               if (fabs(f) < 100000 && f*10 == floor(f*10))
-                       fprintf(file, "%.1ff (0x%0*x)\n", f, bits / 4, value);
-               else
-                       /* Don't print more leading zeros than there are bits. */
-                       fprintf(file, "0x%0*x\n", bits / 4, value);
-       }
-}
-
-static void print_named_value(FILE *file, const char *name, uint32_t value,
-                             int bits)
-{
-       print_spaces(file, INDENT_PKT);
-       fprintf(file, COLOR_YELLOW "%s" COLOR_RESET " <- ", name);
-       print_value(file, value, bits);
-}
-
-static void si_dump_reg(FILE *file, unsigned offset, uint32_t value,
-                       uint32_t field_mask)
-{
-       int r, f;
-
-       for (r = 0; r < ARRAY_SIZE(sid_reg_table); r++) {
-               const struct si_reg *reg = &sid_reg_table[r];
-               const char *reg_name = sid_strings + reg->name_offset;
-
-               if (reg->offset == offset) {
-                       bool first_field = true;
-
-                       print_spaces(file, INDENT_PKT);
-                       fprintf(file, COLOR_YELLOW "%s" COLOR_RESET " <- ",
-                               reg_name);
-
-                       if (!reg->num_fields) {
-                               print_value(file, value, 32);
-                               return;
-                       }
-
-                       for (f = 0; f < reg->num_fields; f++) {
-                               const struct si_field *field = sid_fields_table + reg->fields_offset + f;
-                               const int *values_offsets = sid_strings_offsets + field->values_offset;
-                               uint32_t val = (value & field->mask) >>
-                                              (ffs(field->mask) - 1);
-
-                               if (!(field->mask & field_mask))
-                                       continue;
-
-                               /* Indent the field. */
-                               if (!first_field)
-                                       print_spaces(file,
-                                                    INDENT_PKT + strlen(reg_name) + 4);
-
-                               /* Print the field. */
-                               fprintf(file, "%s = ", sid_strings + field->name_offset);
-
-                               if (val < field->num_values && values_offsets[val] >= 0)
-                                       fprintf(file, "%s\n", sid_strings + values_offsets[val]);
-                               else
-                                       print_value(file, val,
-                                                   util_bitcount(field->mask));
-
-                               first_field = false;
-                       }
-                       return;
-               }
-       }
-
-       print_spaces(file, INDENT_PKT);
-       fprintf(file, COLOR_YELLOW "0x%05x" COLOR_RESET " <- 0x%08x\n", offset, value);
-}
-
-static void si_parse_set_reg_packet(FILE *f, uint32_t *ib, unsigned count,
-                                   unsigned reg_offset)
-{
-       unsigned reg = (ib[1] << 2) + reg_offset;
-       int i;
-
-       for (i = 0; i < count; i++)
-               si_dump_reg(f, reg + i*4, ib[2+i], ~0);
-}
-
-static uint32_t *si_parse_packet3(FILE *f, uint32_t *ib, int *num_dw,
-                                 int trace_id, enum chip_class chip_class)
-{
-       unsigned count = PKT_COUNT_G(ib[0]);
-       unsigned op = PKT3_IT_OPCODE_G(ib[0]);
-       const char *predicate = PKT3_PREDICATE(ib[0]) ? "(predicate)" : "";
-       int i;
-
-       /* Print the name first. */
-       for (i = 0; i < ARRAY_SIZE(packet3_table); i++)
-               if (packet3_table[i].op == op)
-                       break;
-
-       if (i < ARRAY_SIZE(packet3_table)) {
-               const char *name = sid_strings + packet3_table[i].name_offset;
-
-               if (op == PKT3_SET_CONTEXT_REG ||
-                   op == PKT3_SET_CONFIG_REG ||
-                   op == PKT3_SET_UCONFIG_REG ||
-                   op == PKT3_SET_SH_REG)
-                       fprintf(f, COLOR_CYAN "%s%s" COLOR_CYAN ":\n",
-                               name, predicate);
-               else
-                       fprintf(f, COLOR_GREEN "%s%s" COLOR_RESET ":\n",
-                               name, predicate);
-       } else
-               fprintf(f, COLOR_RED "PKT3_UNKNOWN 0x%x%s" COLOR_RESET ":\n",
-                       op, predicate);
-
-       /* Print the contents. */
-       switch (op) {
-       case PKT3_SET_CONTEXT_REG:
-               si_parse_set_reg_packet(f, ib, count, SI_CONTEXT_REG_OFFSET);
-               break;
-       case PKT3_SET_CONFIG_REG:
-               si_parse_set_reg_packet(f, ib, count, SI_CONFIG_REG_OFFSET);
-               break;
-       case PKT3_SET_UCONFIG_REG:
-               si_parse_set_reg_packet(f, ib, count, CIK_UCONFIG_REG_OFFSET);
-               break;
-       case PKT3_SET_SH_REG:
-               si_parse_set_reg_packet(f, ib, count, SI_SH_REG_OFFSET);
-               break;
-       case PKT3_ACQUIRE_MEM:
-               si_dump_reg(f, R_0301F0_CP_COHER_CNTL, ib[1], ~0);
-               si_dump_reg(f, R_0301F4_CP_COHER_SIZE, ib[2], ~0);
-               si_dump_reg(f, R_030230_CP_COHER_SIZE_HI, ib[3], ~0);
-               si_dump_reg(f, R_0301F8_CP_COHER_BASE, ib[4], ~0);
-               si_dump_reg(f, R_0301E4_CP_COHER_BASE_HI, ib[5], ~0);
-               print_named_value(f, "POLL_INTERVAL", ib[6], 16);
-               break;
-       case PKT3_SURFACE_SYNC:
-               if (chip_class >= CIK) {
-                       si_dump_reg(f, R_0301F0_CP_COHER_CNTL, ib[1], ~0);
-                       si_dump_reg(f, R_0301F4_CP_COHER_SIZE, ib[2], ~0);
-                       si_dump_reg(f, R_0301F8_CP_COHER_BASE, ib[3], ~0);
-               } else {
-                       si_dump_reg(f, R_0085F0_CP_COHER_CNTL, ib[1], ~0);
-                       si_dump_reg(f, R_0085F4_CP_COHER_SIZE, ib[2], ~0);
-                       si_dump_reg(f, R_0085F8_CP_COHER_BASE, ib[3], ~0);
-               }
-               print_named_value(f, "POLL_INTERVAL", ib[4], 16);
-               break;
-       case PKT3_EVENT_WRITE:
-               si_dump_reg(f, R_028A90_VGT_EVENT_INITIATOR, ib[1],
-                           S_028A90_EVENT_TYPE(~0));
-               print_named_value(f, "EVENT_INDEX", (ib[1] >> 8) & 0xf, 4);
-               print_named_value(f, "INV_L2", (ib[1] >> 20) & 0x1, 1);
-               if (count > 0) {
-                       print_named_value(f, "ADDRESS_LO", ib[2], 32);
-                       print_named_value(f, "ADDRESS_HI", ib[3], 16);
-               }
-               break;
-       case PKT3_DRAW_INDEX_AUTO:
-               si_dump_reg(f, R_030930_VGT_NUM_INDICES, ib[1], ~0);
-               si_dump_reg(f, R_0287F0_VGT_DRAW_INITIATOR, ib[2], ~0);
-               break;
-       case PKT3_DRAW_INDEX_2:
-               si_dump_reg(f, R_028A78_VGT_DMA_MAX_SIZE, ib[1], ~0);
-               si_dump_reg(f, R_0287E8_VGT_DMA_BASE, ib[2], ~0);
-               si_dump_reg(f, R_0287E4_VGT_DMA_BASE_HI, ib[3], ~0);
-               si_dump_reg(f, R_030930_VGT_NUM_INDICES, ib[4], ~0);
-               si_dump_reg(f, R_0287F0_VGT_DRAW_INITIATOR, ib[5], ~0);
-               break;
-       case PKT3_INDEX_TYPE:
-               si_dump_reg(f, R_028A7C_VGT_DMA_INDEX_TYPE, ib[1], ~0);
-               break;
-       case PKT3_NUM_INSTANCES:
-               si_dump_reg(f, R_030934_VGT_NUM_INSTANCES, ib[1], ~0);
-               break;
-       case PKT3_WRITE_DATA:
-               si_dump_reg(f, R_370_CONTROL, ib[1], ~0);
-               si_dump_reg(f, R_371_DST_ADDR_LO, ib[2], ~0);
-               si_dump_reg(f, R_372_DST_ADDR_HI, ib[3], ~0);
-               for (i = 2; i < count; i++) {
-                       print_spaces(f, INDENT_PKT);
-                       fprintf(f, "0x%08x\n", ib[2+i]);
-               }
-               break;
-       case PKT3_CP_DMA:
-               si_dump_reg(f, R_410_CP_DMA_WORD0, ib[1], ~0);
-               si_dump_reg(f, R_411_CP_DMA_WORD1, ib[2], ~0);
-               si_dump_reg(f, R_412_CP_DMA_WORD2, ib[3], ~0);
-               si_dump_reg(f, R_413_CP_DMA_WORD3, ib[4], ~0);
-               si_dump_reg(f, R_414_COMMAND, ib[5], ~0);
-               break;
-       case PKT3_DMA_DATA:
-               si_dump_reg(f, R_500_DMA_DATA_WORD0, ib[1], ~0);
-               si_dump_reg(f, R_501_SRC_ADDR_LO, ib[2], ~0);
-               si_dump_reg(f, R_502_SRC_ADDR_HI, ib[3], ~0);
-               si_dump_reg(f, R_503_DST_ADDR_LO, ib[4], ~0);
-               si_dump_reg(f, R_504_DST_ADDR_HI, ib[5], ~0);
-               si_dump_reg(f, R_414_COMMAND, ib[6], ~0);
-               break;
-       case PKT3_INDIRECT_BUFFER_SI:
-       case PKT3_INDIRECT_BUFFER_CONST:
-       case PKT3_INDIRECT_BUFFER_CIK:
-               si_dump_reg(f, R_3F0_IB_BASE_LO, ib[1], ~0);
-               si_dump_reg(f, R_3F1_IB_BASE_HI, ib[2], ~0);
-               si_dump_reg(f, R_3F2_CONTROL, ib[3], ~0);
-               break;
-       case PKT3_CLEAR_STATE:
-       case PKT3_INCREMENT_DE_COUNTER:
-       case PKT3_PFP_SYNC_ME:
-               break;
-       case PKT3_NOP:
-               if (ib[0] == 0xffff1000) {
-                       count = -1; /* One dword NOP. */
-                       break;
-               } else if (count == 0 && SI_IS_TRACE_POINT(ib[1])) {
-                       unsigned packet_id = SI_GET_TRACE_POINT_ID(ib[1]);
-
-                       print_spaces(f, INDENT_PKT);
-                       fprintf(f, COLOR_RED "Trace point ID: %u\n", packet_id);
-
-                       if (trace_id == -1)
-                               break; /* tracing was disabled */
-
-                       print_spaces(f, INDENT_PKT);
-                       if (packet_id < trace_id)
-                               fprintf(f, COLOR_RED
-                                       "This trace point was reached by the CP."
-                                       COLOR_RESET "\n");
-                       else if (packet_id == trace_id)
-                               fprintf(f, COLOR_RED
-                                       "!!!!! This is the last trace point that "
-                                       "was reached by the CP !!!!!"
-                                       COLOR_RESET "\n");
-                       else if (packet_id+1 == trace_id)
-                               fprintf(f, COLOR_RED
-                                       "!!!!! This is the first trace point that "
-                                       "was NOT been reached by the CP !!!!!"
-                                       COLOR_RESET "\n");
-                       else
-                               fprintf(f, COLOR_RED
-                                       "!!!!! This trace point was NOT reached "
-                                       "by the CP !!!!!"
-                                       COLOR_RESET "\n");
-                       break;
-               }
-               /* fall through, print all dwords */
-       default:
-               for (i = 0; i < count+1; i++) {
-                       print_spaces(f, INDENT_PKT);
-                       fprintf(f, "0x%08x\n", ib[1+i]);
-               }
-       }
-
-       ib += count + 2;
-       *num_dw -= count + 2;
-       return ib;
-}
-
-/**
- * Parse and print an IB into a file.
- *
- * \param f            file
- * \param ib           IB
- * \param num_dw       size of the IB
- * \param chip_class   chip class
- * \param trace_id     the last trace ID that is known to have been reached
- *                     and executed by the CP, typically read from a buffer
- */
-static void si_parse_ib(FILE *f, uint32_t *ib, int num_dw, int trace_id,
-                       const char *name, enum chip_class chip_class)
-{
-       fprintf(f, "------------------ %s begin ------------------\n", name);
-
-       while (num_dw > 0) {
-               unsigned type = PKT_TYPE_G(ib[0]);
-
-               switch (type) {
-               case 3:
-                       ib = si_parse_packet3(f, ib, &num_dw, trace_id,
-                                             chip_class);
-                       break;
-               case 2:
-                       /* type-2 nop */
-                       if (ib[0] == 0x80000000) {
-                               fprintf(f, COLOR_GREEN "NOP (type 2)" COLOR_RESET "\n");
-                               ib++;
-                               break;
-                       }
-                       /* fall through */
-               default:
-                       fprintf(f, "Unknown packet type %i\n", type);
-                       return;
-               }
-       }
-
-       fprintf(f, "------------------- %s end -------------------\n", name);
-       if (num_dw < 0) {
-               printf("Packet ends after the end of IB.\n");
-               exit(0);
-       }
-       fprintf(f, "\n");
-}
-
 static void si_dump_mmapped_reg(struct si_context *sctx, FILE *f,
                                unsigned offset)
 {
 static void si_dump_mmapped_reg(struct si_context *sctx, FILE *f,
                                unsigned offset)
 {
@@ -472,7 +157,7 @@ static void si_dump_mmapped_reg(struct si_context *sctx, FILE *f,
        uint32_t value;
 
        if (ws->read_registers(ws, offset, 1, &value))
        uint32_t value;
 
        if (ws->read_registers(ws, offset, 1, &value))
-               si_dump_reg(f, offset, value, ~0);
+               ac_dump_reg(f, offset, value, ~0);
 }
 
 static void si_dump_debug_registers(struct si_context *sctx, FILE *f)
 }
 
 static void si_dump_debug_registers(struct si_context *sctx, FILE *f)
@@ -535,15 +220,15 @@ static void si_dump_last_ib(struct si_context *sctx, FILE *f)
        }
 
        if (sctx->init_config)
        }
 
        if (sctx->init_config)
-               si_parse_ib(f, sctx->init_config->pm4, sctx->init_config->ndw,
+               ac_parse_ib(f, sctx->init_config->pm4, sctx->init_config->ndw,
                            -1, "IB2: Init config", sctx->b.chip_class);
 
        if (sctx->init_config_gs_rings)
                            -1, "IB2: Init config", sctx->b.chip_class);
 
        if (sctx->init_config_gs_rings)
-               si_parse_ib(f, sctx->init_config_gs_rings->pm4,
+               ac_parse_ib(f, sctx->init_config_gs_rings->pm4,
                            sctx->init_config_gs_rings->ndw,
                            -1, "IB2: Init GS rings", sctx->b.chip_class);
 
                            sctx->init_config_gs_rings->ndw,
                            -1, "IB2: Init GS rings", sctx->b.chip_class);
 
-       si_parse_ib(f, sctx->last_gfx.ib, sctx->last_gfx.num_dw,
+       ac_parse_ib(f, sctx->last_gfx.ib, sctx->last_gfx.num_dw,
                    last_trace_id, "IB", sctx->b.chip_class);
 }
 
                    last_trace_id, "IB", sctx->b.chip_class);
 }
 
@@ -697,37 +382,37 @@ static void si_dump_descriptor_list(struct si_descriptors *desc,
                switch (desc->element_dw_size) {
                case 4:
                        for (j = 0; j < 4; j++)
                switch (desc->element_dw_size) {
                case 4:
                        for (j = 0; j < 4; j++)
-                               si_dump_reg(f, R_008F00_SQ_BUF_RSRC_WORD0 + j*4,
+                               ac_dump_reg(f, R_008F00_SQ_BUF_RSRC_WORD0 + j*4,
                                            gpu_list[j], 0xffffffff);
                        break;
                case 8:
                        for (j = 0; j < 8; j++)
                                            gpu_list[j], 0xffffffff);
                        break;
                case 8:
                        for (j = 0; j < 8; j++)
-                               si_dump_reg(f, R_008F10_SQ_IMG_RSRC_WORD0 + j*4,
+                               ac_dump_reg(f, R_008F10_SQ_IMG_RSRC_WORD0 + j*4,
                                            gpu_list[j], 0xffffffff);
 
                        fprintf(f, COLOR_CYAN "    Buffer:" COLOR_RESET "\n");
                        for (j = 0; j < 4; j++)
                                            gpu_list[j], 0xffffffff);
 
                        fprintf(f, COLOR_CYAN "    Buffer:" COLOR_RESET "\n");
                        for (j = 0; j < 4; j++)
-                               si_dump_reg(f, R_008F00_SQ_BUF_RSRC_WORD0 + j*4,
+                               ac_dump_reg(f, R_008F00_SQ_BUF_RSRC_WORD0 + j*4,
                                            gpu_list[4+j], 0xffffffff);
                        break;
                case 16:
                        for (j = 0; j < 8; j++)
                                            gpu_list[4+j], 0xffffffff);
                        break;
                case 16:
                        for (j = 0; j < 8; j++)
-                               si_dump_reg(f, R_008F10_SQ_IMG_RSRC_WORD0 + j*4,
+                               ac_dump_reg(f, R_008F10_SQ_IMG_RSRC_WORD0 + j*4,
                                            gpu_list[j], 0xffffffff);
 
                        fprintf(f, COLOR_CYAN "    Buffer:" COLOR_RESET "\n");
                        for (j = 0; j < 4; j++)
                                            gpu_list[j], 0xffffffff);
 
                        fprintf(f, COLOR_CYAN "    Buffer:" COLOR_RESET "\n");
                        for (j = 0; j < 4; j++)
-                               si_dump_reg(f, R_008F00_SQ_BUF_RSRC_WORD0 + j*4,
+                               ac_dump_reg(f, R_008F00_SQ_BUF_RSRC_WORD0 + j*4,
                                            gpu_list[4+j], 0xffffffff);
 
                        fprintf(f, COLOR_CYAN "    FMASK:" COLOR_RESET "\n");
                        for (j = 0; j < 8; j++)
                                            gpu_list[4+j], 0xffffffff);
 
                        fprintf(f, COLOR_CYAN "    FMASK:" COLOR_RESET "\n");
                        for (j = 0; j < 8; j++)
-                               si_dump_reg(f, R_008F10_SQ_IMG_RSRC_WORD0 + j*4,
+                               ac_dump_reg(f, R_008F10_SQ_IMG_RSRC_WORD0 + j*4,
                                            gpu_list[8+j], 0xffffffff);
 
                        fprintf(f, COLOR_CYAN "    Sampler state:" COLOR_RESET "\n");
                        for (j = 0; j < 4; j++)
                                            gpu_list[8+j], 0xffffffff);
 
                        fprintf(f, COLOR_CYAN "    Sampler state:" COLOR_RESET "\n");
                        for (j = 0; j < 4; j++)
-                               si_dump_reg(f, R_008F30_SQ_IMG_SAMP_WORD0 + j*4,
+                               ac_dump_reg(f, R_008F30_SQ_IMG_SAMP_WORD0 + j*4,
                                            gpu_list[12+j], 0xffffffff);
                        break;
                }
                                            gpu_list[12+j], 0xffffffff);
                        break;
                }
index c0a4636cc636bb56a4297588b9256c8f47d5969d..cecbc3b91c3a7ec8ccafc608f0a863675bc79c4a 100644 (file)
                                              SI_CONTEXT_FLUSH_AND_INV_DB | \
                                              SI_CONTEXT_FLUSH_AND_INV_DB_META)
 
                                              SI_CONTEXT_FLUSH_AND_INV_DB | \
                                              SI_CONTEXT_FLUSH_AND_INV_DB_META)
 
-#define SI_ENCODE_TRACE_POINT(id)      (0xcafe0000 | ((id) & 0xffff))
-#define SI_IS_TRACE_POINT(x)           (((x) & 0xcafe0000) == 0xcafe0000)
-#define SI_GET_TRACE_POINT_ID(x)       ((x) & 0xffff)
-
 #define SI_MAX_BORDER_COLORS   4096
 
 struct si_compute;
 #define SI_MAX_BORDER_COLORS   4096
 
 struct si_compute;
index 7b756025f81270221ca2573b7eb906332a7f35a6..96a0e846e4a14cde39f833b97a865dd008037562 100644 (file)
@@ -32,6 +32,8 @@
 #include "util/u_upload_mgr.h"
 #include "util/u_prim.h"
 
 #include "util/u_upload_mgr.h"
 #include "util/u_prim.h"
 
+#include "ac_debug.h"
+
 static unsigned si_conv_pipe_prim(unsigned mode)
 {
         static const unsigned prim_conv[] = {
 static unsigned si_conv_pipe_prim(unsigned mode)
 {
         static const unsigned prim_conv[] = {
@@ -1234,5 +1236,5 @@ void si_trace_emit(struct si_context *sctx)
        radeon_emit(cs, sctx->trace_buf->gpu_address >> 32);
        radeon_emit(cs, sctx->trace_id);
        radeon_emit(cs, PKT3(PKT3_NOP, 0, 0));
        radeon_emit(cs, sctx->trace_buf->gpu_address >> 32);
        radeon_emit(cs, sctx->trace_id);
        radeon_emit(cs, PKT3(PKT3_NOP, 0, 0));
-       radeon_emit(cs, SI_ENCODE_TRACE_POINT(sctx->trace_id));
+       radeon_emit(cs, AC_ENCODE_TRACE_POINT(sctx->trace_id));
 }
 }