intel/compiler: reemit boolean resolve for inverted if on gen5

Gen5 adds some boolean conversion instructions after nir emits,
but that nir srcs don't line up with them, so reemit the boolean
conversion if we reemit the inot.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 31b5f5a51f ("nir/opt_if: Simplify if's with general conditions")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26782>
(cherry picked from commit 56a72e014f)
This commit is contained in:
Dave Airlie
2023-12-21 10:39:08 +10:00
committed by Eric Engestrom
parent 8ee03f2437
commit 10bb376e09
2 changed files with 12 additions and 1 deletions

View File

@@ -361,6 +361,17 @@ fs_visitor::nir_emit_if(nir_if *if_stmt)
invert = true;
cond_reg = get_nir_src(cond->src[0].src);
cond_reg = offset(cond_reg, bld, cond->src[0].swizzle[0]);
if (devinfo->ver <= 5 &&
(cond->instr.pass_flags & BRW_NIR_BOOLEAN_MASK) == BRW_NIR_BOOLEAN_NEEDS_RESOLVE) {
/* redo boolean resolve on gen5 */
fs_reg masked = bld.vgrf(BRW_REGISTER_TYPE_D);
bld.AND(masked, cond_reg, brw_imm_d(1));
masked.negate = true;
fs_reg tmp = bld.vgrf(cond_reg.type);
bld.MOV(retype(tmp, BRW_REGISTER_TYPE_D), masked);
cond_reg = tmp;
}
} else {
invert = false;
cond_reg = get_nir_src(if_stmt->condition);