From d45f84694603107fb7c3baa3c58893f28faa76d0 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Fri, 30 Jun 2023 04:23:20 +0800 Subject: [PATCH] lima: Convert to use nir_foreach_function_impl when possible Signed-off-by: Yonggang Luo Reviewed-by: Erico Nunes Part-of: --- .../lima/ir/lima_nir_duplicate_consts.c | 6 ++--- .../lima/ir/lima_nir_duplicate_intrinsic.c | 12 ++++------ .../ir/lima_nir_lower_uniform_to_scalar.c | 22 +++++++++---------- .../drivers/lima/ir/lima_nir_split_loads.c | 20 ++++++++--------- src/gallium/drivers/lima/ir/pp/nir.c | 14 ++++-------- 5 files changed, 29 insertions(+), 45 deletions(-) diff --git a/src/gallium/drivers/lima/ir/lima_nir_duplicate_consts.c b/src/gallium/drivers/lima/ir/lima_nir_duplicate_consts.c index f303ad022ed..22f2828a7e3 100644 --- a/src/gallium/drivers/lima/ir/lima_nir_duplicate_consts.c +++ b/src/gallium/drivers/lima/ir/lima_nir_duplicate_consts.c @@ -117,9 +117,7 @@ lima_nir_duplicate_load_consts_impl(nir_shader *shader, nir_function_impl *impl) void lima_nir_duplicate_load_consts(nir_shader *shader) { - nir_foreach_function(function, shader) { - if (function->impl) { - lima_nir_duplicate_load_consts_impl(shader, function->impl); - } + nir_foreach_function_impl(impl, shader) { + lima_nir_duplicate_load_consts_impl(shader, impl); } } diff --git a/src/gallium/drivers/lima/ir/lima_nir_duplicate_intrinsic.c b/src/gallium/drivers/lima/ir/lima_nir_duplicate_intrinsic.c index 2d55b9f368d..72fc8efe12e 100644 --- a/src/gallium/drivers/lima/ir/lima_nir_duplicate_intrinsic.c +++ b/src/gallium/drivers/lima/ir/lima_nir_duplicate_intrinsic.c @@ -139,10 +139,8 @@ lima_nir_duplicate_intrinsic_impl(nir_shader *shader, nir_function_impl *impl, void lima_nir_duplicate_load_uniforms(nir_shader *shader) { - nir_foreach_function(function, shader) { - if (function->impl) { - lima_nir_duplicate_intrinsic_impl(shader, function->impl, nir_intrinsic_load_uniform); - } + nir_foreach_function_impl(impl, shader) { + lima_nir_duplicate_intrinsic_impl(shader, impl, nir_intrinsic_load_uniform); } } @@ -152,9 +150,7 @@ lima_nir_duplicate_load_uniforms(nir_shader *shader) void lima_nir_duplicate_load_inputs(nir_shader *shader) { - nir_foreach_function(function, shader) { - if (function->impl) { - lima_nir_duplicate_intrinsic_impl(shader, function->impl, nir_intrinsic_load_input); - } + nir_foreach_function_impl(impl, shader) { + lima_nir_duplicate_intrinsic_impl(shader, impl, nir_intrinsic_load_input); } } diff --git a/src/gallium/drivers/lima/ir/lima_nir_lower_uniform_to_scalar.c b/src/gallium/drivers/lima/ir/lima_nir_lower_uniform_to_scalar.c index fd6183d08d6..ab5662835e5 100644 --- a/src/gallium/drivers/lima/ir/lima_nir_lower_uniform_to_scalar.c +++ b/src/gallium/drivers/lima/ir/lima_nir_lower_uniform_to_scalar.c @@ -59,22 +59,20 @@ lower_load_uniform_to_scalar(nir_builder *b, nir_intrinsic_instr *intr) void lima_nir_lower_uniform_to_scalar(nir_shader *shader) { - nir_foreach_function(function, shader) { - if (function->impl) { - nir_builder b = nir_builder_create(function->impl); + nir_foreach_function_impl(impl, shader) { + nir_builder b = nir_builder_create(impl); - nir_foreach_block(block, function->impl) { - nir_foreach_instr_safe(instr, block) { - if (instr->type != nir_instr_type_intrinsic) - continue; + nir_foreach_block(block, impl) { + nir_foreach_instr_safe(instr, block) { + if (instr->type != nir_instr_type_intrinsic) + continue; - nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr); + nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr); - if (intr->intrinsic != nir_intrinsic_load_uniform) - continue; + if (intr->intrinsic != nir_intrinsic_load_uniform) + continue; - lower_load_uniform_to_scalar(&b, intr); - } + lower_load_uniform_to_scalar(&b, intr); } } } diff --git a/src/gallium/drivers/lima/ir/lima_nir_split_loads.c b/src/gallium/drivers/lima/ir/lima_nir_split_loads.c index b66546170a6..942e22b9e59 100644 --- a/src/gallium/drivers/lima/ir/lima_nir_split_loads.c +++ b/src/gallium/drivers/lima/ir/lima_nir_split_loads.c @@ -126,18 +126,16 @@ lima_nir_split_loads(nir_shader *shader) { bool progress = false; - nir_foreach_function(function, shader) { - if (function->impl) { - nir_builder b = nir_builder_create(function->impl); + nir_foreach_function_impl(impl, shader) { + nir_builder b = nir_builder_create(impl); - nir_foreach_block_reverse(block, function->impl) { - nir_foreach_instr_reverse_safe(instr, block) { - if (instr->type == nir_instr_type_load_const) { - replace_load_const(&b, nir_instr_as_load_const(instr)); - progress = true; - } else if (instr->type == nir_instr_type_intrinsic) { - progress |= replace_intrinsic(&b, nir_instr_as_intrinsic(instr)); - } + nir_foreach_block_reverse(block, impl) { + nir_foreach_instr_reverse_safe(instr, block) { + if (instr->type == nir_instr_type_load_const) { + replace_load_const(&b, nir_instr_as_load_const(instr)); + progress = true; + } else if (instr->type == nir_instr_type_intrinsic) { + progress |= replace_intrinsic(&b, nir_instr_as_intrinsic(instr)); } } } diff --git a/src/gallium/drivers/lima/ir/pp/nir.c b/src/gallium/drivers/lima/ir/pp/nir.c index 070dfb80caf..b878a9ce14b 100644 --- a/src/gallium/drivers/lima/ir/pp/nir.c +++ b/src/gallium/drivers/lima/ir/pp/nir.c @@ -919,11 +919,8 @@ bool ppir_compile_nir(struct lima_fs_compiled_shader *prog, struct nir_shader *n comp->dual_source_blend = nir->info.fs.color_is_dual_source; /* 1st pass: create ppir blocks */ - nir_foreach_function(function, nir) { - if (!function->impl) - continue; - - nir_foreach_block(nblock, function->impl) { + nir_foreach_function_impl(impl, nir) { + nir_foreach_block(nblock, impl) { ppir_block *block = ppir_block_create(comp); if (!block) return false; @@ -933,11 +930,8 @@ bool ppir_compile_nir(struct lima_fs_compiled_shader *prog, struct nir_shader *n } /* 2nd pass: populate successors */ - nir_foreach_function(function, nir) { - if (!function->impl) - continue; - - nir_foreach_block(nblock, function->impl) { + nir_foreach_function_impl(impl, nir) { + nir_foreach_block(nblock, impl) { ppir_block *block = ppir_get_block(comp, nblock); assert(block);