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

v3d: Handle dynamically uniform IF statements with uniform control flow.

Browse Source 
Loops will be trickier, since we need some analysis to figure out if the
breaks/continues inside are uniform.  Until we get that in NIR, this gets
us some quick wins.

total instructions in shared programs: 6192844 -> 6174162 (-0.30%)
instructions in affected programs: 487781 -> 469099 (-3.83%)
This commit is contained in:
Eric Anholt
2018-12-31 12:18:34 -08:00
parent 5e9ee6e841
commit 0805060573
1 changed files with 65 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/broadcom/compiler/nir_to_vir.c
View File

@@ -1715,7 +1715,60 @@ ntq_activate_execute_for_block(struct v3d_compile *c)
}
static void
ntq_emit_if(struct v3d_compile *c, nir_if *if_stmt)
ntq_emit_uniform_if(struct v3d_compile *c, nir_if *if_stmt)
{
nir_block *nir_else_block = nir_if_first_else_block(if_stmt);
bool empty_else_block =
(nir_else_block == nir_if_last_else_block(if_stmt) &&
exec_list_is_empty(&nir_else_block->instr_list));
struct qblock *then_block = vir_new_block(c);
struct qblock *after_block = vir_new_block(c);
struct qblock *else_block;
if (empty_else_block)
else_block = after_block;
else
else_block = vir_new_block(c);
/* Set up the flags for the IF condition (taking the THEN branch). */
nir_alu_instr *if_condition_alu = ntq_get_alu_parent(if_stmt->condition);
enum v3d_qpu_cond cond;
if (!if_condition_alu ||
!ntq_emit_comparison(c, if_condition_alu, &cond)) {
vir_PF(c, ntq_get_src(c, if_stmt->condition, 0),
V3D_QPU_PF_PUSHZ);
cond = V3D_QPU_COND_IFNA;
}
/* Jump to ELSE. */
vir_BRANCH(c, cond == V3D_QPU_COND_IFA ?
V3D_QPU_BRANCH_COND_ALLNA :
V3D_QPU_BRANCH_COND_ALLA);
vir_link_blocks(c->cur_block, else_block);
vir_link_blocks(c->cur_block, then_block);
/* Process the THEN block. */
vir_set_emit_block(c, then_block);
ntq_emit_cf_list(c, &if_stmt->then_list);
if (!empty_else_block) {
/* At the end of the THEN block, jump to ENDIF */
vir_BRANCH(c, V3D_QPU_BRANCH_COND_ALWAYS);
vir_link_blocks(c->cur_block, after_block);
/* Emit the else block. */
vir_set_emit_block(c, else_block);
ntq_activate_execute_for_block(c);
ntq_emit_cf_list(c, &if_stmt->else_list);
}
vir_link_blocks(c->cur_block, after_block);
vir_set_emit_block(c, after_block);
}
static void
ntq_emit_nonuniform_if(struct v3d_compile *c, nir_if *if_stmt)
{
nir_block *nir_else_block = nir_if_first_else_block(if_stmt);
bool empty_else_block =
@@ -1809,6 +1862,17 @@ ntq_emit_if(struct v3d_compile *c, nir_if *if_stmt)
ntq_activate_execute_for_block(c);
}
static void
ntq_emit_if(struct v3d_compile *c, nir_if *nif)
{
if (c->execute.file == QFILE_NULL &&
nir_src_is_dynamically_uniform(nif->condition)) {
ntq_emit_uniform_if(c, nif);
} else {
ntq_emit_nonuniform_if(c, nif);
}
}
static void
ntq_emit_jump(struct v3d_compile *c, nir_jump_instr *jump)
{