From 0a04200ba7a88446e9f100cb95377884ee7c0d1c Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Fri, 31 Jan 2025 16:21:10 +0000 Subject: [PATCH] nir/linking_helpers: invalidate metadata in nir_link_opt_varyings nir_instr_insert and nir_def_init invalidate nir_metadata_instr_index and nir_metadata_live_defs, but not nir_metadata_loop_analysis Signed-off-by: Rhys Perry Reviewed-by: Georg Lehmann Part-of: --- src/compiler/nir/nir_linking_helpers.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/compiler/nir/nir_linking_helpers.c b/src/compiler/nir/nir_linking_helpers.c index 8874540b73b..9ed249e94d9 100644 --- a/src/compiler/nir/nir_linking_helpers.c +++ b/src/compiler/nir/nir_linking_helpers.c @@ -1074,6 +1074,9 @@ replace_varying_input_by_constant_load(nir_shader *shader, } } + if (progress) + nir_metadata_preserve(impl, nir_metadata_control_flow); + return progress; } @@ -1120,6 +1123,9 @@ replace_duplicate_input(nir_shader *shader, nir_variable *input_var, } } + if (progress) + nir_metadata_preserve(impl, nir_metadata_control_flow); + return progress; } @@ -1285,6 +1291,9 @@ replace_varying_input_by_uniform_load(nir_shader *shader, } } + if (progress) + nir_metadata_preserve(impl, nir_metadata_control_flow); + return progress; }