v3d: Split walking the CLs to generate relocs from walking CLs to dump.

[mesa.git] / src / broadcom / clif / clif_dump.c

diff --git a/src/broadcom/clif/clif_dump.c b/src/broadcom/clif/clif_dump.c
index fe68b5102ebfbeab6e15d6cace38883a0a1d1f2d..caddfa30cfd837df27b9d680d8b5e5d03c1f366e 100644 (file)
--- a/src/broadcom/clif/clif_dump.c
+++ b/src/broadcom/clif/clif_dump.c
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "drm-uapi/v3d_drm.h"
 #include "clif_dump.h"
 #include "clif_private.h"
 #include "util/list.h"
@@ -51,13 +52,14 @@ clif_dump_add_address_to_worklist(struct clif_dump *clif,
 
 struct clif_dump *
 clif_dump_init(const struct v3d_device_info *devinfo,
-               FILE *out)
+               FILE *out, bool pretty)
 {
         struct clif_dump *clif = rzalloc(NULL, struct clif_dump);
 
         clif->devinfo = devinfo;
         clif->out = out;
         clif->spec = v3d_spec_load(devinfo);
+        clif->pretty = pretty;
 
         list_inithead(&clif->worklist);
 
@@ -70,20 +72,30 @@ clif_dump_destroy(struct clif_dump *clif)
         ralloc_free(clif);
 }
 
-static bool
-clif_lookup_vaddr(struct clif_dump *clif, uint32_t addr, void **vaddr)
+struct clif_bo *
+clif_lookup_bo(struct clif_dump *clif, uint32_t addr)
 {
         for (int i = 0; i < clif->bo_count; i++) {
                 struct clif_bo *bo = &clif->bo[i];
 
                 if (addr >= bo->offset &&
                     addr < bo->offset + bo->size) {
-                        *vaddr = bo->vaddr + addr - bo->offset;
-                        return true;
+                        return bo;
                 }
         }
 
-        return false;
+        return NULL;
+}
+
+static bool
+clif_lookup_vaddr(struct clif_dump *clif, uint32_t addr, void **vaddr)
+{
+        struct clif_bo *bo = clif_lookup_bo(clif, addr);
+        if (!bo)
+                return false;
+
+        *vaddr = bo->vaddr + addr - bo->offset;
+        return true;
 }
 
 #define out_uint(_clif, field) out(_clif, "    /* %s = */ %u\n",        \
@@ -91,16 +103,17 @@ clif_lookup_vaddr(struct clif_dump *clif, uint32_t addr, void **vaddr)
 
 static bool
 clif_dump_packet(struct clif_dump *clif, uint32_t offset, const uint8_t *cl,
-                 uint32_t *size)
+                 uint32_t *size, bool reloc_mode)
 {
         if (clif->devinfo->ver >= 41)
-                return v3d41_clif_dump_packet(clif, offset, cl, size);
+                return v3d41_clif_dump_packet(clif, offset, cl, size, reloc_mode);
         else
-                return v3d33_clif_dump_packet(clif, offset, cl, size);
+                return v3d33_clif_dump_packet(clif, offset, cl, size, reloc_mode);
 }
 
 static void
