nir: Move phi src setup to a helper.

Cleans up the ralloc/list push code all over the tree.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11772>
This commit is contained in:
Emma Anholt
2021-07-07 13:24:45 -07:00
committed by Marge Bot
parent 636f51c6d1
commit 673cc9323a
15 changed files with 51 additions and 117 deletions

View File

@@ -240,10 +240,7 @@ try_move_narrowing_dst(nir_builder *b, nir_phi_instr *phi)
nir_ssa_def *new_src = nir_build_alu(b, op, old_src, NULL, NULL, NULL);
/* and add corresponding phi_src to the new_phi: */
nir_phi_src *phi_src = ralloc(new_phi, nir_phi_src);
phi_src->pred = src->pred;
phi_src->src = nir_src_for_ssa(new_src);
exec_list_push_tail(&new_phi->srcs, &phi_src->node);
nir_phi_instr_add_src(new_phi, src->pred, nir_src_for_ssa(new_src));
}
/* And finally rewrite the original uses of the original phi uses to
@@ -420,10 +417,7 @@ try_move_widening_src(nir_builder *b, nir_phi_instr *phi)
}
/* add corresponding phi_src to the new_phi: */
nir_phi_src *phi_src = ralloc(new_phi, nir_phi_src);
phi_src->pred = src->pred;
phi_src->src = nir_src_for_ssa(new_src);
exec_list_push_tail(&new_phi->srcs, &phi_src->node);
nir_phi_instr_add_src(new_phi, src->pred, nir_src_for_ssa(new_src));
}
/* And insert the new phi after all sources are in place: */