AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lima: rework lima_nir_duplicate_load_consts

Browse Source 
Reviewed-by: Erico Nunes <nunes.erico@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36308>
This commit is contained in:
Georg Lehmann
2025-07-23 10:44:06 +02:00
committed by Marge Bot
parent 9a56484247
commit b8d48ffcac
4 changed files with 38 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/lima/ir/lima_ir.h
+1 -1
View File
@@ -70,7 +70,7 @@ bool lima_nir_lower_fdot(nir_shader *shader);
bool lima_nir_split_load_input(nir_shader *shader);
bool lima_nir_split_loads(nir_shader *shader);
void lima_nir_duplicate_load_consts(nir_shader *shader);
bool lima_nir_duplicate_load_consts(nir_shader *shader);
bool lima_nir_duplicate_load_inputs(nir_shader *shader);
bool lima_nir_duplicate_load_uniforms(nir_shader *shader);
bool lima_nir_duplicate_modifiers(nir_shader *shader);
src/gallium/drivers/lima/ir/lima_nir_duplicate.c
+37 -3
View File
@@ -26,7 +26,7 @@
#include "lima_ir.h"
static bool
duplicate_def_at_use(nir_builder *b, nir_def *def)
duplicate_def_at_use(nir_builder *b, nir_def *def, bool duplicate_for_ffma)
{
nir_def *last_dupl = NULL;
nir_instr *last_parent_instr = NULL;
@@ -46,6 +46,12 @@ duplicate_def_at_use(nir_builder *b, nir_def *def)
} else {
b->cursor = nir_before_instr(nir_src_parent_instr(use_src));
last_parent_instr = nir_src_parent_instr(use_src);
if (duplicate_for_ffma &&
last_parent_instr->type == nir_instr_type_alu &&
nir_instr_as_alu(last_parent_instr)->op == nir_op_ffma) {
last_parent_instr = NULL;
}
}
dupl = nir_instr_def(nir_instr_clone(b->shader, def->parent_instr));
@@ -80,7 +86,7 @@ duplicate_modifier_alu(nir_builder *b, nir_alu_instr *alu, void *unused)
itr->intrinsic != nir_intrinsic_load_uniform)
return false;
return duplicate_def_at_use(b, &alu->def);
return duplicate_def_at_use(b, &alu->def, false);
}
/* Duplicate load inputs for every user.
@@ -107,7 +113,7 @@ duplicate_intrinsic(nir_builder *b, nir_intrinsic_instr *itr,
if (itr->instr.pass_flags)
return false;
return duplicate_def_at_use(b, &itr->def);
return duplicate_def_at_use(b, &itr->def, false);
}
/* Duplicate load uniforms for every user.
@@ -135,3 +141,31 @@ lima_nir_duplicate_load_inputs(nir_shader *shader)
nir_metadata_control_flow,
(void *)nir_intrinsic_load_input);
}
static bool
duplicate_load_const(nir_builder *b, nir_instr *instr, void *unused)
{
if (instr->type != nir_instr_type_load_const)
return false;
if (instr->pass_flags)
return false;
/* Always clone consts for FFMA sources as well, since it will translate
* into 2 PPIR ops and each may need its own const. Redundant consts
* will be dropped by PPIR later
*/
return duplicate_def_at_use(b, nir_instr_def(instr), true);
}
/* Duplicate load consts for every user.
* Helps by utilizing the load const instruction slots that would
* otherwise stay empty, and reduces register pressure. */
bool
lima_nir_duplicate_load_consts(nir_shader *shader)
{
nir_shader_clear_pass_flags(shader);
return nir_shader_instructions_pass(shader, duplicate_load_const,
nir_metadata_control_flow, NULL);
}
src/gallium/drivers/lima/ir/lima_nir_duplicate_consts.c
-132
View File
@@ -1,132 +0,0 @@
/*
* Copyright (c) 2020 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_load_const(nir_builder *b, nir_load_const_instr *load)
{
nir_load_const_instr *last_dupl = NULL;
nir_instr *last_parent_instr = NULL;
nir_foreach_use_safe(use_src, &load->def) {
nir_load_const_instr *dupl;
nir_instr *instr = nir_src_parent_instr(use_src);
nir_alu_instr *alu = NULL;
if (instr->type == nir_instr_type_alu)
alu = nir_instr_as_alu(instr);
/* Always clone consts for FFMA sources as well, since it will translate
* into 2 PPIR ops and each may need its own const. Redundant consts
* will be dropped by PPIR later
*/
if (last_parent_instr != instr ||
(alu && alu->op == nir_op_ffma)) {
/* if ssa use, clone for the target block */
b->cursor = nir_before_instr(instr);
dupl = nir_load_const_instr_create(b->shader, load->def.num_components,
load->def.bit_size);
memcpy(&dupl->value, &load->value, sizeof(*load->value) * load->def.num_components);
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, &load->def) {
nir_load_const_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(&load->instr);
dupl = nir_load_const_instr_create(b->shader, load->def.num_components,
load->def.bit_size);
memcpy(&dupl->value, &load->value, sizeof(*load->value) * load->def.num_components);
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(&load->instr);
return true;
}
static void
lima_nir_duplicate_load_consts_impl(nir_shader *shader, nir_function_impl *impl)
{
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_load_const)
continue;
nir_load_const_instr *load = nir_instr_as_load_const(instr);
if (load->instr.pass_flags)
continue;
lima_nir_duplicate_load_const(&builder, load);
}
}
nir_progress(true, impl, nir_metadata_control_flow);
}
/* Duplicate load consts for every user.
* Helps by utilizing the load const instruction slots that would
* otherwise stay empty, and reduces register pressure. */
void
lima_nir_duplicate_load_consts(nir_shader *shader)
{
nir_foreach_function_impl(impl, shader) {
lima_nir_duplicate_load_consts_impl(shader, impl);
}
}
src/gallium/drivers/lima/meson.build
-1
View File
@@ -31,7 +31,6 @@ files_lima = files(
'ir/pp/compact.c',
'ir/lima_nir_duplicate.c',
'ir/lima_nir_duplicate_consts.c',
'ir/lima_nir_lower_uniform_to_scalar.c',
'ir/lima_nir_split_load_input.c',
'ir/lima_nir_split_loads.c',