intel: Rename INTEL_DEBUG=fall to INTEL_DEBUG=perf.

I want to introduce some more debug output for performance surprises that
includes fallbacks, but aren't necessarily software rasterization.  Leave
INTEL_DEBUG=fall in place for those that have used that flag before.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt 2012-07-12 12:35:19 -07:00
parent bf6c1b7470
commit 79198063b8
7 changed files with 11 additions and 10 deletions

View File

@ -442,7 +442,7 @@ i915_emit_param4fv(struct i915_fragment_program * p, const GLfloat * values)
void
i915_program_error(struct i915_fragment_program *p, const char *fmt, ...)
{
if (unlikely((INTEL_DEBUG & (DEBUG_WM | DEBUG_FALLBACKS)) != 0)) {
if (unlikely((INTEL_DEBUG & (DEBUG_WM | DEBUG_PERF)) != 0)) {
va_list args;
fprintf(stderr, "i915_program_error: ");

View File

@ -1223,7 +1223,7 @@ intelFallback(struct intel_context *intel, GLbitfield bit, bool mode)
assert(!intel->tnl_pipeline_running);
intel_flush(ctx);
if (INTEL_DEBUG & DEBUG_FALLBACKS)
if (INTEL_DEBUG & DEBUG_PERF)
fprintf(stderr, "ENTER FALLBACK %x: %s\n",
bit, getFallbackString(bit));
_swsetup_Wakeup(ctx);
@ -1236,7 +1236,7 @@ intelFallback(struct intel_context *intel, GLbitfield bit, bool mode)
assert(!intel->tnl_pipeline_running);
_swrast_flush(ctx);
if (INTEL_DEBUG & DEBUG_FALLBACKS)
if (INTEL_DEBUG & DEBUG_PERF)
fprintf(stderr, "LEAVE FALLBACK %s\n", getFallbackString(bit));
tnl->Driver.Render.Start = intelRenderStart;
tnl->Driver.Render.PrimitiveNotify = intelRenderPrimitive;

View File

@ -37,7 +37,7 @@
#include "tnl/tnl.h"
#include "brw_context.h"
#define FILE_DEBUG_FLAG DEBUG_FALLBACKS
#define FILE_DEBUG_FLAG DEBUG_PERF
static bool do_check_fallback(struct brw_context *brw)
{

View File

@ -190,7 +190,7 @@ static void recalculate_urb_fence( struct brw_context *brw )
exit(1);
}
if (unlikely(INTEL_DEBUG & (DEBUG_URB|DEBUG_FALLBACKS)))
if (unlikely(INTEL_DEBUG & (DEBUG_URB|DEBUG_PERF)))
printf("URB CONSTRAINED\n");
}

View File

@ -427,7 +427,8 @@ static const struct dri_debug_control debug_control[] = {
{ "ioctl", DEBUG_IOCTL},
{ "blit", DEBUG_BLIT},
{ "mip", DEBUG_MIPTREE},
{ "fall", DEBUG_FALLBACKS},
{ "fall", DEBUG_PERF},
{ "perf", DEBUG_PERF},
{ "verb", DEBUG_VERBOSE},
{ "bat", DEBUG_BATCH},
{ "pix", DEBUG_PIXEL},

View File

@ -431,7 +431,7 @@ extern int INTEL_DEBUG;
#define DEBUG_IOCTL 0x4
#define DEBUG_BLIT 0x8
#define DEBUG_MIPTREE 0x10
#define DEBUG_FALLBACKS 0x20
#define DEBUG_PERF 0x20
#define DEBUG_VERBOSE 0x40
#define DEBUG_BATCH 0x80
#define DEBUG_PIXEL 0x100
@ -460,7 +460,7 @@ extern int INTEL_DEBUG;
} while(0)
#define fallback_debug(...) do { \
if (unlikely(INTEL_DEBUG & DEBUG_FALLBACKS)) \
if (unlikely(INTEL_DEBUG & DEBUG_PERF)) \
printf(__VA_ARGS__); \
} while(0)

View File

@ -61,7 +61,7 @@ intel_copy_texsubimage(struct intel_context *intel,
intel_prepare_render(intel);
if (!intelImage->mt || !irb || !irb->mt) {
if (unlikely(INTEL_DEBUG & DEBUG_FALLBACKS))
if (unlikely(INTEL_DEBUG & DEBUG_PERF))
fprintf(stderr, "%s fail %p %p (0x%08x)\n",
__FUNCTION__, intelImage->mt, irb, internalFormat);
return false;
@ -85,7 +85,7 @@ intel_copy_texsubimage(struct intel_context *intel,
}
if (!copy_supported && !copy_supported_with_alpha_override) {
if (unlikely(INTEL_DEBUG & DEBUG_FALLBACKS))
if (unlikely(INTEL_DEBUG & DEBUG_PERF))
fprintf(stderr, "%s mismatched formats %s, %s\n",
__FUNCTION__,
_mesa_get_format_name(intelImage->base.Base.TexFormat),