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

nir/lower_goto_if: Rework handling of skip targets

Browse Source 
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/2401>
This commit is contained in:
Jason Ekstrand
2020-08-12 15:26:49 -05:00
committed by Marge Bot
parent 2455d03c31
commit d161798589
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/compiler/nir/nir_lower_goto_ifs.c
View File

@@ -590,22 +590,20 @@ organize_levels(struct list_head *levels, struct set *remaining,
routing->brk.reachable, mem_ctx); routing->brk.reachable, mem_ctx);
} }
assert(curr_level->blocks->entries); assert(curr_level->blocks->entries);
curr_level->skip_start = 0;
struct strct_lvl *prev_level = NULL; struct strct_lvl *prev_level = NULL;
if (!list_is_empty(levels)) if (!list_is_empty(levels))
prev_level = list_last_entry(levels, struct strct_lvl, link); prev_level = list_last_entry(levels, struct strct_lvl, link);
if (skip_targets->entries) { set_foreach(skip_targets, entry) {
set_foreach(skip_targets, entry) { if (_mesa_set_search_pre_hashed(curr_level->blocks,
if (_mesa_set_search_pre_hashed(curr_level->blocks, entry->hash, entry->key)) {
entry->hash, entry->key)) { _mesa_set_remove(skip_targets, entry);
_mesa_set_remove(skip_targets, entry); prev_level->skip_end = 1;
prev_level->skip_end = 1;
curr_level->skip_start = !!skip_targets->entries;
}
} }
} }
curr_level->skip_start = skip_targets->entries != 0;
struct set *prev_frontier = NULL; struct set *prev_frontier = NULL;
if (!prev_level) { if (!prev_level) {
prev_frontier = reach; prev_frontier = reach;