freedreno: Include binning shaders in shader-db.
We want to see if we've improved our binning VS output, as well as the
render VS.
Reviewed-by: Rob Clark <robdclark@gmail.com>
diff --git a/src/freedreno/ir3/ir3_shader.c b/src/freedreno/ir3/ir3_shader.c
index 952ac9e..610ae65 100644
--- a/src/freedreno/ir3/ir3_shader.c
+++ b/src/freedreno/ir3/ir3_shader.c
@@ -243,8 +243,10 @@
shader_variant(shader, key, created);
if (v && binning_pass) {
- if (!v->binning)
+ if (!v->binning) {
v->binning = create_variant(shader, key, true);
+ *created = true;
+ }
return v->binning;
}
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_gallium.c b/src/gallium/drivers/freedreno/ir3/ir3_gallium.c
index 9fd8489..4a7d3e8 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_gallium.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_gallium.c
@@ -44,15 +44,17 @@
#include "ir3/ir3_nir.h"
static void
-dump_shader_info(struct ir3_shader_variant *v, struct pipe_debug_callback *debug)
+dump_shader_info(struct ir3_shader_variant *v, bool binning_pass,
+ struct pipe_debug_callback *debug)
{
if (!unlikely(fd_mesa_debug & FD_DBG_SHADERDB))
return;
pipe_debug_message(debug, SHADER_INFO,
- "%s shader: %u inst, %u dwords, "
+ "%s%s shader: %u inst, %u dwords, "
"%u half, %u full, %u const, %u constlen, "
"%u (ss), %u (sy), %d max_sun, %d loops\n",
+ binning_pass ? "B" : "",
ir3_shader_stage(v->shader),
v->info.instrs_count,
v->info.sizedwords,
@@ -80,7 +82,7 @@
v = ir3_shader_get_variant(shader, &key, binning_pass, &created);
if (created) {
- dump_shader_info(v, debug);
+ dump_shader_info(v, binning_pass, debug);
}
return v;
@@ -137,6 +139,9 @@
static struct ir3_shader_key key;
memset(&key, 0, sizeof(key));
ir3_shader_variant(shader, key, false, debug);
+
+ if (nir->info.stage != MESA_SHADER_FRAGMENT)
+ ir3_shader_variant(shader, key, true, debug);
}
return shader;
}