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

vc4: In a loop break/continue, jump if everyone has taken the path.

Browse Source 
This should be a win for most loops, which tend to have uniform control
flow.

More importantly, it exposes important information to live variables: that
the break/continue here means that our jump target may have access to
values that were live on our input.  Previously, we were just setting the
exec mask and letting control flow fall through, so an intervening def
between the break and the end of the loop would appear to live variables
as if it screened off the variable, when it didn't actually.

Fixes a regression in glsl-vs-loop-redundant-condition.shader_test when a
perturbing of register allocation caused a live variable to get stomped.

Cc: 13.0 <mesa-stable@lists.freedesktop.org>
This commit is contained in:
Eric Anholt
2016-11-30 17:27:37 -08:00
parent fda1d0187d
commit 8e5ec33f11
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gallium/drivers/vc4/vc4_program.c
View File

@@ -1957,22 +1957,29 @@ ntq_emit_if(struct vc4_compile *c, nir_if *if_stmt)
static void
ntq_emit_jump(struct vc4_compile *c, nir_jump_instr *jump)
{
struct qblock *jump_block;
switch (jump->type) {
case nir_jump_break:
qir_SF(c, c->execute);
qir_MOV_cond(c, QPU_COND_ZS, c->execute,
qir_uniform_ui(c, c->loop_break_block->index));
jump_block = c->loop_break_block;
break;
case nir_jump_continue:
qir_SF(c, c->execute);
qir_MOV_cond(c, QPU_COND_ZS, c->execute,
qir_uniform_ui(c, c->loop_cont_block->index));
jump_block = c->loop_cont_block;
break;
case nir_jump_return:
unreachable("All returns shouold be lowered\n");
default:
unreachable("Unsupported jump type\n");
}
qir_SF(c, c->execute);
qir_MOV_cond(c, QPU_COND_ZS, c->execute,
qir_uniform_ui(c, jump_block->index));
/* Jump to the destination block if everyone has taken the jump. */
qir_SF(c, qir_SUB(c, c->execute, qir_uniform_ui(c, jump_block->index)));
qir_BRANCH(c, QPU_COND_BRANCH_ALL_ZS);
struct qblock *new_block = qir_new_block(c);
qir_link_blocks(c->cur_block, jump_block);
qir_link_blocks(c->cur_block, new_block);
qir_set_emit_block(c, new_block);
}
static void