OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Add an internal flag to shader_info

Browse Source 
Don't print the shader if it's marked internal, unless NIR_PRINT
has been explicitly set to 2 (or higher).

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6035>
This commit is contained in:
Jesse Natalie
2020-08-26 14:22:07 -07:00
committed by Marge Bot
parent b4a087ce1b
commit 93db59e066
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/compiler/nir/nir.h
View File

@@ -3937,11 +3937,14 @@ should_serialize_deserialize_nir(void)
} }
static inline bool static inline bool
should_print_nir(void) should_print_nir(nir_shader *shader)
{ {
static int should_print = -1; static int should_print = -1;
if (should_print < 0) if (should_print < 0)
should_print = env_var_as_boolean("NIR_PRINT", false); should_print = env_var_as_unsigned("NIR_PRINT", 0);
if (should_print == 1)
return !shader->info.internal;
return should_print; return should_print;
} }
@@ -3953,7 +3956,7 @@ static inline void nir_metadata_check_validation_flag(nir_shader *shader) { (voi
static inline bool should_skip_nir(UNUSED const char *pass_name) { return false; } static inline bool should_skip_nir(UNUSED const char *pass_name) { return false; }
static inline bool should_clone_nir(void) { return false; } static inline bool should_clone_nir(void) { return false; }
static inline bool should_serialize_deserialize_nir(void) { return false; } static inline bool should_serialize_deserialize_nir(void) { return false; }
static inline bool should_print_nir(void) { return false; } static inline bool should_print_nir(nir_shader *shader) { return false; }
#endif /* NDEBUG */ #endif /* NDEBUG */
#define _PASS(pass, nir, do_pass) do { \ #define _PASS(pass, nir, do_pass) do { \
@@ -3974,21 +3977,21 @@ static inline bool should_print_nir(void) { return false; }
#define NIR_PASS(progress, nir, pass, ...) _PASS(pass, nir, \ #define NIR_PASS(progress, nir, pass, ...) _PASS(pass, nir, \
nir_metadata_set_validation_flag(nir); \ nir_metadata_set_validation_flag(nir); \
if (should_print_nir()) \ if (should_print_nir(nir)) \
printf("%s\n", #pass); \ printf("%s\n", #pass); \
if (pass(nir, ##__VA_ARGS__)) { \ if (pass(nir, ##__VA_ARGS__)) { \
progress = true; \ progress = true; \
if (should_print_nir()) \ if (should_print_nir(nir)) \
nir_print_shader(nir, stdout); \ nir_print_shader(nir, stdout); \
nir_metadata_check_validation_flag(nir); \ nir_metadata_check_validation_flag(nir); \
} \ } \
) )
#define NIR_PASS_V(nir, pass, ...) _PASS(pass, nir, \ #define NIR_PASS_V(nir, pass, ...) _PASS(pass, nir, \
if (should_print_nir()) \ if (should_print_nir(nir)) \
printf("%s\n", #pass); \ printf("%s\n", #pass); \
pass(nir, ##__VA_ARGS__); \ pass(nir, ##__VA_ARGS__); \
if (should_print_nir()) \ if (should_print_nir(nir)) \
nir_print_shader(nir, stdout); \ nir_print_shader(nir, stdout); \
) )

3
src/compiler/shader_info.h
View File

@@ -98,6 +98,9 @@ typedef struct shader_info {
/* Descriptive name provided by the client; may be NULL */ /* Descriptive name provided by the client; may be NULL */
const char *label; const char *label;
/* Shader is internal, and should be ignored by things like NIR_PRINT */
bool internal;
/** The shader stage, such as MESA_SHADER_VERTEX. */ /** The shader stage, such as MESA_SHADER_VERTEX. */
gl_shader_stage stage:8; gl_shader_stage stage:8;