fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 06:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pan/mdg: Only combine 16-bit constants to lower half

Browse source 
We can't swizzle both halves simultaneously.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5151>
This commit is contained in:
Alyssa Rosenzweig 2020-05-11 15:58:58 -04:00 • committed by Marge Bot
parent 8b4e278628
commit d475d19f09
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/panfrost/midgard/midgard_schedule.c
View file

@ -351,7 +351,8 @@ static bool
mir_adjust_constant(midgard_instruction *ins, unsigned src,
unsigned *bundle_constant_mask,
unsigned *comp_mapping,
uint8_t *bundle_constants)
uint8_t *bundle_constants,
bool upper)
{
unsigned type_size = nir_alu_type_get_type_size(ins->src_types[src]) / 8;
unsigned max_comp = 16 / type_size;
@ -361,6 +362,15 @@ mir_adjust_constant(midgard_instruction *ins, unsigned src,
type_size * 8);
unsigned type_mask = (1 << type_size) - 1;
/* Upper only makes sense for 16-bit */
if (type_size != 16 && upper)
return false;
/* For 16-bit, we need to stay on either upper or lower halves to avoid
* disrupting the swizzle */
unsigned start = upper ? 8 : 0;
unsigned length = (type_size == 2) ? 8 : 16;
for (unsigned comp = 0; comp < max_comp; comp++) {
if (!(comp_mask & (1 << comp)))
continue;
@ -370,7 +380,7 @@ mir_adjust_constant(midgard_instruction *ins, unsigned src,
signed best_place = -1;
unsigned i, j;
for (i = 0; i < 16; i += type_size) {
for (i = start; i < (start + length); i += type_size) {
unsigned reuse_bytes = 0;
for (j = 0; j < type_size; j++) {
@ -378,6 +388,8 @@ mir_adjust_constant(midgard_instruction *ins, unsigned src,
continue;
if (constantp[j] != bundle_constants[i + j])
break;
if ((i + j) > (start + length))
break;
reuse_bytes++;
}
@ -445,7 +457,7 @@ mir_adjust_constants(midgard_instruction *ins,
continue;
if (!mir_adjust_constant(ins, src, &bundle_constant_mask,
comp_mapping[src], bundle_constants))
comp_mapping[src], bundle_constants, false))
return false;
}