nir_lower_bit_size: Support lowering ops with differing source/dest sizes
Specifically the bit-finding routines always return int32. Don't complain about the dest already being 32 bits when lowering to 32 bits, and don't bother casting the dest if it's already right. Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6313>
This commit is contained in:
@@ -70,9 +70,13 @@ lower_instr(nir_builder *bld, nir_alu_instr *alu, unsigned bit_size)
|
|||||||
|
|
||||||
|
|
||||||
/* Convert result back to the original bit-size */
|
/* Convert result back to the original bit-size */
|
||||||
|
if (dst_bit_size != bit_size) {
|
||||||
nir_alu_type type = nir_op_infos[op].output_type;
|
nir_alu_type type = nir_op_infos[op].output_type;
|
||||||
nir_ssa_def *dst = nir_convert_to_bit_size(bld, lowered_dst, type, dst_bit_size);
|
nir_ssa_def *dst = nir_convert_to_bit_size(bld, lowered_dst, type, dst_bit_size);
|
||||||
nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(dst));
|
nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(dst));
|
||||||
|
} else {
|
||||||
|
nir_ssa_def_rewrite_uses(&alu->dest.dest.ssa, nir_src_for_ssa(lowered_dst));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
@@ -96,8 +100,6 @@ lower_impl(nir_function_impl *impl,
|
|||||||
if (lower_bit_size == 0)
|
if (lower_bit_size == 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
assert(lower_bit_size != alu->dest.dest.ssa.bit_size);
|
|
||||||
|
|
||||||
lower_instr(&b, alu, lower_bit_size);
|
lower_instr(&b, alu, lower_bit_size);
|
||||||
progress = true;
|
progress = true;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user