From ff94b155aba51727d8507853711d821856b5bc9c Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Mon, 24 Feb 2025 15:19:33 -0500 Subject: [PATCH] treewide: port remaining nir_metadata_preserve users apply our semantic patch manually to the remaining users. Coccinelle bailed on these files for whatever reason, I guess. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Georg Lehmann Reviewed-by: Faith Ekstrand Part-of: --- src/compiler/nir/nir_lower_cl_images.c | 8 +------- src/compiler/nir/nir_lower_shader_calls.c | 4 +--- src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp | 4 +--- src/intel/compiler/elk/elk_fs.cpp | 5 +---- 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/compiler/nir/nir_lower_cl_images.c b/src/compiler/nir/nir_lower_cl_images.c index 6dc51a62d93..40545670a25 100644 --- a/src/compiler/nir/nir_lower_cl_images.c +++ b/src/compiler/nir/nir_lower_cl_images.c @@ -291,11 +291,5 @@ nir_lower_cl_images(nir_shader *shader, bool lower_image_derefs, bool lower_samp } } - if (progress) { - nir_metadata_preserve(impl, nir_metadata_control_flow); - } else { - nir_metadata_preserve(impl, nir_metadata_all); - } - - return progress; + return nir_progress(progress, impl, nir_metadata_control_flow); } diff --git a/src/compiler/nir/nir_lower_shader_calls.c b/src/compiler/nir/nir_lower_shader_calls.c index eee2c785773..c958a4f700e 100644 --- a/src/compiler/nir/nir_lower_shader_calls.c +++ b/src/compiler/nir/nir_lower_shader_calls.c @@ -797,9 +797,7 @@ spill_ssa_defs_and_lower_shader_calls(nir_shader *shader, uint32_t num_calls, ralloc_free(mem_ctx); - nir_metadata_preserve(impl, nir_metadata_control_flow); - - return true; + return nir_progress(true, impl, nir_metadata_control_flow); } static nir_instr * diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp b/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp index 06dfa9be769..c7b8e0ba939 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp @@ -551,7 +551,5 @@ r600_append_tcs_TF_emission(nir_shader *shader, enum mesa_prim prim_type) nir_pop_if(b, nullptr); - nir_metadata_preserve(f->impl, nir_metadata_none); - - return true; + return nir_progress(true, f->impl, nir_metadata_none); } diff --git a/src/intel/compiler/elk/elk_fs.cpp b/src/intel/compiler/elk/elk_fs.cpp index 9c27c87307b..cd1619660f7 100644 --- a/src/intel/compiler/elk/elk_fs.cpp +++ b/src/intel/compiler/elk/elk_fs.cpp @@ -6532,10 +6532,7 @@ elk_nir_move_interpolation_to_top(nir_shader *nir) } } - progress = progress || impl_progress; - - nir_metadata_preserve(impl, impl_progress ? nir_metadata_control_flow - : nir_metadata_all); + progress |= nir_progress(impl_progress, impl, nir_metadata_control_flow); } return progress;