etnaviv: shader-db traces

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-By: Wladimir J. van der Laan <laanwj@gmail.com>

diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler.h b/src/gallium/drivers/etnaviv/etnaviv_compiler.h
index 211ae1abdfefd54474dfb2cb5d7b8e1d6af6fc43..de3e20dc38a51967d528bc18fdefd3a8cd440c8f 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_compiler.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_compiler.h
@@ -56,6 +56,8 @@ struct etna_shader_io_file {
 
 /* shader object, for linking */
 struct etna_shader {
+   uint32_t id; /* for debug */
+
    uint processor; /* TGSI_PROCESSOR_... */
    uint32_t code_size; /* code size in uint32 words */
    uint32_t *code;

diff --git a/src/gallium/drivers/etnaviv/etnaviv_debug.h b/src/gallium/drivers/etnaviv/etnaviv_debug.h
index cfda52bb3236b2fd93cec70f8336e18e010c336e..f47dffe5900858f96dd4e36985941196ecc19b12 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_debug.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_debug.h
@@ -51,6 +51,7 @@
 #define ETNA_DBG_FLUSH_ALL       0x100000 /* Flush after every rendered primitive */
 #define ETNA_DBG_ZERO            0x200000 /* Zero all resources after allocation */
 #define ETNA_DBG_DRAW_STALL      0x400000 /* Stall FE/PE after every draw op */
+#define ETNA_DBG_SHADERDB        0x800000 /* dump program compile information */
 
 extern int etna_mesa_debug; /* set in etna_screen.c from ETNA_DEBUG */
 

diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c
index e3090dc52c2c8a51e39a6bbc67293f82b598d4fe..9324a95fcaa99f607220b67c5cd0a518553da019 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_screen.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c
@@ -62,6 +62,7 @@ static const struct debug_named_value debug_options[] = {
    {"flush_all",      ETNA_DBG_FLUSH_ALL, "Flush after every rendered primitive"},
    {"zero",           ETNA_DBG_ZERO, "Zero all resources after allocation"},
    {"draw_stall",     ETNA_DBG_DRAW_STALL, "Stall FE/PE after each rendered primitive"},
+   {"shaderdb",       ETNA_DBG_SHADERDB, "Enable shaderdb output"},
    DEBUG_NAMED_VALUE_END
 };
 

diff --git a/src/gallium/drivers/etnaviv/etnaviv_shader.c b/src/gallium/drivers/etnaviv/etnaviv_shader.c
index 88953116e6497ed3f6c9db8ea4c185d93c3275ab..87edf5b5cae04b67a15cb2f834d35ca0617c3db0 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_shader.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_shader.c
@@ -223,6 +223,42 @@ etna_shader_update_vs_inputs(struct etna_context *ctx,
    return true;
 }
 
+static inline const char *
+etna_shader_stage(struct etna_shader *shader)
+{
+   switch (shader->processor) {
+   case PIPE_SHADER_VERTEX:     return "VERT";
+   case PIPE_SHADER_FRAGMENT:   return "FRAG";
+   case PIPE_SHADER_COMPUTE:    return "CL";
+   default:
+      unreachable("invalid type");
+      return NULL;
+   }
+}
+
+static void
+dump_shader_info(struct etna_shader *shader, struct pipe_debug_callback *debug)
+{
+   if (!unlikely(etna_mesa_debug & ETNA_DBG_SHADERDB))
+      return;
+
+   pipe_debug_message(debug, SHADER_INFO, "\n"
+         "SHADER-DB: %s prog %d: %u instructions %u temps\n"
+         "SHADER-DB: %s prog %d: %u immediates %u consts\n"
+         "SHADER-DB: %s prog %d: %u loops\n",
+         etna_shader_stage(shader),
+         shader->id,
+         shader->code_size,
+         shader->num_temps,
+         etna_shader_stage(shader),
+         shader->id,
+         shader->uniforms.imm_count,
+         shader->uniforms.const_count,
+         etna_shader_stage(shader),
+         shader->id,
+         shader->num_loops);
+}
+
 bool
 etna_shader_update_vertex(struct etna_context *ctx)
 {
@@ -235,8 +271,14 @@ etna_create_shader_state(struct pipe_context *pctx,
                          const struct pipe_shader_state *pss)
 {
    struct etna_context *ctx = etna_context(pctx);
+   struct etna_shader *shader = etna_compile_shader(&ctx->specs, pss->tokens);
+
+   static uint32_t id;
+   shader->id = id++;
+
+   dump_shader_info(shader, &ctx->debug);
 
-   return etna_compile_shader(&ctx->specs, pss->tokens);
+   return shader;
 }
 
 static void