fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 04:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir/opt_sink: use common instruction removal/insertion helpers

Browse source 
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7880>
This commit is contained in:
Rhys Perry 2020-12-02 16:03:32 +00:00 • committed by Marge Bot
parent 45e43445ce
commit 870724d43b
1 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -181,26 +181,6 @@ get_preferred_block(nir_ssa_def *def, bool sink_out_of_loops)
return lca;
}
/* insert before first non-phi instruction: */
static void
insert_after_phi(nir_instr *instr, nir_block *block)
{
nir_foreach_instr(instr2, block) {
if (instr2->type == nir_instr_type_phi)
continue;
exec_node_insert_node_before(&instr2->node,
&instr->node);
return;
}
/* if haven't inserted it, push to tail (ie. empty block or possibly
* a block only containing phi's?)
*/
exec_list_push_tail(&block->instr_list, &instr->node);
}
bool
nir_opt_sink(nir_shader *shader, nir_move_options options)
{
@ -233,11 +213,8 @@ nir_opt_sink(nir_shader *shader, nir_move_options options)
if (!use_block || use_block == instr->block)
continue;
exec_node_remove(&instr->node);
insert_after_phi(instr, use_block);
instr->block = use_block;
nir_instr_remove(instr);
nir_instr_insert(nir_after_phis(use_block), instr);
progress = true;
}