Mesa (master): i965: Skip IR annotations with INTEL_DEBUG=noann.
Matt Turner
mattst88 at kemper.freedesktop.org
Sun Jun 1 20:16:29 UTC 2014
Module: Mesa
Branch: master
Commit: bfcf6a665b2cd782f024f384c053d7bc3033ceec
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bfcf6a665b2cd782f024f384c053d7bc3033ceec
Author: Matt Turner <mattst88 at gmail.com>
Date: Thu May 22 16:30:07 2014 -0700
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 <kenneth at whitecape.org>
---
src/mesa/drivers/dri/i965/brw_shader.cpp | 6 ++++--
src/mesa/drivers/dri/i965/intel_debug.c | 1 +
src/mesa/drivers/dri/i965/intel_debug.h | 1 +
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 69eab59..1276503 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 bba873b..c72fce2 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 f257054..37dc34a 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"
More information about the mesa-commit
mailing list