From 1e03827c77eaf5a21c6e47811c7d13e93e60c7e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 25 Jun 2025 19:03:10 -0400 Subject: [PATCH] nir: rename nir_lower_io_arrays_to_elements -> nir_lower_io_array_vars_to_elements same for *_no_indirects Acked-by: Alyssa Rosenzweig Part-of: --- src/amd/vulkan/radv_pipeline_graphics.c | 2 +- src/broadcom/vulkan/v3dv_pipeline.c | 8 ++++---- src/compiler/nir/meson.build | 2 +- src/compiler/nir/nir.h | 6 +++--- ...o_elements.c => nir_lower_io_array_vars_to_elements.c} | 8 ++++---- src/gallium/drivers/zink/zink_compiler.c | 2 +- src/gallium/frontends/lavapipe/lvp_pipeline.c | 4 ++-- src/intel/compiler/brw_nir.c | 2 +- src/intel/compiler/elk/elk_nir.c | 2 +- src/microsoft/spirv_to_dxil/dxil_spirv_nir.c | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) rename src/compiler/nir/{nir_lower_io_arrays_to_elements.c => nir_lower_io_array_vars_to_elements.c} (98%) diff --git a/src/amd/vulkan/radv_pipeline_graphics.c b/src/amd/vulkan/radv_pipeline_graphics.c index 4b8a7cd41ad..3f3791e8138 100644 --- a/src/amd/vulkan/radv_pipeline_graphics.c +++ b/src/amd/vulkan/radv_pipeline_graphics.c @@ -1192,7 +1192,7 @@ radv_link_shaders(const struct radv_device *device, struct radv_shader_stage *pr NIR_PASS(_, producer, nir_lower_array_deref_of_vec, nir_var_shader_out, NULL, array_deref_of_vec_options); NIR_PASS(_, consumer, nir_lower_array_deref_of_vec, nir_var_shader_in, NULL, array_deref_of_vec_options); - nir_lower_io_arrays_to_elements(producer, consumer); + nir_lower_io_array_vars_to_elements(producer, consumer); nir_validate_shader(producer, "after nir_lower_io_arrays_to_elements"); nir_validate_shader(consumer, "after nir_lower_io_arrays_to_elements"); diff --git a/src/broadcom/vulkan/v3dv_pipeline.c b/src/broadcom/vulkan/v3dv_pipeline.c index d977fc1f4a0..887b3e3c572 100644 --- a/src/broadcom/vulkan/v3dv_pipeline.c +++ b/src/broadcom/vulkan/v3dv_pipeline.c @@ -933,7 +933,7 @@ static void lower_fs_io(nir_shader *nir) { /* Our backend doesn't handle array fragment shader outputs */ - NIR_PASS(_, nir, nir_lower_io_arrays_to_elements_no_indirects, false); + NIR_PASS(_, nir, nir_lower_io_array_vars_to_elements_no_indirects, false); NIR_PASS(_, nir, nir_remove_dead_variables, nir_var_shader_out, NULL); nir_assign_io_var_locations(nir, nir_var_shader_in, &nir->num_inputs, @@ -949,7 +949,7 @@ lower_fs_io(nir_shader *nir) static void lower_gs_io(struct nir_shader *nir) { - NIR_PASS(_, nir, nir_lower_io_arrays_to_elements_no_indirects, false); + NIR_PASS(_, nir, nir_lower_io_array_vars_to_elements_no_indirects, false); nir_assign_io_var_locations(nir, nir_var_shader_in, &nir->num_inputs, MESA_SHADER_GEOMETRY); @@ -961,7 +961,7 @@ lower_gs_io(struct nir_shader *nir) static void lower_vs_io(struct nir_shader *nir) { - NIR_PASS(_, nir, nir_lower_io_arrays_to_elements_no_indirects, false); + NIR_PASS(_, nir, nir_lower_io_array_vars_to_elements_no_indirects, false); nir_assign_io_var_locations(nir, nir_var_shader_in, &nir->num_inputs, MESA_SHADER_VERTEX); @@ -1748,7 +1748,7 @@ link_shaders(nir_shader *producer, nir_shader *consumer) NIR_PASS(_, consumer, nir_lower_io_vars_to_scalar, nir_var_shader_in); } - nir_lower_io_arrays_to_elements(producer, consumer); + nir_lower_io_array_vars_to_elements(producer, consumer); v3d_optimize_nir(NULL, producer); v3d_optimize_nir(NULL, consumer); diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build index 51dfa8d8f88..b25e3480906 100644 --- a/src/compiler/nir/meson.build +++ b/src/compiler/nir/meson.build @@ -187,7 +187,7 @@ else 'nir_lower_interpolation.c', 'nir_lower_int_to_float.c', 'nir_lower_io.c', - 'nir_lower_io_arrays_to_elements.c', + 'nir_lower_io_array_vars_to_elements.c', 'nir_lower_io_to_temporaries.c', 'nir_lower_io_to_scalar.c', 'nir_lower_io_vars_to_scalar.c', diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index 67806e120ad..10408673ff4 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -5304,9 +5304,9 @@ bool nir_lower_int_to_float(nir_shader *shader); bool nir_lower_load_const_to_scalar(nir_shader *shader); bool nir_lower_read_invocation_to_scalar(nir_shader *shader); bool nir_lower_phis_to_scalar(nir_shader *shader, bool lower_all); -void nir_lower_io_arrays_to_elements(nir_shader *producer, nir_shader *consumer); -bool nir_lower_io_arrays_to_elements_no_indirects(nir_shader *shader, - bool outputs_only); +void nir_lower_io_array_vars_to_elements(nir_shader *producer, nir_shader *consumer); +bool nir_lower_io_array_vars_to_elements_no_indirects(nir_shader *shader, + bool outputs_only); bool nir_lower_io_to_scalar(nir_shader *shader, nir_variable_mode mask, nir_instr_filter_cb filter, void *filter_data); bool nir_lower_io_vars_to_scalar(nir_shader *shader, nir_variable_mode mask); bool nir_opt_vectorize_io_vars(nir_shader *shader, nir_variable_mode mask); diff --git a/src/compiler/nir/nir_lower_io_arrays_to_elements.c b/src/compiler/nir/nir_lower_io_array_vars_to_elements.c similarity index 98% rename from src/compiler/nir/nir_lower_io_arrays_to_elements.c rename to src/compiler/nir/nir_lower_io_array_vars_to_elements.c index 14c5c4be841..52ccda56ec2 100644 --- a/src/compiler/nir/nir_lower_io_arrays_to_elements.c +++ b/src/compiler/nir/nir_lower_io_array_vars_to_elements.c @@ -25,7 +25,7 @@ #include "nir_builder.h" #include "nir_deref.h" -/** @file nir_lower_io_arrays_to_elements.c +/** @file nir_lower_io_array_vars_to_elements.c * * Split arrays/matrices with direct indexing into individual elements. This * will allow optimisation passes to better clean up unused elements. @@ -356,8 +356,8 @@ lower_io_arrays_to_elements(nir_shader *shader, nir_variable_mode mask, } bool -nir_lower_io_arrays_to_elements_no_indirects(nir_shader *shader, - bool outputs_only) +nir_lower_io_array_vars_to_elements_no_indirects(nir_shader *shader, + bool outputs_only) { struct hash_table *split_inputs = _mesa_pointer_hash_table_create(NULL); struct hash_table *split_outputs = _mesa_pointer_hash_table_create(NULL); @@ -396,7 +396,7 @@ nir_lower_io_arrays_to_elements_no_indirects(nir_shader *shader, } void -nir_lower_io_arrays_to_elements(nir_shader *producer, nir_shader *consumer) +nir_lower_io_array_vars_to_elements(nir_shader *producer, nir_shader *consumer) { struct hash_table *split_inputs = _mesa_pointer_hash_table_create(NULL); struct hash_table *split_outputs = _mesa_pointer_hash_table_create(NULL); diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index 56a36a8b70d..46bd429712a 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -6241,7 +6241,7 @@ zink_shader_init(struct zink_screen *screen, struct zink_shader *zs) if (nir->info.stage == MESA_SHADER_TESS_CTRL || nir->info.stage == MESA_SHADER_TESS_EVAL) - NIR_PASS(_, nir, nir_lower_io_arrays_to_elements_no_indirects, false); + NIR_PASS(_, nir, nir_lower_io_array_vars_to_elements_no_indirects, false); if (nir->info.stage < MESA_SHADER_FRAGMENT) have_psiz = check_psiz(nir); diff --git a/src/gallium/frontends/lavapipe/lvp_pipeline.c b/src/gallium/frontends/lavapipe/lvp_pipeline.c index b0cd5dd50c8..110e1ff1037 100644 --- a/src/gallium/frontends/lavapipe/lvp_pipeline.c +++ b/src/gallium/frontends/lavapipe/lvp_pipeline.c @@ -424,9 +424,9 @@ lvp_shader_lower(struct lvp_device *pdevice, nir_shader *nir, struct lvp_pipelin if (nir->info.stage == MESA_SHADER_VERTEX || nir->info.stage == MESA_SHADER_GEOMETRY) { - NIR_PASS_V(nir, nir_lower_io_arrays_to_elements_no_indirects, false); + NIR_PASS_V(nir, nir_lower_io_array_vars_to_elements_no_indirects, false); } else if (nir->info.stage == MESA_SHADER_FRAGMENT) { - NIR_PASS_V(nir, nir_lower_io_arrays_to_elements_no_indirects, true); + NIR_PASS_V(nir, nir_lower_io_array_vars_to_elements_no_indirects, true); } // TODO: also optimize the tex srcs. see radeonSI for reference */ diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c index ce02dd40183..a34a8198edb 100644 --- a/src/intel/compiler/brw_nir.c +++ b/src/intel/compiler/brw_nir.c @@ -1485,7 +1485,7 @@ brw_nir_link_shaders(const struct brw_compiler *compiler, NIR_PASS(_, consumer, brw_nir_zero_inputs, &zero_inputs); } - nir_lower_io_arrays_to_elements(producer, consumer); + nir_lower_io_array_vars_to_elements(producer, consumer); nir_validate_shader(producer, "after nir_lower_io_arrays_to_elements"); nir_validate_shader(consumer, "after nir_lower_io_arrays_to_elements"); diff --git a/src/intel/compiler/elk/elk_nir.c b/src/intel/compiler/elk/elk_nir.c index a168372c21e..ef73af9d705 100644 --- a/src/intel/compiler/elk/elk_nir.c +++ b/src/intel/compiler/elk/elk_nir.c @@ -1144,7 +1144,7 @@ elk_nir_link_shaders(const struct elk_compiler *compiler, { const struct intel_device_info *devinfo = compiler->devinfo; - nir_lower_io_arrays_to_elements(producer, consumer); + nir_lower_io_array_vars_to_elements(producer, consumer); nir_validate_shader(producer, "after nir_lower_io_arrays_to_elements"); nir_validate_shader(consumer, "after nir_lower_io_arrays_to_elements"); diff --git a/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c b/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c index 5dc09528ad7..2b0cdc409c2 100644 --- a/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c +++ b/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c @@ -1025,7 +1025,7 @@ dxil_spirv_nir_passes(nir_shader *nir, NIR_PASS_V(nir, nir_lower_global_vars_to_local); NIR_PASS_V(nir, nir_split_var_copies); NIR_PASS_V(nir, nir_lower_var_copies); - NIR_PASS_V(nir, nir_lower_io_arrays_to_elements_no_indirects, false); + NIR_PASS_V(nir, nir_lower_io_array_vars_to_elements_no_indirects, false); if (conf->yz_flip.mode != DXIL_SPIRV_YZ_FLIP_NONE) {