OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/dce: fix DCE of loops with a halt or return instruction in the pre-header

Browse Source 
If there is a halt or return instruction right before a loop with a single
continue, we would have taken the fast path intended for loops without
continues.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Tested-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 71a985d80b ("nir/dce: perform DCE for unlooped instructions in a single pass")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10284>
This commit is contained in:
Rhys Perry
2021-04-16 13:18:33 +01:00
committed by Marge Bot
parent 34a75ce15c
commit 2fe13aa2ad
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/compiler/nir/nir_opt_dce.c
View File

@@ -166,18 +166,21 @@ dce_cf_list(struct exec_list *cf_list, BITSET_WORD *defs_live,
case nir_cf_node_loop: { case nir_cf_node_loop: {
nir_loop *loop = nir_cf_node_as_loop(cf_node); nir_loop *loop = nir_cf_node_as_loop(cf_node);
struct loop_state inner_state;
inner_state.preheader = nir_cf_node_as_block(nir_cf_node_prev(cf_node));
inner_state.header_phis_changed = false;
/* Fast path if the loop has no continues: we can remove instructions /* Fast path if the loop has no continues: we can remove instructions
* as we mark the others live. * as we mark the others live.
*/ */
if (nir_loop_first_block(loop)->predecessors->entries == 1) { struct set *predecessors = nir_loop_first_block(loop)->predecessors;
if (predecessors->entries == 1 &&
_mesa_set_next_entry(predecessors, NULL)->key == inner_state.preheader) {
progress |= dce_cf_list(&loop->body, defs_live, parent_loop); progress |= dce_cf_list(&loop->body, defs_live, parent_loop);
break; break;
} }
/* Mark instructions as live until there is no more progress. */ /* Mark instructions as live until there is no more progress. */
struct loop_state inner_state;
inner_state.preheader = nir_cf_node_as_block(nir_cf_node_prev(cf_node));
inner_state.header_phis_changed = false;
do { do {
/* dce_cf_list() resets inner_state.header_phis_changed itself, so /* dce_cf_list() resets inner_state.header_phis_changed itself, so
* it doesn't have to be done here. * it doesn't have to be done here.