fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 04:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

pan/bi: Handle vector 16-bit extract_[ui]8

Browse source 
The old implementation only worked for 16-bit because we assumed scalar
so we could stomp the whole destination as if it was 32-bit.  This
version works for v2i16.

Reviewed-by: Christoph Pillmayer <christoph.pillmayer@arm.com>
Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Reviewed-by: Lorenzo Rossi <lorenzo.rossi@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40769>
This commit is contained in:
Faith Ekstrand 2026-04-09 09:41:59 -04:00
parent 91e6507665
commit 37dcfcc6d0
2 changed files with 35 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/panfrost/compiler/bifrost/bifrost_compile.c
View file

@ -3036,14 +3036,42 @@ bi_emit_alu(bi_builder *b, nir_alu_instr *instr)
case nir_op_extract_u8:
case nir_op_extract_i8: {
assert(comps == 1 && "should be scalarized");
assert((src_sz == 16 || src_sz == 32) && "should be lowered");
unsigned byte = nir_alu_src_as_uint(instr->src[1]);
if (sz == 32) {
assert(comps == 1 && "should be scalarized");
unsigned byte = nir_alu_src_as_uint(instr->src[1]);
if (instr->op == nir_op_extract_i8)
bi_s8_to_s32_to(b, dst, bi_byte(s0, byte));
else
bi_u8_to_u32_to(b, dst, bi_byte(s0, byte));
} else if (sz == 16) {
assert(comps <= 2);
const unsigned byte_x = nir_alu_src_comp_as_uint(instr->src[1], 0);
const unsigned byte_y = comps == 1 ? byte_x :
nir_alu_src_comp_as_uint(instr->src[1], 1);
assert(byte_x < 2 && byte_y < 2);
if (instr->op == nir_op_extract_i8)
bi_s8_to_s32_to(b, dst, bi_byte(s0, byte));
else
bi_u8_to_u32_to(b, dst, bi_byte(s0, byte));
/* Construct the swizzle for the select. We know it's valid because
* it's guaranteed to be a BXXYY swizzle, even when composed with
* s0.swizzle.
*/
enum bi_swizzle swizzle = BI_SWIZZLE_H01;
const unsigned bytes[4] = { byte_x, byte_x, 2 + byte_y, 2 + byte_y };
bool valid = bi_swizzle_from_byte_channels(bytes, &swizzle);
assert(valid);
valid = bi_try_compose_swizzles(&swizzle, swizzle, s0.swizzle);
assert(valid);
bi_index src = s0;
src.swizzle = swizzle;
if (instr->op == nir_op_extract_i8)
bi_v2s8_to_v2s16_to(b, dst, src);
else
bi_v2u8_to_v2u16_to(b, dst, src);
} else {
UNREACHABLE("should be lowered");
}
break;
}

2
src/panfrost/compiler/bifrost/bifrost_nir.c
View file

@ -139,8 +139,6 @@ bi_vectorize_filter(const nir_instr *instr, const void *data)
case nir_op_f2i8:
case nir_op_f2u8:
case nir_op_f2fmp:
case nir_op_extract_u8:
case nir_op_extract_i8:
case nir_op_extract_u16:
case nir_op_extract_i16:
case nir_op_insert_u16: