From d07a49fb1840bb441e600ce942cb0088e7ea15c7 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Fri, 16 Mar 2018 16:44:22 -0700 Subject: [PATCH] i965: Add INTEL_DEBUG stages support for disk shader cache Signed-off-by: Jordan Justen Reviewed-by: Matt Turner --- src/mesa/drivers/dri/i965/brw_disk_cache.c | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/mesa/drivers/dri/i965/brw_disk_cache.c b/src/mesa/drivers/dri/i965/brw_disk_cache.c index 41f742e858f..0671dd20f85 100644 --- a/src/mesa/drivers/dri/i965/brw_disk_cache.c +++ b/src/mesa/drivers/dri/i965/brw_disk_cache.c @@ -31,6 +31,9 @@ #include "util/macros.h" #include "util/mesa-sha1.h" +#include "compiler/brw_eu.h" +#include "common/gen_debug.h" + #include "brw_context.h" #include "brw_program.h" #include "brw_cs.h" @@ -39,6 +42,16 @@ #include "brw_vs.h" #include "brw_wm.h" +static bool +debug_enabled_for_stage(gl_shader_stage stage) +{ + static const uint64_t stage_debug_flags[] = { + DEBUG_VS, DEBUG_TCS, DEBUG_TES, DEBUG_GS, DEBUG_WM, DEBUG_CS, + }; + assert((int)stage >= 0 && stage < ARRAY_SIZE(stage_debug_flags)); + return (INTEL_DEBUG & stage_debug_flags[stage]) != 0; +} + static void gen_shader_sha1(struct brw_context *brw, struct gl_program *prog, gl_shader_stage stage, void *key, unsigned char *out_sha1) @@ -230,6 +243,19 @@ read_and_upload(struct brw_context *brw, struct disk_cache *cache, brw_alloc_stage_scratch(brw, stage_state, prog_data->total_scratch); + if (unlikely(debug_enabled_for_stage(stage))) { + fprintf(stderr, "NIR for %s program %d loaded from disk shader cache:\n", + _mesa_shader_stage_to_abbrev(stage), brw_program(prog)->id); + brw_program_deserialize_nir(&brw->ctx, prog, stage); + nir_shader *nir = prog->nir; + nir_print_shader(nir, stderr); + fprintf(stderr, "Native code for %s %s shader %s from disk cache:\n", + nir->info.label ? nir->info.label : "unnamed", + _mesa_shader_stage_to_string(nir->info.stage), nir->info.name); + brw_disassemble(&brw->screen->devinfo, program, 0, + prog_data->program_size, stderr); + } + brw_upload_cache(&brw->cache, cache_id, &prog_key, brw_prog_key_size(stage), program, prog_data->program_size, prog_data, brw_prog_data_size(stage), &stage_state->prog_offset, -- 2.30.2