fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 02:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

lima: use nir_shader_instructions_pass in lima_nir_split_load_input

Browse source 
Changes:
- nir_metadata_preserve(..., nir_metadata_block_index | nir_metadata_dominance)
  is called only when pass makes progress
- nir_metadata_preserve(..., nir_metadata_all) is called when pass doesn't
  make progress

Signed-off-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13176>
This commit is contained in:
Marcin Ślusarz 2021-08-10 14:44:22 +02:00 • committed by Marge Bot
parent aa30e58600
commit b8cafaa91d
1 changed files with 55 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

135
src/gallium/drivers/lima/ir/lima_nir_split_load_input.c
View file

@ -27,91 +27,71 @@
#include "lima_ir.h" #include "lima_ir.h"
static bool static bool
lima_nir_split_load_input_block(nir_block *block, nir_builder *b) lima_nir_split_load_input_instr(nir_builder *b,
nir_instr *instr,
UNUSED void *cb_data)
{ {
bool progress = false; if (instr->type != nir_instr_type_alu)
return false;
nir_foreach_instr_safe(instr, block) { nir_alu_instr *alu = nir_instr_as_alu(instr);
if (instr->type != nir_instr_type_alu) if (alu->op != nir_op_mov)
continue; return false;
nir_alu_instr *alu = nir_instr_as_alu(instr); if (!alu->dest.dest.is_ssa)
if (alu->op != nir_op_mov) return false;
continue;
if (!alu->dest.dest.is_ssa) if (!alu->src[0].src.is_ssa)
continue; return false;
if (!alu->src[0].src.is_ssa) nir_ssa_def *ssa = alu->src[0].src.ssa;
continue; if (ssa->parent_instr->type != nir_instr_type_intrinsic)
return false;
nir_ssa_def *ssa = alu->src[0].src.ssa; nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(ssa->parent_instr);
if (ssa->parent_instr->type != nir_instr_type_intrinsic) if (intrin->intrinsic != nir_intrinsic_load_input)
continue; return false;
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(ssa->parent_instr); uint8_t swizzle = alu->src[0].swizzle[0];
if (intrin->intrinsic != nir_intrinsic_load_input) int i;
continue;
uint8_t swizzle = alu->src[0].swizzle[0]; for (i = 1; i < nir_dest_num_components(alu->dest.dest); i++)
int i; if (alu->src[0].swizzle[i] != (swizzle + i))
break;
for (i = 1; i < nir_dest_num_components(alu->dest.dest); i++) if (i != nir_dest_num_components(alu->dest.dest))
if (alu->src[0].swizzle[i] != (swizzle + i)) return false;
break;
if (i != nir_dest_num_components(alu->dest.dest)) /* mali4xx can't access unaligned vec3, don't split load input */
continue; if (nir_dest_num_components(alu->dest.dest) == 3 && swizzle > 0)
return false;
/* mali4xx can't access unaligned vec3, don't split load input */ /* mali4xx can't access unaligned vec2, don't split load input */
if (nir_dest_num_components(alu->dest.dest) == 3 && swizzle > 0) if (nir_dest_num_components(alu->dest.dest) == 2 &&
continue; swizzle != 0 && swizzle != 2)
return false;
/* mali4xx can't access unaligned vec2, don't split load input */ b->cursor = nir_before_instr(&intrin->instr);
if (nir_dest_num_components(alu->dest.dest) == 2 && nir_intrinsic_instr *new_intrin = nir_intrinsic_instr_create(
swizzle != 0 && swizzle != 2) b->shader,
continue; intrin->intrinsic);
nir_ssa_dest_init(&new_intrin->instr, &new_intrin->dest,
nir_dest_num_components(alu->dest.dest),
ssa->bit_size,
NULL);
new_intrin->num_components = nir_dest_num_components(alu->dest.dest);
nir_intrinsic_set_base(new_intrin, nir_intrinsic_base(intrin));
nir_intrinsic_set_component(new_intrin, nir_intrinsic_component(intrin) + swizzle);
nir_intrinsic_set_dest_type(new_intrin, nir_intrinsic_dest_type(intrin));
b->cursor = nir_before_instr(&intrin->instr); /* offset */
nir_intrinsic_instr *new_intrin = nir_intrinsic_instr_create( nir_src_copy(&new_intrin->src[0], &intrin->src[0]);
b->shader,
intrin->intrinsic);
nir_ssa_dest_init(&new_intrin->instr, &new_intrin->dest,
nir_dest_num_components(alu->dest.dest),
ssa->bit_size,
NULL);
new_intrin->num_components = nir_dest_num_components(alu->dest.dest);
nir_intrinsic_set_base(new_intrin, nir_intrinsic_base(intrin));
nir_intrinsic_set_component(new_intrin, nir_intrinsic_component(intrin) + swizzle);
nir_intrinsic_set_dest_type(new_intrin, nir_intrinsic_dest_type(intrin));
/* offset */ nir_builder_instr_insert(b, &new_intrin->instr);
nir_src_copy(&new_intrin->src[0], &intrin->src[0]); nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa,
&new_intrin->dest.ssa);
nir_builder_instr_insert(b, &new_intrin->instr); nir_instr_remove(&alu->instr);
nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, return true;
&new_intrin->dest.ssa);
nir_instr_remove(&alu->instr);
progress = true;
}
return progress;
}
static bool
lima_nir_split_load_input_impl(nir_function_impl *impl)
{
bool progress = false;
nir_builder builder;
nir_builder_init(&builder, impl);
nir_foreach_block(block, impl) {
progress |= lima_nir_split_load_input_block(block, &builder);
}
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
return progress;
} }
/* Replaces a single load of several packed varyings and number of movs with /* Replaces a single load of several packed varyings and number of movs with
@ -120,13 +100,8 @@ lima_nir_split_load_input_impl(nir_function_impl *impl)
bool bool
lima_nir_split_load_input(nir_shader *shader) lima_nir_split_load_input(nir_shader *shader)
{ {
bool progress = false; return nir_shader_instructions_pass(shader, lima_nir_split_load_input_instr,
nir_metadata_block_index |
nir_foreach_function(function, shader) { nir_metadata_dominance,
if (function->impl) NULL);
progress |= lima_nir_split_load_input_impl(function->impl);
}
return progress;
} }