aco: don't create unnecessary exec phi on merge blocks

No fossil-db changes.

Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8870>
This commit is contained in:
Daniel Schürmann 2021-02-03 15:32:32 +01:00 committed by Marge Bot
parent 3f614c6f7c
commit e663a15098

View file

@ -577,7 +577,7 @@ unsigned add_coupling_code(exec_ctx& ctx, Block* block,
if (block->kind & block_kind_merge)
num_exec_masks--;
else if (block->kind & block_kind_top_level)
if (block->kind & block_kind_top_level)
num_exec_masks = std::min(num_exec_masks, 2u);
/* create phis for diverged exec masks */
@ -604,12 +604,6 @@ unsigned add_coupling_code(exec_ctx& ctx, Block* block,
i++;
}
if (block->kind & block_kind_top_level && ctx.info[idx].exec.size() == 3) {
assert(ctx.info[idx].exec.back().second == mask_type_exact);
assert(block->kind & block_kind_merge);
ctx.info[idx].exec.pop_back();
}
/* try to satisfy the block's needs */
if (ctx.handle_wqm) {
if (block->kind & block_kind_top_level && ctx.info[idx].exec.size() == 2) {