brw/nir: nir_intrinsic_load_reloc_const_intel may not be scalar [v3]

If the (NIR) destination is a register (i.e., not an SSA value), the
destination of the BRW instruction will not be is_scalar. This occurs in
some shaders in Final Fantasy XVI (and
finalfantasytype0_1.rdc.2826e29da3722a83.1.foz).

If the destination is not is_scalar, revert most of this code to the
state previous to f3593df877. This means

- Allocate a SIMD1 register and UNDEF it.
- Emit a SIMD1 MOV_RELOC_IMM to that register.
- Emit an additional MOV to expand the SIMD1 result.

Closes: #12520
Fixes: f3593df877 ("brw/nir: Treat load_reloc_const_intel as convergent")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37384>
This commit is contained in:
Ian Romanick
2025-09-15 17:03:02 -07:00
committed by Marge Bot
parent 29ccbb21f3
commit 23bd356b42

View File

@@ -6215,10 +6215,20 @@ brw_from_nir_emit_intrinsic(nir_to_brw_state &ntb,
uint32_t id = nir_intrinsic_param_idx(instr);
uint32_t base = nir_intrinsic_base(instr);
assert(dest.is_scalar);
/* Emit the reloc in the smallest SIMD size to limit register usage. */
const brw_builder ubld = dest.is_scalar ? xbld : bld.exec_all().group(1, 0);
brw_reg small_dest = dest.is_scalar ? dest : ubld.vgrf(dest.type);
xbld.emit(SHADER_OPCODE_MOV_RELOC_IMM, retype(dest, BRW_TYPE_D),
if (!dest.is_scalar)
ubld.UNDEF(small_dest);
ubld.emit(SHADER_OPCODE_MOV_RELOC_IMM, retype(small_dest, BRW_TYPE_D),
brw_imm_ud(id), brw_imm_ud(base));
/* Copy propagation will get rid of this MOV. */
if (!dest.is_scalar)
bld.MOV(dest, component(small_dest, 0));
break;
}