X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fvc4%2Fvc4_cl_dump.c;h=a6ae0cf80d71e65e20e201837600000f3f45a60b;hb=103f21b13d839ccd011b06b5708e7b9c1b8d228e;hp=c9044b4ab81769f906f8581f33e0bbe252e40811;hpb=1b241c59e834ba4702a79530c3ea373101d55788;p=mesa.git

diff --git a/src/gallium/drivers/vc4/vc4_cl_dump.c b/src/gallium/drivers/vc4/vc4_cl_dump.c
index c9044b4ab81..a6ae0cf80d7 100644
--- a/src/gallium/drivers/vc4/vc4_cl_dump.c
+++ b/src/gallium/drivers/vc4/vc4_cl_dump.c
@@ -22,263 +22,48 @@
  */
 
 #include "util/u_math.h"
+#include "util/u_prim.h"
 #include "util/macros.h"
-#include "vc4_context.h"
+#include "vc4_cl_dump.h"
+#include "kernel/vc4_packet.h"
 
-#define dump_VC4_PACKET_LINE_WIDTH dump_float
-#define dump_VC4_PACKET_POINT_SIZE dump_float
-
-static void
-dump_float(void *cl, uint32_t offset, uint32_t hw_offset)
-{
-        void *f = cl + offset;
-
-        fprintf(stderr, "0x%08x 0x%08x:      %f (0x%08x)\n",
-                offset, hw_offset, *(float *)f, *(uint32_t *)f);
-}
-
-static void
-dump_VC4_PACKET_BRANCH_TO_SUB_LIST(void *cl, uint32_t offset, uint32_t hw_offset)
-{
-        uint32_t *addr = cl + offset;
-
-        fprintf(stderr, "0x%08x 0x%08x:      addr 0x%08x\n",
-                offset, hw_offset, *addr);
-}
-
-static void
-dump_VC4_PACKET_FLAT_SHADE_FLAGS(void *cl, uint32_t offset, uint32_t hw_offset)
-{
-        uint32_t *bits = cl + offset;
-
-        fprintf(stderr, "0x%08x 0x%08x:      bits 0x%08x\n",
-                offset, hw_offset, *bits);
-}
-
-static void
-dump_VC4_PACKET_VIEWPORT_OFFSET(void *cl, uint32_t offset, uint32_t hw_offset)
-{
-        uint16_t *o = cl + offset;
-
-        fprintf(stderr, "0x%08x 0x%08x:      %f, %f (0x%04x, 0x%04x)\n",
-                offset, hw_offset,
-                o[0] / 16.0, o[1] / 16.0,
-                o[0], o[1]);
-}
-
-static void
-dump_VC4_PACKET_CLIPPER_XY_SCALING(void *cl, uint32_t offset, uint32_t hw_offset)
-{
-        uint32_t *scale = cl + offset;
-
-        fprintf(stderr, "0x%08x 0x%08x:      %f, %f (%f, %f, 0x%08x, 0x%08x)\n",
-                offset, hw_offset,
-                uif(scale[0]) / 16.0, uif(scale[1]) / 16.0,
-                uif(scale[0]), uif(scale[1]),
-                scale[0], scale[1]);
-}
-
-static void
-dump_VC4_PACKET_CLIPPER_Z_SCALING(void *cl, uint32_t offset, uint32_t hw_offset)
-{
-        uint32_t *translate = cl + offset;
-        uint32_t *scale = cl + offset + 8;
-
-        fprintf(stderr, "0x%08x 0x%08x:      %f, %f (0x%08x, 0x%08x)\n",
-                offset, hw_offset,
-                uif(translate[0]), uif(translate[1]),
-                translate[0], translate[1]);
-
-        fprintf(stderr, "0x%08x 0x%08x:      %f, %f (0x%08x, 0x%08x)\n",
-                offset + 8, hw_offset + 8,
-                uif(scale[0]), uif(scale[1]),
-                scale[0], scale[1]);
-}
-
-static void
-dump_VC4_PACKET_TILE_RENDERING_MODE_CONFIG(void *cl, uint32_t offset, uint32_t hw_offset)
-{
-        uint32_t *render_offset = cl + offset;
-        uint16_t *shorts = cl + offset + 4;
-        uint8_t *bytes = cl + offset + 8;
-
-        fprintf(stderr, "0x%08x 0x%08x:       color offset 0x%08x\n",
-                offset, hw_offset,
-                *render_offset);
-
-        fprintf(stderr, "0x%08x 0x%08x:       width %d\n",
-                offset + 4, hw_offset + 4,
-                shorts[0]);
-
-        fprintf(stderr, "0x%08x 0x%08x:       height %d\n",
-                offset + 6, hw_offset + 6,
-                shorts[1]);
-
-        const char *format = "???";
-        switch ((bytes[0] >> 2) & 3) {
-        case 0:
-                format = "BGR565_DITHERED";
-                break;
-        case 1:
-                format = "RGBA8888";
-                break;
-        case 2:
-                format = "BGR565";
-                break;
-        }
-        if (shorts[2] & VC4_RENDER_CONFIG_TILE_BUFFER_64BIT)
-                format = "64bit";
-
-        const char *tiling = "???";
-        switch ((bytes[0] >> 6) & 3) {
-        case 0:
-                tiling = "linear";
-                break;
-        case 1:
-                tiling = "T";
-                break;
-        case 2:
-                tiling = "LT";
-                break;
-        }
-
-        fprintf(stderr, "0x%08x 0x%08x: 0x%02x %s %s %s\n",
-                offset + 8, hw_offset + 8,
-                bytes[0],
-                format, tiling,
-                (bytes[0] & VC4_RENDER_CONFIG_MS_MODE_4X) ? "ms" : "ss");
-
-        const char *earlyz = "";
-        if (bytes[1] & (1 << 3)) {
-                earlyz = "early_z disabled";
-        } else {
-                if (bytes[1] & (1 << 2))
-                        earlyz = "early_z >";
-                else
-                        earlyz = "early_z <";
-        }
-
-        fprintf(stderr, "0x%08x 0x%08x: 0x%02x %s\n",
-                offset + 9, hw_offset + 9,
-                bytes[1],
-                earlyz);
-}
-
-static void
-dump_VC4_PACKET_TILE_COORDINATES(void *cl, uint32_t offset, uint32_t hw_offset)
-{
-        uint8_t *tilecoords = cl + offset;
-
-        fprintf(stderr, "0x%08x 0x%08x:      %d, %d\n",
-                offset, hw_offset, tilecoords[0], tilecoords[1]);
-}
-
-static void
-dump_VC4_PACKET_GEM_HANDLES(void *cl, uint32_t offset, uint32_t hw_offset)
-{
-        uint32_t *handles = cl + offset;
-
-        fprintf(stderr, "0x%08x 0x%08x:      handle 0: %d, handle 1: %d\n",
-                offset, hw_offset, handles[0], handles[1]);
-}
-
-#define PACKET_DUMP(name, size) [name] = { #name, size, dump_##name }
-#define PACKET(name, size) [name] = { #name, size, NULL }
-
-static const struct packet_info {
-        const char *name;
-        uint8_t size;
-        void (*dump_func)(void *cl, uint32_t offset, uint32_t hw_offset);
-} packet_info[] = {
-        PACKET(VC4_PACKET_HALT, 1),
-        PACKET(VC4_PACKET_NOP, 1),
-
-        PACKET(VC4_PACKET_FLUSH, 1),
-        PACKET(VC4_PACKET_FLUSH_ALL, 1),
-        PACKET(VC4_PACKET_START_TILE_BINNING, 1),
-        PACKET(VC4_PACKET_INCREMENT_SEMAPHORE, 1),
-        PACKET(VC4_PACKET_WAIT_ON_SEMAPHORE, 1),
-
-        PACKET(VC4_PACKET_BRANCH, 5),
-        PACKET_DUMP(VC4_PACKET_BRANCH_TO_SUB_LIST, 5),
-
-        PACKET(VC4_PACKET_STORE_MS_TILE_BUFFER, 1),
-        PACKET(VC4_PACKET_STORE_MS_TILE_BUFFER_AND_EOF, 1),
-        PACKET(VC4_PACKET_STORE_FULL_RES_TILE_BUFFER, 5),
-        PACKET(VC4_PACKET_LOAD_FULL_RES_TILE_BUFFER, 5),
-        PACKET(VC4_PACKET_STORE_TILE_BUFFER_GENERAL, 7),
-        PACKET(VC4_PACKET_LOAD_TILE_BUFFER_GENERAL, 7),
-
-        PACKET(VC4_PACKET_GL_INDEXED_PRIMITIVE, 14),
-        PACKET(VC4_PACKET_GL_ARRAY_PRIMITIVE, 10),
-
-        PACKET(VC4_PACKET_COMPRESSED_PRIMITIVE, 48),
-        PACKET(VC4_PACKET_CLIPPED_COMPRESSED_PRIMITIVE, 49),
-
-        PACKET(VC4_PACKET_PRIMITIVE_LIST_FORMAT, 2),
-
-        PACKET(VC4_PACKET_GL_SHADER_STATE, 5),
-        PACKET(VC4_PACKET_NV_SHADER_STATE, 5),
-        PACKET(VC4_PACKET_VG_SHADER_STATE, 5),
-
-        PACKET(VC4_PACKET_CONFIGURATION_BITS, 4),
-        PACKET_DUMP(VC4_PACKET_FLAT_SHADE_FLAGS, 5),
-        PACKET_DUMP(VC4_PACKET_POINT_SIZE, 5),
-        PACKET_DUMP(VC4_PACKET_LINE_WIDTH, 5),
-        PACKET(VC4_PACKET_RHT_X_BOUNDARY, 3),
-        PACKET(VC4_PACKET_DEPTH_OFFSET, 5),
-        PACKET(VC4_PACKET_CLIP_WINDOW, 9),
-        PACKET_DUMP(VC4_PACKET_VIEWPORT_OFFSET, 5),
-        PACKET(VC4_PACKET_Z_CLIPPING, 9),
-        PACKET_DUMP(VC4_PACKET_CLIPPER_XY_SCALING, 9),
-        PACKET_DUMP(VC4_PACKET_CLIPPER_Z_SCALING, 9),
-
-        PACKET(VC4_PACKET_TILE_BINNING_MODE_CONFIG, 16),
-        PACKET_DUMP(VC4_PACKET_TILE_RENDERING_MODE_CONFIG, 11),
-        PACKET(VC4_PACKET_CLEAR_COLORS, 14),
-        PACKET_DUMP(VC4_PACKET_TILE_COORDINATES, 3),
-
-        PACKET_DUMP(VC4_PACKET_GEM_HANDLES, 9),
-};
+#include "broadcom/cle/v3d_decoder.h"
+#include "broadcom/clif/clif_dump.h"
 
 void
 vc4_dump_cl(void *cl, uint32_t size, bool is_render)
 {
+        struct v3d_device_info devinfo = {
+                /* While the driver supports V3D 2.1 and 2.6, we haven't split
+                 * off a 2.6 XML yet (there are a couple of fields different
+                 * in render target formatting)
+                 */
+                .ver = 21,
+        };
+        struct v3d_spec *spec = v3d_spec_load(&devinfo);
+
+        struct clif_dump *clif = clif_dump_init(&devinfo, stderr, true);
+
         uint32_t offset = 0, hw_offset = 0;
-        uint8_t *cmds = cl;
+        uint8_t *p = cl;
 
         while (offset < size) {
-                uint8_t header = cmds[offset];
+                struct v3d_group *inst = v3d_spec_find_instruction(spec, p);
+                uint8_t header = *p;
+                uint32_t length;
 
-                if (header > ARRAY_SIZE(packet_info) ||
-                    !packet_info[header].name) {
+                if (inst == NULL) {
                         fprintf(stderr, "0x%08x 0x%08x: Unknown packet 0x%02x (%d)!\n",
                                 offset, hw_offset, header, header);
                         return;
                 }
 
-                const struct packet_info *p = packet_info + header;
+                length = v3d_group_get_length(inst);
+
                 fprintf(stderr, "0x%08x 0x%08x: 0x%02x %s\n",
-                        offset,
-                        header != VC4_PACKET_GEM_HANDLES ? hw_offset : 0,
-                        header, p->name);
+                        offset, hw_offset, header, v3d_group_get_name(inst));
 
-                if (offset + p->size <= size &&
-                    p->dump_func) {
-                        p->dump_func(cmds, offset + 1, hw_offset + 1);
-                } else {
-                        for (uint32_t i = 1; i < p->size; i++) {
-                                if (offset + i >= size) {
-                                        fprintf(stderr, "0x%08x 0x%08x: CL overflow!\n",
-                                                offset + i, hw_offset + i);
-                                        return;
-                                }
-                                fprintf(stderr, "0x%08x 0x%08x: 0x%02x\n",
-                                        offset + i,
-                                        header != VC4_PACKET_GEM_HANDLES ? hw_offset + i : 0,
-                                        cmds[offset + i]);
-                        }
-                }
+                v3d_print_group(clif, inst, offset, p);
 
                 switch (header) {
                 case VC4_PACKET_HALT:
@@ -288,9 +73,12 @@ vc4_dump_cl(void *cl, uint32_t size, bool is_render)
                         break;
                 }
 
-                offset += p->size;
+                offset += length;
                 if (header != VC4_PACKET_GEM_HANDLES)
-                        hw_offset += p->size;
+                        hw_offset += length;
+                p += length;
         }
+
+        clif_dump_destroy(clif);
 }