diff --git a/src/gallium/drivers/lima/ir/lima_ir.h b/src/gallium/drivers/lima/ir/lima_ir.h index e8209b8e5af..7437a967860 100644 --- a/src/gallium/drivers/lima/ir/lima_ir.h +++ b/src/gallium/drivers/lima/ir/lima_ir.h @@ -73,7 +73,7 @@ bool lima_nir_split_loads(nir_shader *shader); void lima_nir_duplicate_load_consts(nir_shader *shader); void lima_nir_duplicate_load_inputs(nir_shader *shader); void lima_nir_duplicate_load_uniforms(nir_shader *shader); -void lima_nir_duplicate_modifiers(nir_shader *shader); +bool lima_nir_duplicate_modifiers(nir_shader *shader); bool lima_nir_lower_txp(nir_shader *shader); diff --git a/src/gallium/drivers/lima/ir/lima_nir_duplicate.c b/src/gallium/drivers/lima/ir/lima_nir_duplicate.c new file mode 100644 index 00000000000..efa73bd6061 --- /dev/null +++ b/src/gallium/drivers/lima/ir/lima_nir_duplicate.c @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2025 Lima Project + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include "nir.h" +#include "nir_builder.h" +#include "lima_ir.h" + +static bool +duplicate_def_at_use(nir_builder *b, nir_def *def) +{ + nir_def *last_dupl = NULL; + nir_instr *last_parent_instr = NULL; + + nir_foreach_use_including_if_safe(use_src, def) { + nir_def *dupl; + + if (!nir_src_is_if(use_src) && + last_parent_instr == nir_src_parent_instr(use_src)) { + dupl = last_dupl; + } else { + /* if ssa use, clone for the target block + * if 'if use', clone where it is + */ + if (nir_src_is_if(use_src)) { + b->cursor = nir_before_instr(def->parent_instr); + } else { + b->cursor = nir_before_instr(nir_src_parent_instr(use_src)); + last_parent_instr = nir_src_parent_instr(use_src); + } + + dupl = nir_instr_def(nir_instr_clone(b->shader, def->parent_instr)); + dupl->parent_instr->pass_flags = 1; + + nir_builder_instr_insert(b, dupl->parent_instr); + } + + nir_src_rewrite(use_src, dupl); + last_dupl = dupl; + } + + nir_instr_remove(def->parent_instr); + return true; +} + +static bool +duplicate_modifier_alu(nir_builder *b, nir_alu_instr *alu, void *unused) +{ + + if (alu->op != nir_op_fneg && alu->op != nir_op_fabs) + return false; + + if (alu->instr.pass_flags) + return false; + + nir_intrinsic_instr *itr = nir_src_as_intrinsic(alu->src[0].src); + if (!itr) + return false; + + if (itr->intrinsic != nir_intrinsic_load_input && + itr->intrinsic != nir_intrinsic_load_uniform) + return false; + + return duplicate_def_at_use(b, &alu->def); +} + +/* Duplicate load inputs for every user. + * Helps by utilizing the load input instruction slots that would + * otherwise stay empty, and reduces register pressure. */ +bool +lima_nir_duplicate_modifiers(nir_shader *shader) +{ + nir_shader_clear_pass_flags(shader); + + return nir_shader_alu_pass(shader, duplicate_modifier_alu, + nir_metadata_control_flow, NULL); +} diff --git a/src/gallium/drivers/lima/ir/lima_nir_duplicate_modifiers.c b/src/gallium/drivers/lima/ir/lima_nir_duplicate_modifiers.c deleted file mode 100644 index 6c427007b39..00000000000 --- a/src/gallium/drivers/lima/ir/lima_nir_duplicate_modifiers.c +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright (c) 2025 Lima Project - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - */ - -#include "nir.h" -#include "nir_builder.h" -#include "lima_ir.h" - -static bool -lima_nir_duplicate_modifier(nir_builder *b, nir_alu_instr *alu, - nir_op op) -{ - nir_alu_instr *last_dupl = NULL; - nir_instr *last_parent_instr = NULL; - - nir_foreach_use_safe(use_src, &alu->def) { - nir_alu_instr *dupl; - - if (last_parent_instr != nir_src_parent_instr(use_src)) { - /* if ssa use, clone for the target block */ - b->cursor = nir_before_instr(nir_src_parent_instr(use_src)); - dupl = nir_alu_instr_clone(b->shader, alu); - dupl->instr.pass_flags = 1; - nir_builder_instr_insert(b, &dupl->instr); - } - else { - dupl = last_dupl; - } - - nir_src_rewrite(use_src, &dupl->def); - last_parent_instr = nir_src_parent_instr(use_src); - last_dupl = dupl; - } - - last_dupl = NULL; - nir_if *last_parent_if = NULL; - - nir_foreach_if_use_safe(use_src, &alu->def) { - nir_alu_instr *dupl; - nir_if *nif = nir_src_parent_if(use_src); - - if (last_parent_if != nif) { - /* if 'if use', clone where it is */ - b->cursor = nir_before_instr(&alu->instr); - dupl = nir_alu_instr_clone(b->shader, alu); - dupl->instr.pass_flags = 1; - nir_builder_instr_insert(b, &dupl->instr); - } - else { - dupl = last_dupl; - } - - nir_src_rewrite(&nir_src_parent_if(use_src)->condition, &dupl->def); - last_parent_if = nif; - last_dupl = dupl; - } - - nir_instr_remove(&alu->instr); - return true; -} - -static void -lima_nir_duplicate_modifier_impl(nir_shader *shader, nir_function_impl *impl, - nir_op op) -{ - nir_builder builder = nir_builder_create(impl); - - nir_foreach_block(block, impl) { - nir_foreach_instr(instr, block) { - instr->pass_flags = 0; - } - - nir_foreach_instr_safe(instr, block) { - if (instr->type != nir_instr_type_alu) - continue; - - nir_alu_instr *alu = nir_instr_as_alu(instr); - - if (alu->op != op) - continue; - - if (alu->instr.pass_flags) - continue; - - nir_intrinsic_instr *itr = nir_src_as_intrinsic(alu->src[0].src); - if (!itr) - continue; - - if (itr->intrinsic != nir_intrinsic_load_input && - itr->intrinsic != nir_intrinsic_load_uniform) - continue; - - lima_nir_duplicate_modifier(&builder, alu, op); - } - } - - nir_progress(true, impl, nir_metadata_control_flow); -} - -/* Duplicate load inputs for every user. - * Helps by utilizing the load input instruction slots that would - * otherwise stay empty, and reduces register pressure. */ -void -lima_nir_duplicate_modifiers(nir_shader *shader) -{ - nir_foreach_function_impl(impl, shader) { - lima_nir_duplicate_modifier_impl(shader, impl, nir_op_fneg); - lima_nir_duplicate_modifier_impl(shader, impl, nir_op_fabs); - } -} diff --git a/src/gallium/drivers/lima/meson.build b/src/gallium/drivers/lima/meson.build index f6149b0b1b1..07f3a6a0e8c 100644 --- a/src/gallium/drivers/lima/meson.build +++ b/src/gallium/drivers/lima/meson.build @@ -30,9 +30,9 @@ files_lima = files( 'ir/pp/opt.c', 'ir/pp/compact.c', + 'ir/lima_nir_duplicate.c', 'ir/lima_nir_duplicate_consts.c', 'ir/lima_nir_duplicate_intrinsic.c', - 'ir/lima_nir_duplicate_modifiers.c', 'ir/lima_nir_lower_uniform_to_scalar.c', 'ir/lima_nir_split_load_input.c', 'ir/lima_nir_split_loads.c',