summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2014-05-22 16:30:07 -0700
committerMatt Turner <[email protected]>2014-06-01 13:18:52 -0700
commitbfcf6a665b2cd782f024f384c053d7bc3033ceec (patch)
tree7525e5ea66134c27651435e7378f0b1d8e3bae50 /src/mesa
parent55bd8b8b660f983b486e699ca74fe5652297331d (diff)
i965: Skip IR annotations with INTEL_DEBUG=noann.
Running shader-db with INTEL_DEBUG=noann reduces the runtime from ~90 to ~80 seconds on my machine. It also reduces the disk space consumed by the .out files from 660 MB (676 on disk) to 343 MB (358 on disk). Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/brw_shader.cpp6
-rw-r--r--src/mesa/drivers/dri/i965/intel_debug.c1
-rw-r--r--src/mesa/drivers/dri/i965/intel_debug.h1
3 files changed, 6 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp
index 69eab598ba2..12765038ebf 100644
--- a/src/mesa/drivers/dri/i965/brw_shader.cpp
+++ b/src/mesa/drivers/dri/i965/brw_shader.cpp
@@ -794,8 +794,10 @@ void annotate(struct brw_context *brw,
struct annotation *ann = &annotation->ann[annotation->ann_count++];
ann->offset = offset;
- ann->ir = inst->ir;
- ann->annotation = inst->annotation;
+ if ((INTEL_DEBUG & DEBUG_NO_ANNOTATION) == 0) {
+ ann->ir = inst->ir;
+ ann->annotation = inst->annotation;
+ }
if (cfg->blocks[annotation->cur_block]->start == inst) {
ann->block_start = cfg->blocks[annotation->cur_block];
diff --git a/src/mesa/drivers/dri/i965/intel_debug.c b/src/mesa/drivers/dri/i965/intel_debug.c
index bba873bd3d7..c72fce2581a 100644
--- a/src/mesa/drivers/dri/i965/intel_debug.c
+++ b/src/mesa/drivers/dri/i965/intel_debug.c
@@ -65,6 +65,7 @@ static const struct dri_debug_control debug_control[] = {
{ "blorp", DEBUG_BLORP },
{ "nodualobj", DEBUG_NO_DUAL_OBJECT_GS },
{ "optimizer", DEBUG_OPTIMIZER },
+ { "noann", DEBUG_NO_ANNOTATION },
{ NULL, 0 }
};
diff --git a/src/mesa/drivers/dri/i965/intel_debug.h b/src/mesa/drivers/dri/i965/intel_debug.h
index f2570548ff8..37dc34a2611 100644
--- a/src/mesa/drivers/dri/i965/intel_debug.h
+++ b/src/mesa/drivers/dri/i965/intel_debug.h
@@ -61,6 +61,7 @@ extern uint64_t INTEL_DEBUG;
#define DEBUG_VUE 0x40000000
#define DEBUG_NO_DUAL_OBJECT_GS 0x80000000
#define DEBUG_OPTIMIZER 0x100000000
+#define DEBUG_NO_ANNOTATION 0x200000000
#ifdef HAVE_ANDROID_PLATFORM
#define LOG_TAG "INTEL-MESA"