radeonsi: add an initial dump_debug_state implementation dumping shaders

This is usually called after a draw call.

Acked-by: Christian König <christian.koenig@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/src/gallium/drivers/radeonsi/Makefile.sources b/src/gallium/drivers/radeonsi/Makefile.sources
index a0b1414f4bbf565b6d7ec77c5a67e8384ed828ea..ae8fe5994b70e85495215dd4f6ae907775d714a9 100644 (file)
--- a/src/gallium/drivers/radeonsi/Makefile.sources
+++ b/src/gallium/drivers/radeonsi/Makefile.sources
@@ -4,6 +4,7 @@ C_SOURCES := \
        si_commands.c \
        si_compute.c \
        si_cp_dma.c \
+       si_debug.c \
        si_descriptors.c \
        sid.h \
        si_dma.c \

diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c
new file mode 100644 (file)
index 0000000..fa2ec03
--- /dev/null
+++ b/src/gallium/drivers/radeonsi/si_debug.c
@@ -0,0 +1,59 @@
+/*
+ * 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 "si_pipe.h"
+#include "si_shader.h"
+#include "sid.h"
+
+
+static void si_dump_shader(struct si_shader_selector *sel, const char *name,
+                          FILE *f)
+{
+       if (!sel || !sel->current)
+               return;
+
+       fprintf(f, "%s shader disassembly:\n", name);
+       si_dump_shader_key(sel->type, &sel->current->key, f);
+       fprintf(f, "%s\n\n", sel->current->binary.disasm_string);
+}
+
+static void si_dump_debug_state(struct pipe_context *ctx, FILE *f,
+                               unsigned flags)
+{
+       struct si_context *sctx = (struct si_context*)ctx;
+
+       si_dump_shader(sctx->vs_shader, "Vertex", f);
+       si_dump_shader(sctx->tcs_shader, "Tessellation control", f);
+       si_dump_shader(sctx->tes_shader, "Tessellation evaluation", f);
+       si_dump_shader(sctx->gs_shader, "Geometry", f);
+       si_dump_shader(sctx->ps_shader, "Fragment", f);
+       fprintf(f, "Done.\n");
+}
+
+void si_init_debug_functions(struct si_context *sctx)
+{
+       sctx->b.b.dump_debug_state = si_dump_debug_state;
+}

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 029b3cce488ca248c9c4c075df8e2778e2a782dd..f6d4a5a9fb83c2d06a0ade712040f7872e44f86d 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -122,6 +122,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
        si_init_blit_functions(sctx);
        si_init_compute_functions(sctx);
        si_init_cp_dma_functions(sctx);
+       si_init_debug_functions(sctx);
 
        if (sscreen->b.info.has_uvd) {
                sctx->b.b.create_video_codec = si_uvd_create_decoder;

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index 553e1f32683d44f5406881e2baa4fd11e1e58f81..3ab95385d8e294b772977de53cd3cc62757dd6ac 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -275,6 +275,9 @@ void si_copy_buffer(struct si_context *sctx,
                    bool is_framebuffer);
 void si_init_cp_dma_functions(struct si_context *sctx);
 
+/* si_debug.c */
+void si_init_debug_functions(struct si_context *sctx);
+
 /* si_dma.c */
 void si_dma_copy(struct pipe_context *ctx,
                 struct pipe_resource *dst,