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

pan/bi: Add a bi_swizzle_from_byte_channels() helper

Browse source 
Reviewed-by: Lorenzo Rossi <lorenzo.rossi@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40720>
This commit is contained in:
Faith Ekstrand 2026-03-27 17:25:37 -04:00 • committed by Marge Bot
parent 4912bda122
commit 3b728cb613
2 changed files with 50 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2330,50 +2330,6 @@ bi_emit_load_const(bi_builder *b, nir_load_const_instr *instr)
}
}
static bool
bi_byte_swizzle_from_nir_swizzle(unsigned *channels, unsigned comps,
enum bi_swizzle *out_swizzle)
{
assert(comps == 4 || comps == 2);
unsigned index = 0;
for (unsigned i = 0; i < 4; i++) {
index = (index << 2) + channels[i * comps / 4];
}
switch (index) {
#define B(b0, b1, b2, b3) \
case ((b0) << 6) | ((b1) << 4) | ((b2) << 2) | (b3): \
*out_swizzle = BI_SWIZZLE_B##b0##b1##b2##b3; \
return true;
B(0, 1, 0, 1);
B(0, 1, 2, 3);
B(2, 3, 0, 1);
B(2, 3, 2, 3);
B(0, 0, 0, 0);
B(1, 1, 1, 1);
B(2, 2, 2, 2);
B(3, 3, 3, 3);
B(0, 0, 1, 1);
B(2, 2, 3, 3);
B(1, 0, 3, 2);
B(3, 2, 1, 0);
B(0, 0, 2, 2);
B(1, 1, 0, 0);
B(2, 2, 0, 0);
B(3, 3, 0, 0);
B(2, 2, 1, 1);
B(3, 3, 1, 1);
B(1, 1, 2, 2);
B(3, 3, 2, 2);
B(0, 0, 3, 3);
B(1, 1, 3, 3);
B(1, 1, 2, 3);
#undef B
default:
return false;
}
}
static bi_index
bi_alu_src_index(bi_builder *b, nir_alu_src src, unsigned comps)
{
@ -2407,12 +2363,15 @@ bi_alu_src_index(bi_builder *b, nir_alu_src src, unsigned comps)
idx.swizzle = BI_SWIZZLE_B0000 + (src.swizzle[0] & 3);
} else if (bitsize == 8) {
if (comps == 2 || comps == 4) {
/* For a vec2, place the two components in 0 and 2 instead of
* 0 and 1. For a scalar, splat it out to all channels.
*/
unsigned c[4] = {0};
for (unsigned i = 0; i < comps; ++i)
c[i] = src.swizzle[i] & 3;
for (unsigned i = 0; i < 4; ++i)
c[i] = src.swizzle[i * comps / 4] & 3;
enum bi_swizzle swizzle;
if (bi_byte_swizzle_from_nir_swizzle(c, comps, &swizzle)) {
if (bi_swizzle_from_byte_channels(c, &swizzle)) {
idx.swizzle = swizzle;
return idx;
}

44
src/panfrost/compiler/bifrost/compiler.h
View file

@ -139,6 +139,50 @@ bi_swizzle_to_byte_channels(enum bi_swizzle swizzle, unsigned *channels)
UNREACHABLE("Invalid bi_swizzle");
}
static inline bool
bi_swizzle_from_byte_channels(const unsigned byte_channels[4],
enum bi_swizzle *out_swizzle)
{
unsigned index = 0;
for (unsigned i = 0; i < 4; i++) {
assert(byte_channels[i] < 4);
index = (index << 2) | byte_channels[i];
}
switch (index) {
#define B(b0, b1, b2, b3) \
case ((b0) << 6) | ((b1) << 4) | ((b2) << 2) | (b3): \
*out_swizzle = BI_SWIZZLE_B##b0##b1##b2##b3; \
return true;
B(0, 1, 0, 1);
B(0, 1, 2, 3);
B(2, 3, 0, 1);
B(2, 3, 2, 3);
B(0, 0, 0, 0);
B(1, 1, 1, 1);
B(2, 2, 2, 2);
B(3, 3, 3, 3);
B(0, 0, 1, 1);
B(2, 2, 3, 3);
B(1, 0, 3, 2);
B(3, 2, 1, 0);
B(0, 0, 2, 2);
B(1, 1, 0, 0);
B(2, 2, 0, 0);
B(3, 3, 0, 0);
B(2, 2, 1, 1);
B(3, 3, 1, 1);
B(1, 1, 2, 2);
B(3, 3, 2, 2);
B(0, 0, 3, 3);
B(1, 1, 3, 3);
B(1, 1, 2, 3);
#undef B
default:
return false;
}
}
static inline enum bi_swizzle
bi_swizzle_from_half(bool x, bool y)
{