fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 06:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir/sink,nir/move: sink/move reorderable load_ssbo

Browse source 
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6490>
This commit is contained in:
Rhys Perry 2021-01-21 17:01:07 +00:00 • committed by Marge Bot
parent af4c6605a8
commit a6d92eaf4f
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/compiler/nir/nir.h
View file

@ -4992,6 +4992,7 @@ typedef enum {
nir_move_load_input = (1 << 2),
nir_move_comparisons = (1 << 3),
nir_move_copies = (1 << 4),
nir_move_load_ssbo = (1 << 5),
} nir_move_options;
bool nir_can_move_instr(nir_instr *instr, nir_move_options options);

19
src/compiler/nir/nir_opt_sink.c
View file

@ -57,6 +57,8 @@ nir_can_move_instr(nir_instr *instr, nir_move_options options)
switch (intrin->intrinsic) {
case nir_intrinsic_load_ubo:
return options & nir_move_load_ubo;
case nir_intrinsic_load_ssbo:
return (options & nir_move_load_ssbo) && nir_intrinsic_can_reorder(intrin);
case nir_intrinsic_load_input:
case nir_intrinsic_load_interpolated_input:
case nir_intrinsic_load_per_vertex_input:
@ -181,6 +183,17 @@ get_preferred_block(nir_ssa_def *def, bool sink_out_of_loops)
return lca;
}
static bool
can_sink_out_of_loop(nir_intrinsic_instr *intrin)
{
/* Don't sink buffer loads out of loops because that can make its
* resource divergent and break code like that which is generated
* by nir_lower_non_uniform_access.
*/
return intrin->intrinsic != nir_intrinsic_load_ubo &&
intrin->intrinsic != nir_intrinsic_load_ssbo;
}
bool
nir_opt_sink(nir_shader *shader, nir_move_options options)
{
@ -200,13 +213,9 @@ nir_opt_sink(nir_shader *shader, nir_move_options options)
nir_ssa_def *def = nir_instr_ssa_def(instr);
/* Don't sink load_ubo out of loops because that can make its
* resource divergent and break code like that which is generated
* by nir_lower_non_uniform_access.
*/
bool sink_out_of_loops =
instr->type != nir_instr_type_intrinsic ||
nir_instr_as_intrinsic(instr)->intrinsic != nir_intrinsic_load_ubo;
can_sink_out_of_loop(nir_instr_as_intrinsic(instr));
nir_block *use_block =
get_preferred_block(def, sink_out_of_loops);