Module: Mesa Branch: master Commit: 4a8ad1e08f97503048f5bb043ff5dcf8724492c8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4a8ad1e08f97503048f5bb043ff5dcf8724492c8
Author: Icecream95 <[email protected]> Date: Fri Jul 17 22:34:04 2020 +1200 pan/mdg: Don't disassemble blit shaders There are a lot of them and they are mostly uninteresting, so don't disassemble them or print shader-db results. Reviewed-by: Alyssa Rosenzweig <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5948> --- src/gallium/drivers/panfrost/pan_assemble.c | 2 +- src/gallium/drivers/panfrost/pan_blend_shaders.c | 2 +- src/panfrost/encoder/pan_blit.c | 2 +- src/panfrost/midgard/midgard_compile.c | 8 ++++---- src/panfrost/midgard/midgard_compile.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_assemble.c b/src/gallium/drivers/panfrost/pan_assemble.c index 06ee980ff3b..64e67ae463d 100644 --- a/src/gallium/drivers/panfrost/pan_assemble.c +++ b/src/gallium/drivers/panfrost/pan_assemble.c @@ -171,7 +171,7 @@ panfrost_shader_compile(struct panfrost_context *ctx, bifrost_compile_shader_nir(s, &program, dev->gpu_id); } else { midgard_compile_shader_nir(s, &program, false, 0, dev->gpu_id, - dev->debug & PAN_DBG_PRECOMPILE); + dev->debug & PAN_DBG_PRECOMPILE, false); } /* Prepare the compiled binary for upload */ diff --git a/src/gallium/drivers/panfrost/pan_blend_shaders.c b/src/gallium/drivers/panfrost/pan_blend_shaders.c index 74aac4ebb38..f9be2d890ad 100644 --- a/src/gallium/drivers/panfrost/pan_blend_shaders.c +++ b/src/gallium/drivers/panfrost/pan_blend_shaders.c @@ -217,7 +217,7 @@ panfrost_compile_blend_shader( .rt_formats = {format} }; - midgard_compile_shader_nir(shader, &program, true, rt, dev->gpu_id, false); + midgard_compile_shader_nir(shader, &program, true, rt, dev->gpu_id, false, false); /* Allow us to patch later */ res.patch_index = program.blend_patch_offset; diff --git a/src/panfrost/encoder/pan_blit.c b/src/panfrost/encoder/pan_blit.c index dcb9f8dd194..ece664bb5b9 100644 --- a/src/panfrost/encoder/pan_blit.c +++ b/src/panfrost/encoder/pan_blit.c @@ -100,7 +100,7 @@ panfrost_build_blit_shader(panfrost_program *program, unsigned gpu_id, gl_frag_r else nir_store_var(b, c_out, nir_channel(b, &tex->dest.ssa, 0), 0xFF); - midgard_compile_shader_nir(shader, program, false, 0, gpu_id, false); + midgard_compile_shader_nir(shader, program, false, 0, gpu_id, false, true); } /* Compile and upload all possible blit shaders ahead-of-time to reduce draw diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c index fa9ff9eb07f..085edc5d0d4 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -2847,7 +2847,7 @@ mir_add_writeout_loops(compiler_context *ctx) } int -midgard_compile_shader_nir(nir_shader *nir, panfrost_program *program, bool is_blend, unsigned blend_rt, unsigned gpu_id, bool shaderdb) +midgard_compile_shader_nir(nir_shader *nir, panfrost_program *program, bool is_blend, unsigned blend_rt, unsigned gpu_id, bool shaderdb, bool silent) { struct util_dynarray *compiled = &program->compiled; @@ -2909,7 +2909,7 @@ midgard_compile_shader_nir(nir_shader *nir, panfrost_program *program, bool is_b NIR_PASS_V(nir, midgard_nir_reorder_writeout); - if (midgard_debug & MIDGARD_DBG_SHADERS) { + if ((midgard_debug & MIDGARD_DBG_SHADERS) && !silent) { nir_print_shader(nir, stdout); } @@ -3161,10 +3161,10 @@ midgard_compile_shader_nir(nir_shader *nir, panfrost_program *program, bool is_b program->blend_patch_offset = ctx->blend_constant_offset; program->tls_size = ctx->tls_size; - if (midgard_debug & MIDGARD_DBG_SHADERS) + if ((midgard_debug & MIDGARD_DBG_SHADERS) && !silent) disassemble_midgard(stdout, program->compiled.data, program->compiled.size, gpu_id, ctx->stage); - if (midgard_debug & MIDGARD_DBG_SHADERDB || shaderdb) { + if ((midgard_debug & MIDGARD_DBG_SHADERDB || shaderdb) && !silent) { unsigned nr_bundles = 0, nr_ins = 0; /* Count instructions and bundles */ diff --git a/src/panfrost/midgard/midgard_compile.h b/src/panfrost/midgard/midgard_compile.h index bf98342c4f6..c47c6c92c90 100644 --- a/src/panfrost/midgard/midgard_compile.h +++ b/src/panfrost/midgard/midgard_compile.h @@ -30,7 +30,7 @@ #include "panfrost/util/pan_ir.h" int -midgard_compile_shader_nir(nir_shader *nir, panfrost_program *program, bool is_blend, unsigned blend_rt, unsigned gpu_id, bool shaderdb); +midgard_compile_shader_nir(nir_shader *nir, panfrost_program *program, bool is_blend, unsigned blend_rt, unsigned gpu_id, bool shaderdb, bool silent); /* NIR options are shared between the standalone compiler and the online * compiler. Defining it here is the simplest, though maybe not the Right _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
