Module: Mesa Branch: main Commit: 19c5739b7449667b0091153dfd5ce84b518f55ab URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=19c5739b7449667b0091153dfd5ce84b518f55ab
Author: Caio Oliveira <[email protected]> Date: Tue Nov 8 10:40:00 2022 -0800 spirv: Add MESA_SPIRV_DEBUG environment variable processing This is similar to what NIR_DEBUG uses. Reviewed-by: Ian Romanick <[email protected]> Reviewed-by: Marcin Ślusarz <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19603> --- src/compiler/spirv/spirv_to_nir.c | 22 ++++++++++++++++++++++ src/compiler/spirv/vtn_private.h | 8 ++++++++ 2 files changed, 30 insertions(+) diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index d8e071d10ca..bb964552908 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -35,10 +35,19 @@ #include "util/format/u_format.h" #include "util/u_math.h" #include "util/u_string.h" +#include "util/u_debug.h" #include <stdio.h> #ifndef NDEBUG +uint32_t mesa_spirv_debug = 0; + +static const struct debug_named_value mesa_spirv_debug_control[] = { + DEBUG_NAMED_VALUE_END, +}; + +DEBUG_GET_ONCE_FLAGS_OPTION(mesa_spirv_debug, "MESA_SPIRV_DEBUG", mesa_spirv_debug_control, 0) + static enum nir_spirv_debug_level vtn_default_log_level(void) { @@ -6497,6 +6506,14 @@ can_remove(nir_variable *var, void *data) return !_mesa_set_search(vars_used_indirectly, var); } +#ifndef NDEBUG +static void +initialize_mesa_spirv_debug(void) +{ + mesa_spirv_debug = debug_get_option_mesa_spirv_debug(); +} +#endif + nir_shader * spirv_to_nir(const uint32_t *words, size_t word_count, struct nir_spirv_specialization *spec, unsigned num_spec, @@ -6505,6 +6522,11 @@ spirv_to_nir(const uint32_t *words, size_t word_count, const nir_shader_compiler_options *nir_options) { +#ifndef NDEBUG + static once_flag initialized_debug_flag = ONCE_FLAG_INIT; + call_once(&initialized_debug_flag, initialize_mesa_spirv_debug); +#endif + const uint32_t *word_end = words + word_count; struct vtn_builder *b = vtn_create_builder(words, word_count, diff --git a/src/compiler/spirv/vtn_private.h b/src/compiler/spirv/vtn_private.h index 1dedfb5330f..fb4cd12cd5d 100644 --- a/src/compiler/spirv/vtn_private.h +++ b/src/compiler/spirv/vtn_private.h @@ -37,6 +37,14 @@ #include "spirv.h" #include "vtn_generator_ids.h" +extern uint32_t mesa_spirv_debug; + +#ifndef NDEBUG +#define MESA_SPIRV_DEBUG(flag) unlikely(mesa_spirv_debug & (MESA_SPIRV_DEBUG_ ## flag)) +#else +#define MESA_SPIRV_DEBUG(flag) false +#endif + struct vtn_builder; struct vtn_decoration;