-clif_dump_cl(struct clif_dump *clif, uint32_t start, uint32_t end)
+clif_dump_cl(struct clif_dump *clif, uint32_t start, uint32_t end,
+             bool reloc_mode)
 {
         void *start_vaddr;
         if (!clif_lookup_vaddr(clif, start, &start_vaddr)) {
@@ -119,9 +132,12 @@ clif_dump_cl(struct clif_dump *clif, uint32_t start, uint32_t end)
                 return;
         }
 
+        if (!reloc_mode)
+                out(clif, "@format ctrllist\n");
+
         uint32_t size;
         uint8_t *cl = start_vaddr;
-        while (clif_dump_packet(clif, start, cl, &size)) {
+        while (clif_dump_packet(clif, start, cl, &size, reloc_mode)) {
                 cl += size;
                 start += size;
 
@@ -142,26 +158,22 @@ clif_dump_gl_shader_state_record(struct clif_dump *clif,
         assert(state);
         assert(attr);
 
-        out(clif, "GL Shader State Record at 0x%08x\n", reloc->addr);
-        v3d_print_group(clif, state, 0, vaddr, "");
+        out(clif, "@format shadrec_gl_main\n");
+        v3d_print_group(clif, state, 0, vaddr);
         vaddr += v3d_group_get_length(state);
 
         for (int i = 0; i < reloc->shader_state.num_attrs; i++) {
-                out(clif, "  Attribute %d\n", i);
-                v3d_print_group(clif, attr, 0, vaddr, "");
+                out(clif, "@format shadrec_gl_attr /* %d */\n", i);
+                v3d_print_group(clif, attr, 0, vaddr);
                 vaddr += v3d_group_get_length(attr);
         }
 }
 
 static void
-clif_process_worklist(struct clif_dump *clif)
+clif_process_worklist(struct clif_dump *clif, bool reloc_mode)
 {
-        while (!list_empty(&clif->worklist)) {
-                struct reloc_worklist_entry *reloc =
-                        list_first_entry(&clif->worklist,
-                                         struct reloc_worklist_entry, link);
-                list_del(&reloc->link);
-
+        list_for_each_entry_safe(struct reloc_worklist_entry, reloc,
+                                 &clif->worklist, link) {
                 void *vaddr;
                 if (!clif_lookup_vaddr(clif, reloc->addr, &vaddr)) {
                         out(clif, "Failed to look up address 0x%08x\n",
@@ -170,27 +182,67 @@ clif_process_worklist(struct clif_dump *clif)
                 }
 
                 switch (reloc->type) {
+                case reloc_cl:
+                        clif_dump_cl(clif, reloc->addr, reloc->cl.end,
+                                     reloc_mode);
+                        if (!reloc_mode)
+                                out(clif, "\n");
+                        break;
+
                 case reloc_gl_shader_state:
+                        if (reloc_mode)
+                                continue;
                         clif_dump_gl_shader_state_record(clif,
                                                          reloc,
                                                          vaddr);
                         break;
                 case reloc_generic_tile_list:
                         clif_dump_cl(clif, reloc->addr,
-                                     reloc->generic_tile_list.end);
+                                     reloc->generic_tile_list.end, reloc_mode);
                         break;
                 }
-                out(clif, "\n");
+                if (!reloc_mode)
+                        out(clif, "\n");
         }
 }
 
 void
 clif_dump_add_cl(struct clif_dump *clif, uint32_t start, uint32_t end)
 {
-        clif_dump_cl(clif, start, end);
+        struct reloc_worklist_entry *entry =
+                clif_dump_add_address_to_worklist(clif, reloc_cl, start);
+
+        entry->cl.end = end;
+}
+
+void
+clif_dump(struct clif_dump *clif, const struct drm_v3d_submit_cl *submit)
+{
+        clif_dump_add_cl(clif, submit->bcl_start, submit->bcl_end);
+        clif_dump_add_cl(clif, submit->rcl_start, submit->rcl_end);
+
+        clif_process_worklist(clif, true);
+        clif_process_worklist(clif, false);
+
+        out(clif, "@add_bin 0\n  ");
+        out_address(clif, submit->bcl_start);
+        out(clif, "\n  ");
+        out_address(clif, submit->bcl_end);
+        out(clif, "\n  ");
+        out_address(clif, submit->qma);
+        out(clif, "\n  %d\n  ", submit->qms);
+        out_address(clif, submit->qts);
         out(clif, "\n");
+        out(clif, "@wait_bin_all_cores\n");
 
-        clif_process_worklist(clif);
+        out(clif, "@add_render 0\n  ");
+        out_address(clif, submit->rcl_start);
+        out(clif, "\n  ");
+        out_address(clif, submit->rcl_end);
+        out(clif, "\n  ");
+        out_address(clif, submit->qma);
+        out(clif, "\n");
+        out(clif, "@wait_render_all_cores\n");
 }
 
 void