anv: simplify push constant emissions
[mesa.git] / src / intel / tools / aubinator_error_decode.c
index ecc01b55e7f8166665c613c970b4ebe6cd2d8522..6a4d42e53c25eefc5e9dfde2763a16c4a6e5446d 100644 (file)
@@ -39,8 +39,8 @@
 #include <zlib.h>
 
 #include "common/gen_decoder.h"
+#include "dev/gen_debug.h"
 #include "util/macros.h"
-#include "gen_disasm.h"
 
 #define CSI "\e["
 #define BLUE_HEADER  CSI "0;44m"
@@ -52,6 +52,7 @@
 /* options */
 
 static bool option_full_decode = true;
+static bool option_print_all_bb = false;
 static bool option_print_offsets = true;
 static enum { COLOR_AUTO, COLOR_ALWAYS, COLOR_NEVER } option_color;
 static char *xml_path = NULL;
@@ -66,7 +67,8 @@ print_head(unsigned int reg)
 static void
 print_register(struct gen_spec *spec, const char *name, uint32_t reg)
 {
-   struct gen_group *reg_spec = gen_spec_find_register_by_name(spec, name);
+   struct gen_group *reg_spec =
+      name ? gen_spec_find_register_by_name(spec, name) : NULL;
 
    if (reg_spec) {
       gen_print_group(stdout, reg_spec, 0, &reg, 0,
@@ -75,40 +77,88 @@ print_register(struct gen_spec *spec, const char *name, uint32_t reg)
 }
 
 struct ring_register_mapping {
-   const char *ring_name;
+   enum drm_i915_gem_engine_class ring_class;
+   unsigned ring_instance;
    const char *register_name;
 };
 
 static const struct ring_register_mapping acthd_registers[] = {
-   { "blt", "BCS_ACTHD_UDW" },
-   { "bsd", "VCS_ACTHD_UDW" },
-   { "bsd2", "VCS2_ACTHD_UDW" },
-   { "render", "ACTHD_UDW" },
-   { "vebox", "VECS_ACTHD_UDW" },
+   { I915_ENGINE_CLASS_COPY, 0, "BCS_ACTHD_UDW" },
+   { I915_ENGINE_CLASS_VIDEO, 0, "VCS_ACTHD_UDW" },
+   { I915_ENGINE_CLASS_VIDEO, 1, "VCS2_ACTHD_UDW" },
+   { I915_ENGINE_CLASS_RENDER, 0, "ACTHD_UDW" },
+   { I915_ENGINE_CLASS_VIDEO_ENHANCE, 0, "VECS_ACTHD_UDW" },
 };
 
 static const struct ring_register_mapping ctl_registers[] = {
-   { "blt", "BCS_RING_BUFFER_CTL" },
-   { "bsd", "VCS_RING_BUFFER_CTL" },
-   { "bsd2", "VCS2_RING_BUFFER_CTL" },
-   { "render", "RCS_RING_BUFFER_CTL" },
-   { "vebox", "VECS_RING_BUFFER_CTL" },
+   { I915_ENGINE_CLASS_COPY, 0, "BCS_RING_BUFFER_CTL" },
+   { I915_ENGINE_CLASS_VIDEO, 0, "VCS_RING_BUFFER_CTL" },
+   { I915_ENGINE_CLASS_VIDEO, 1, "VCS2_RING_BUFFER_CTL" },
+   { I915_ENGINE_CLASS_RENDER, 0, "RCS_RING_BUFFER_CTL" },
+   { I915_ENGINE_CLASS_VIDEO_ENHANCE, 0,  "VECS_RING_BUFFER_CTL" },
 };
 
 static const struct ring_register_mapping fault_registers[] = {
-   { "blt", "BCS_FAULT_REG" },
-   { "bsd", "VCS_FAULT_REG" },
-   { "render", "RCS_FAULT_REG" },
-   { "vebox", "VECS_FAULT_REG" },
+   { I915_ENGINE_CLASS_COPY, 0, "BCS_FAULT_REG" },
+   { I915_ENGINE_CLASS_VIDEO, 0, "VCS_FAULT_REG" },
+   { I915_ENGINE_CLASS_RENDER, 0, "RCS_FAULT_REG" },
+   { I915_ENGINE_CLASS_VIDEO_ENHANCE, 0, "VECS_FAULT_REG" },
 };
 
+static int ring_name_to_class(const char *ring_name,
+                              enum drm_i915_gem_engine_class *class)
+{
+   static const char *class_names[] = {
+      [I915_ENGINE_CLASS_RENDER] = "rcs",
+      [I915_ENGINE_CLASS_COPY] = "bcs",
+      [I915_ENGINE_CLASS_VIDEO] = "vcs",
+      [I915_ENGINE_CLASS_VIDEO_ENHANCE] = "vecs",
+   };
+   for (size_t i = 0; i < ARRAY_SIZE(class_names); i++) {
+      if (strncmp(ring_name, class_names[i], strlen(class_names[i])))
+         continue;
+
+      *class = i;
+      return atoi(ring_name + strlen(class_names[i]));
+   }
+
+   static const struct {
+      const char *name;
+      unsigned int class;
+      int instance;
+   } legacy_names[] = {
+      { "render", I915_ENGINE_CLASS_RENDER, 0 },
+      { "blt", I915_ENGINE_CLASS_COPY, 0 },
+      { "bsd", I915_ENGINE_CLASS_VIDEO, 0 },
+      { "bsd2", I915_ENGINE_CLASS_VIDEO, 1 },
+      { "vebox", I915_ENGINE_CLASS_VIDEO_ENHANCE, 0 },
+   };
+   for (size_t i = 0; i < ARRAY_SIZE(legacy_names); i++) {
+      if (strcmp(ring_name, legacy_names[i].name))
+         continue;
+
+      *class = legacy_names[i].class;
+      return legacy_names[i].instance;
+   }
+
+   return -1;
+}
+
 static const char *
 register_name_from_ring(const struct ring_register_mapping *mapping,
                         unsigned nb_mapping,
                         const char *ring_name)
 {
+   enum drm_i915_gem_engine_class class;
+   int instance;
+
+   instance = ring_name_to_class(ring_name, &class);
+   if (instance < 0)
+      return NULL;
+
    for (unsigned i = 0; i < nb_mapping; i++) {
-      if (strcmp(mapping[i].ring_name, ring_name) == 0)
+      if (mapping[i].ring_class == class &&
+          mapping[i].ring_instance == instance)
          return mapping[i].register_name;
    }
    return NULL;
@@ -118,16 +168,38 @@ static const char *
 instdone_register_for_ring(const struct gen_device_info *devinfo,
                            const char *ring_name)
 {
-   if (strcmp(ring_name, "blt") == 0)
-      return "BCS_INSTDONE";
-   else if (strcmp(ring_name, "vebox") == 0)
-      return "VECS_INSTDONE";
-   else if (strcmp(ring_name, "bsd") == 0)
-      return "VCS_INSTDONE";
-   else if (strcmp(ring_name, "render") == 0) {
+   enum drm_i915_gem_engine_class class;
+   int instance;
+
+   instance = ring_name_to_class(ring_name, &class);
+   if (instance < 0)
+      return NULL;
+
+   switch (class) {
+   case I915_ENGINE_CLASS_RENDER:
       if (devinfo->gen == 6)
          return "INSTDONE_2";
-      return "INSTDONE_1";
+      else
+         return "INSTDONE_1";
+
+   case I915_ENGINE_CLASS_COPY:
+      return "BCS_INSTDONE";
+
+   case I915_ENGINE_CLASS_VIDEO:
+      switch (instance) {
+      case 0:
+         return "VCS_INSTDONE";
+      case 1:
+         return "VCS2_INSTDONE";
+      default:
+         return NULL;
+      }
+
+   case I915_ENGINE_CLASS_VIDEO_ENHANCE:
+      return "VECS_INSTDONE";
+
+   default:
+      return NULL;
    }
 
    return NULL;
@@ -217,210 +289,14 @@ struct section {
    char *ring_name;
    const char *buffer_name;
    uint32_t *data;
-   int count;
+   int dword_count;
+   size_t data_offset;
 };
 
-#define MAX_SECTIONS 30
+#define MAX_SECTIONS 256
+static unsigned num_sections;
 static struct section sections[MAX_SECTIONS];
 
-static void
-disassemble_program(struct gen_disasm *disasm, const char *type,
-                    const struct section *instruction_section,
-                    uint64_t ksp)
-{
-   if (!instruction_section)
-      return;
-
-   printf("\nReferenced %s:\n", type);
-   gen_disasm_disassemble(disasm, instruction_section->data, ksp, stdout);
-}
-
-static const struct section *
-find_section(const char *str_base_address)
-{
-   uint64_t base_address = strtol(str_base_address, NULL, 16);
-   for (int s = 0; s < MAX_SECTIONS; s++) {
-      if (sections[s].gtt_offset == base_address)
-         return &sections[s];
-   }
-   return NULL;
-}
-
-static void
-decode(struct gen_spec *spec, struct gen_disasm *disasm,
-       const struct section *section)
-{
-   uint64_t gtt_offset = section->gtt_offset;
-   uint32_t *data = section->data;
-   uint32_t *p, *end = (data + section->count);
-   int length;
-   struct gen_group *inst;
-   const struct section *current_instruction_buffer = NULL;
-   const struct section *current_dynamic_state_buffer = NULL;
-
-   for (p = data; p < end; p += length) {
-      const char *color = option_full_decode ? BLUE_HEADER : NORMAL,
-         *reset_color = NORMAL;
-      uint64_t offset = gtt_offset + 4 * (p - data);
-
-      inst = gen_spec_find_instruction(spec, p);
-      length = gen_group_get_length(inst, p);
-      assert(inst == NULL || length > 0);
-      length = MAX2(1, length);
-      if (inst == NULL) {
-         printf("unknown instruction %08x\n", p[0]);
-         continue;
-      }
-      if (option_color == COLOR_NEVER) {
-         color = "";
-         reset_color = "";
-      }
-
-      printf("%s0x%08"PRIx64":  0x%08x:  %-80s%s\n",
-             color, offset, p[0], gen_group_get_name(inst), reset_color);
-
-      gen_print_group(stdout, inst, offset, p, 0,
-                      option_color == COLOR_ALWAYS);
-
-      if (strcmp(inst->name, "MI_BATCH_BUFFER_END") == 0)
-         break;
-
-      if (strcmp(inst->name, "STATE_BASE_ADDRESS") == 0) {
-         struct gen_field_iterator iter;
-         gen_field_iterator_init(&iter, inst, p, 0, false);
-
-         do {
-            if (strcmp(iter.name, "Instruction Base Address") == 0) {
-               current_instruction_buffer = find_section(iter.value);
-            } else if (strcmp(iter.name, "Dynamic State Base Address") == 0) {
-               current_dynamic_state_buffer = find_section(iter.value);
-            }
-         } while (gen_field_iterator_next(&iter));
-      } else if (strcmp(inst->name,   "WM_STATE") == 0 ||
-                 strcmp(inst->name, "3DSTATE_PS") == 0 ||
-                 strcmp(inst->name, "3DSTATE_WM") == 0) {
-         struct gen_field_iterator iter;
-         gen_field_iterator_init(&iter, inst, p, 0, false);
-         uint64_t ksp[3] = {0, 0, 0};
-         bool enabled[3] = {false, false, false};
-
-         do {
-            if (strncmp(iter.name, "Kernel Start Pointer ",
-                        strlen("Kernel Start Pointer ")) == 0) {
-               int idx = iter.name[strlen("Kernel Start Pointer ")] - '0';
-               ksp[idx] = strtol(iter.value, NULL, 16);
-            } else if (strcmp(iter.name, "8 Pixel Dispatch Enable") == 0) {
-               enabled[0] = strcmp(iter.value, "true") == 0;
-            } else if (strcmp(iter.name, "16 Pixel Dispatch Enable") == 0) {
-               enabled[1] = strcmp(iter.value, "true") == 0;
-            } else if (strcmp(iter.name, "32 Pixel Dispatch Enable") == 0) {
-               enabled[2] = strcmp(iter.value, "true") == 0;
-            }
-         } while (gen_field_iterator_next(&iter));
-
-         /* Reorder KSPs to be [8, 16, 32] instead of the hardware order. */
-         if (enabled[0] + enabled[1] + enabled[2] == 1) {
-            if (enabled[1]) {
-               ksp[1] = ksp[0];
-               ksp[0] = 0;
-            } else if (enabled[2]) {
-               ksp[2] = ksp[0];
-               ksp[0] = 0;
-            }
-         } else {
-            uint64_t tmp = ksp[1];
-            ksp[1] = ksp[2];
-            ksp[2] = tmp;
-         }
-
-         /* FINISHME: Broken for multi-program WM_STATE,
-          * which Mesa does not use
-          */
-         if (enabled[0]) {
-            disassemble_program(disasm, "SIMD8 fragment shader",
-                                current_instruction_buffer, ksp[0]);
-         }
-         if (enabled[1]) {
-            disassemble_program(disasm, "SIMD16 fragment shader",
-                                current_instruction_buffer, ksp[1]);
-         }
-         if (enabled[2]) {
-            disassemble_program(disasm, "SIMD32 fragment shader",
-                                current_instruction_buffer, ksp[2]);
-         }
-         printf("\n");
-      } else if (strcmp(inst->name,   "VS_STATE") == 0 ||
-                 strcmp(inst->name,   "GS_STATE") == 0 ||
-                 strcmp(inst->name,   "SF_STATE") == 0 ||
-                 strcmp(inst->name, "CLIP_STATE") == 0 ||
-                 strcmp(inst->name, "3DSTATE_DS") == 0 ||
-                 strcmp(inst->name, "3DSTATE_HS") == 0 ||
-                 strcmp(inst->name, "3DSTATE_GS") == 0 ||
-                 strcmp(inst->name, "3DSTATE_VS") == 0) {
-         struct gen_field_iterator iter;
-         gen_field_iterator_init(&iter, inst, p, 0, false);
-         uint64_t ksp = 0;
-         bool is_simd8 = false; /* vertex shaders on Gen8+ only */
-         bool is_enabled = true;
-
-         do {
-            if (strcmp(iter.name, "Kernel Start Pointer") == 0) {
-               ksp = strtol(iter.value, NULL, 16);
-            } else if (strcmp(iter.name, "SIMD8 Dispatch Enable") == 0) {
-               is_simd8 = strcmp(iter.value, "true") == 0;
-            } else if (strcmp(iter.name, "Dispatch Enable") == 0) {
-               is_simd8 = strcmp(iter.value, "SIMD8") == 0;
-            } else if (strcmp(iter.name, "Enable") == 0) {
-               is_enabled = strcmp(iter.value, "true") == 0;
-            }
-         } while (gen_field_iterator_next(&iter));
-
-         const char *type =
-            strcmp(inst->name,   "VS_STATE") == 0 ? "vertex shader" :
-            strcmp(inst->name,   "GS_STATE") == 0 ? "geometry shader" :
-            strcmp(inst->name,   "SF_STATE") == 0 ? "strips and fans shader" :
-            strcmp(inst->name, "CLIP_STATE") == 0 ? "clip shader" :
-            strcmp(inst->name, "3DSTATE_DS") == 0 ? "tessellation control shader" :
-            strcmp(inst->name, "3DSTATE_HS") == 0 ? "tessellation evaluation shader" :
-            strcmp(inst->name, "3DSTATE_VS") == 0 ? (is_simd8 ? "SIMD8 vertex shader" : "vec4 vertex shader") :
-            strcmp(inst->name, "3DSTATE_GS") == 0 ? (is_simd8 ? "SIMD8 geometry shader" : "vec4 geometry shader") :
-            NULL;
-
-         if (is_enabled) {
-            disassemble_program(disasm, type, current_instruction_buffer, ksp);
-            printf("\n");
-         }
-      } else if (strcmp(inst->name, "MEDIA_INTERFACE_DESCRIPTOR_LOAD") == 0) {
-         struct gen_field_iterator iter;
-         gen_field_iterator_init(&iter, inst, p, 0, false);
-         uint64_t interface_offset = 0;
-         do {
-            if (strcmp(iter.name, "Interface Descriptor Data Start Address") == 0) {
-               interface_offset = strtol(iter.value, NULL, 16);
-               break;
-            }
-         } while (gen_field_iterator_next(&iter));
-
-         if (current_dynamic_state_buffer && interface_offset != 0) {
-            struct gen_group *desc =
-               gen_spec_find_struct(spec, "INTERFACE_DESCRIPTOR_DATA");
-            uint32_t *desc_p =
-               ((void *)current_dynamic_state_buffer->data) + interface_offset;
-            gen_field_iterator_init(&iter, desc, desc_p, 0, false);
-            do {
-               if (strcmp(iter.name, "Kernel Start Pointer") == 0) {
-                  uint64_t ksp = strtol(iter.value, NULL, 16);
-                  disassemble_program(disasm, "compute shader",
-                                      current_instruction_buffer, ksp);
-                  printf("\n");
-                  break;
-               }
-            } while (gen_field_iterator_next(&iter));
-         }
-      }
-   }
-}
-
 static int zlib_inflate(uint32_t **ptr, int len)
 {
    struct z_stream_s zstream;
@@ -506,6 +382,34 @@ static int ascii85_decode(const char *in, uint32_t **out, bool inflate)
    return zlib_inflate(out, len);
 }
 
+static int qsort_hw_context_first(const void *a, const void *b)
+{
+   const struct section *sa = a, *sb = b;
+   if (strcmp(sa->buffer_name, "HW Context") == 0)
+      return -1;
+   if (strcmp(sb->buffer_name, "HW Context") == 0)
+      return 1;
+   else
+      return 0;
+}
+
+static struct gen_batch_decode_bo
+get_gen_batch_bo(void *user_data, bool ppgtt, uint64_t address)
+{
+   for (int s = 0; s < num_sections; s++) {
+      if (sections[s].gtt_offset <= address &&
+          address < sections[s].gtt_offset + sections[s].dword_count * 4) {
+         return (struct gen_batch_decode_bo) {
+            .addr = sections[s].gtt_offset,
+            .map = sections[s].data,
+            .size = sections[s].dword_count * 4,
+         };
+      }
+   }
+
+   return (struct gen_batch_decode_bo) { .map = NULL };
+}
+
 static void
 read_data_file(FILE *file)
 {
@@ -515,10 +419,10 @@ read_data_file(FILE *file)
    char *line = NULL;
    size_t line_size;
    uint32_t offset, value;
+   uint32_t ring_head = UINT32_MAX, ring_tail = UINT32_MAX;
+   bool ring_wraps = false;
    char *ring_name = NULL;
    struct gen_device_info devinfo;
-   struct gen_disasm *disasm = NULL;
-   int sect_num = 0;
 
    while (getline(&line, &line_size, file) > 0) {
       char *new_ring_name = NULL;
@@ -531,14 +435,15 @@ read_data_file(FILE *file)
 
       if (line[0] == ':' || line[0] == '~') {
          uint32_t *data = NULL;
-         int count = ascii85_decode(line+1, &data, line[0] == ':');
-         if (count == 0) {
+         int dword_count = ascii85_decode(line+1, &data, line[0] == ':');
+         if (dword_count == 0) {
             fprintf(stderr, "ASCII85 decode failed.\n");
             exit(EXIT_FAILURE);
          }
-         sections[sect_num].data = data;
-         sections[sect_num].count = count;
-         sect_num++;
+         assert(num_sections < MAX_SECTIONS);
+         sections[num_sections].data = data;
+         sections[num_sections].dword_count = dword_count;
+         num_sections++;
          continue;
       }
 
@@ -549,11 +454,14 @@ read_data_file(FILE *file)
             const char *name;
          } buffers[] = {
             { "ringbuffer", "ring buffer" },
+            { "ring", "ring buffer" },
             { "gtt_offset", "batch buffer" },
+            { "batch", "batch buffer" },
             { "hw context", "HW Context" },
             { "hw status", "HW status" },
             { "wa context", "WA context" },
             { "wa batchbuffer", "WA batch" },
+            { "NULL context", "Kernel context" },
             { "user", "user" },
             { "semaphores", "semaphores", },
             { "guc log buffer", "GuC log", },
@@ -571,13 +479,14 @@ read_data_file(FILE *file)
                break;
          }
 
-         sections[sect_num].buffer_name = b->name;
-         sections[sect_num].ring_name = strdup(ring_name);
+         assert(num_sections < MAX_SECTIONS);
+         sections[num_sections].buffer_name = b->name;
+         sections[num_sections].ring_name = strdup(ring_name);
 
          uint32_t hi, lo;
          dashes = strchr(dashes, '=');
          if (dashes && sscanf(dashes, "= 0x%08x %08x\n", &hi, &lo))
-            sections[sect_num].gtt_offset = ((uint64_t) hi) << 32 | lo;
+            sections[num_sections].gtt_offset = ((uint64_t) hi) << 32 | lo;
 
          continue;
       }
@@ -598,13 +507,11 @@ read_data_file(FILE *file)
                matched = sscanf(pci_id_start, "PCI ID: 0x%04x\n", &reg);
          }
          if (matched == 1) {
-            if (!gen_get_device_info(reg, &devinfo)) {
+            if (!gen_get_device_info_from_pci_id(reg, &devinfo)) {
                printf("Unable to identify devid=%x\n", reg);
                exit(EXIT_FAILURE);
             }
 
-            disasm = gen_disasm_create(reg);
-
             printf("Detected GEN%i chipset\n", devinfo.gen);
 
             if (xml_path == NULL)
@@ -625,6 +532,9 @@ read_data_file(FILE *file)
          if (matched == 1)
             print_head(reg);
 
+         sscanf(line, "  HEAD: 0x%08x [0x%08X]\n", &reg, &ring_head);
+         sscanf(line, "  TAIL: 0x%08x\n", &ring_tail);
+
          matched = sscanf(line, "  ACTHD: 0x%08x\n", &reg);
          if (matched == 1) {
             print_register(spec,
@@ -650,6 +560,18 @@ read_data_file(FILE *file)
                print_register(spec, reg_name, reg);
          }
 
+         matched = sscanf(line, "  SC_INSTDONE: 0x%08x\n", &reg);
+         if (matched == 1)
+            print_register(spec, "SC_INSTDONE", reg);
+
+         matched = sscanf(line, "  SAMPLER_INSTDONE[%*d][%*d]: 0x%08x\n", &reg);
+         if (matched == 1)
+            print_register(spec, "SAMPLER_INSTDONE", reg);
+
+         matched = sscanf(line, "  ROW_INSTDONE[%*d][%*d]: 0x%08x\n", &reg);
+         if (matched == 1)
+            print_register(spec, "ROW_INSTDONE", reg);
+
          matched = sscanf(line, "  INSTDONE1: 0x%08x\n", &reg);
          if (matched == 1)
             print_register(spec, "INSTDONE_1", reg);
@@ -680,23 +602,101 @@ read_data_file(FILE *file)
    free(line);
    free(ring_name);
 
-   for (int s = 0; s < sect_num; s++) {
+   /*
+    * Order sections so that the hardware context section is visited by the
+    * decoder before other command buffers. This will allow the decoder to see
+    * persistent state that was set before the current batch.
+    */
+   qsort(sections, num_sections, sizeof(sections[0]), qsort_hw_context_first);
+
+   for (int s = 0; s < num_sections; s++) {
+      if (strcmp(sections[s].buffer_name, "ring buffer") != 0)
+         continue;
+      if (ring_head == UINT32_MAX) {
+         ring_head = 0;
+         ring_tail = UINT32_MAX;
+      }
+      if (ring_tail == UINT32_MAX)
+         ring_tail = (ring_head - sizeof(uint32_t)) %
+            (sections[s].dword_count * sizeof(uint32_t));
+      if (ring_head > ring_tail) {
+         size_t total_size = sections[s].dword_count * sizeof(uint32_t) -
+            ring_head + ring_tail;
+         size_t size1 = total_size - ring_tail;
+         uint32_t *new_data = calloc(total_size, 1);
+         memcpy(new_data, (uint8_t *)sections[s].data + ring_head, size1);
+         memcpy((uint8_t *)new_data + size1, sections[s].data, ring_tail);
+         free(sections[s].data);
+         sections[s].data = new_data;
+         ring_head = 0;
+         ring_tail = total_size;
+         ring_wraps = true;
+      }
+      sections[s].data_offset = ring_head;
+      sections[s].dword_count = (ring_tail - ring_head) / sizeof(uint32_t);
+   }
+
+   for (int s = 0; s < num_sections; s++) {
+      if (sections[s].dword_count * 4 > intel_debug_identifier_size() &&
+          memcmp(sections[s].data, intel_debug_identifier(),
+                 intel_debug_identifier_size()) == 0) {
+         const struct gen_debug_block_driver *driver_desc =
+            intel_debug_get_identifier_block(sections[s].data,
+                                             sections[s].dword_count * 4,
+                                             GEN_DEBUG_BLOCK_TYPE_DRIVER);
+         if (driver_desc) {
+            printf("Driver identifier: %s\n",
+                   (const char *) driver_desc->description);
+         }
+         break;
+      }
+   }
+
+   enum gen_batch_decode_flags batch_flags = 0;
+   if (option_color == COLOR_ALWAYS)
+      batch_flags |= GEN_BATCH_DECODE_IN_COLOR;
+   if (option_full_decode)
+      batch_flags |= GEN_BATCH_DECODE_FULL;
+   if (option_print_offsets)
+      batch_flags |= GEN_BATCH_DECODE_OFFSETS;
+   batch_flags |= GEN_BATCH_DECODE_FLOATS;
+
+   struct gen_batch_decode_ctx batch_ctx;
+   gen_batch_decode_ctx_init(&batch_ctx, &devinfo, stdout, batch_flags,
+                             xml_path, get_gen_batch_bo, NULL, NULL);
+
+
+   for (int s = 0; s < num_sections; s++) {
+      enum drm_i915_gem_engine_class class;
+      ring_name_to_class(sections[s].ring_name, &class);
+
       printf("--- %s (%s) at 0x%08x %08x\n",
              sections[s].buffer_name, sections[s].ring_name,
              (unsigned) (sections[s].gtt_offset >> 32),
              (unsigned) sections[s].gtt_offset);
 
-      if (strcmp(sections[s].buffer_name, "batch buffer") == 0 ||
-          strcmp(sections[s].buffer_name, "ring buffer") == 0 ||
+      bool is_ring_buffer = strcmp(sections[s].buffer_name, "ring buffer") == 0;
+      if (option_print_all_bb || is_ring_buffer ||
+          strcmp(sections[s].buffer_name, "batch buffer") == 0 ||
           strcmp(sections[s].buffer_name, "HW Context") == 0) {
-         decode(spec, disasm, &sections[s]);
+         if (is_ring_buffer && ring_wraps)
+            batch_ctx.flags &= ~GEN_BATCH_DECODE_OFFSETS;
+         batch_ctx.engine = class;
+         uint8_t *data = (uint8_t *)sections[s].data + sections[s].data_offset;
+         uint64_t batch_addr = sections[s].gtt_offset + sections[s].data_offset;
+         gen_print_batch(&batch_ctx, (uint32_t *)data,
+                         sections[s].dword_count * 4, batch_addr,
+                         is_ring_buffer);
+         batch_ctx.flags = batch_flags;
       }
+   }
+
+   gen_batch_decode_ctx_finish(&batch_ctx);
 
+   for (int s = 0; s < num_sections; s++) {
       free(sections[s].ring_name);
       free(sections[s].data);
    }
-
-   gen_disasm_destroy(disasm);
 }
 
 static void
@@ -741,7 +741,8 @@ print_help(const char *progname, FILE *file)
            "                        if omitted), 'always', or 'never'\n"
            "      --no-pager      don't launch pager\n"
            "      --no-offsets    don't print instruction offsets\n"
-           "      --xml=DIR       load hardware xml description from directory DIR\n",
+           "      --xml=DIR       load hardware xml description from directory DIR\n"
+           "      --all-bb        print out all batchbuffers\n",
            progname);
 }
 
@@ -760,6 +761,7 @@ main(int argc, char *argv[])
       { "headers",    no_argument,       (int *) &option_full_decode,   false },
       { "color",      required_argument, NULL,                          'c' },
       { "xml",        required_argument, NULL,                          'x' },
+      { "all-bb",     no_argument,       (int *) &option_print_all_bb,  true },
       { NULL,         0,                 NULL,                          0 }
    };
 
@@ -830,7 +832,7 @@ main(int argc, char *argv[])
       setup_pager();
 
    if (S_ISDIR(st.st_mode)) {
-      int ret;
+      ASSERTED int ret;
       char *filename;
 
       ret = asprintf(&filename, "%s/i915_error_state", path);