Module: Mesa Branch: master Commit: f1fe656a92da18a7fa1200783f80bc183fd2595d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f1fe656a92da18a7fa1200783f80bc183fd2595d
Author: Rob Clark <[email protected]> Date: Wed Oct 9 09:47:13 2019 -0700 freedreno/ir3: handle multi component alu src when propagating shifts Signed-off-by: Rob Clark <[email protected]> --- src/freedreno/ir3/ir3_nir_lower_io_offsets.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/freedreno/ir3/ir3_nir_lower_io_offsets.c b/src/freedreno/ir3/ir3_nir_lower_io_offsets.c index 5c64a864f29..72a7efe5327 100644 --- a/src/freedreno/ir3/ir3_nir_lower_io_offsets.c +++ b/src/freedreno/ir3/ir3_nir_lower_io_offsets.c @@ -112,8 +112,6 @@ check_and_propagate_bit_shift32(nir_builder *b, nir_alu_instr *alu_instr, if (new_shift < -31 || new_shift > 31) return NULL; - b->cursor = nir_before_instr(&alu_instr->instr); - /* Add or substract shift depending on the final direction (SHR vs. SHL). */ if (shift * direction < 0) shift_ssa = nir_isub(b, shift_ssa, nir_imm_int(b, abs(shift))); @@ -134,21 +132,29 @@ ir3_nir_try_propagate_bit_shift(nir_builder *b, nir_ssa_def *offset, int32_t shi nir_ssa_def *shift_ssa; nir_ssa_def *new_offset = NULL; + b->cursor = nir_after_instr(&alu->instr); + + /* the first src could be something like ssa_18.x, but we only want + * the single component. Otherwise the ishl/ishr/ushr could turn + * into a vec4 operation: + */ + nir_ssa_def *src0 = nir_mov_alu(b, alu->src[0], 1); + switch (alu->op) { case nir_op_ishl: shift_ssa = check_and_propagate_bit_shift32(b, alu, 1, shift); if (shift_ssa) - new_offset = nir_ishl(b, alu->src[0].src.ssa, shift_ssa); + new_offset = nir_ishl(b, src0, shift_ssa); break; case nir_op_ishr: shift_ssa = check_and_propagate_bit_shift32(b, alu, -1, shift); if (shift_ssa) - new_offset = nir_ishr(b, alu->src[0].src.ssa, shift_ssa); + new_offset = nir_ishr(b, src0, shift_ssa); break; case nir_op_ushr: shift_ssa = check_and_propagate_bit_shift32(b, alu, -1, shift); if (shift_ssa) - new_offset = nir_ushr(b, alu->src[0].src.ssa, shift_ssa); + new_offset = nir_ushr(b, src0, shift_ssa); break; default: return NULL; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
