fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-10 12:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

v3d: Refactor bcsel and if condition handling.

Browse source 
Both were doing the same thing to try to get a condition to predicate on.
Noticed when I wanted to do this for discard_if as well.

No change in shader-db.
This commit is contained in:
Eric Anholt 2019-02-13 12:39:08 -08:00
parent 4586f9f902
commit 718eef62cb
1 changed files with 14 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/broadcom/compiler/nir_to_vir.c
View file

@ -776,28 +776,23 @@ ntq_get_alu_parent(nir_src src)
return instr;
}
/**
* Attempts to fold a comparison generating a boolean result into the
* condition code for selecting between two values, instead of comparing the
* boolean result against 0 to generate the condition code.
*/
static struct qreg ntq_emit_bcsel(struct v3d_compile *c, nir_alu_instr *instr,
struct qreg *src)
/* Turns a NIR bool into a condition code to predicate on. */
static enum v3d_qpu_cond
ntq_emit_bool_to_cond(struct v3d_compile *c, nir_src src)
{
nir_alu_instr *compare = ntq_get_alu_parent(instr->src[0].src);
nir_alu_instr *compare = ntq_get_alu_parent(src);
if (!compare)
goto out;
enum v3d_qpu_cond cond;
if (ntq_emit_comparison(c, compare, &cond))
return vir_MOV(c, vir_SEL(c, cond, src[1], src[2]));
return cond;
out:
vir_PF(c, src[0], V3D_QPU_PF_PUSHZ);
return vir_MOV(c, vir_SEL(c, V3D_QPU_COND_IFNA, src[1], src[2]));
vir_PF(c, ntq_get_src(c, src, 0), V3D_QPU_PF_PUSHZ);
return V3D_QPU_COND_IFNA;
}
static void
ntq_emit_alu(struct v3d_compile *c, nir_alu_instr *instr)
{
@ -965,8 +960,12 @@ ntq_emit_alu(struct v3d_compile *c, nir_alu_instr *instr)
}
case nir_op_b32csel:
result = ntq_emit_bcsel(c, instr, src);
result = vir_MOV(c,
vir_SEL(c,
ntq_emit_bool_to_cond(c, instr->src[0].src),
src[1], src[2]));
break;
case nir_op_fcsel:
vir_PF(c, src[0], V3D_QPU_PF_PUSHZ);
result = vir_MOV(c, vir_SEL(c, V3D_QPU_COND_IFNA,
@ -2032,14 +2031,7 @@ ntq_emit_uniform_if(struct v3d_compile *c, nir_if *if_stmt)
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;
}
enum v3d_qpu_cond cond = ntq_emit_bool_to_cond(c, if_stmt->condition);
/* Jump to ELSE. */
vir_BRANCH(c, cond == V3D_QPU_COND_IFA ?
@ -2091,14 +2083,7 @@ ntq_emit_nonuniform_if(struct v3d_compile *c, nir_if *if_stmt)
}
/* 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;
}
enum v3d_qpu_cond cond = ntq_emit_bool_to_cond(c, if_stmt->condition);
/* Update the flags+cond to mean "Taking the ELSE branch (!cond) and
* was previously active (execute Z) for updating the exec flags.