OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pan/mdg: Fix 16-bit alignment with spiller

Browse Source 
The loop over sources has to happen for every instruction, regardless of whether
we also need to register allocate the destination. The other source loops handle
this properly, but this one was missed.

Fixes spilling failure in shaders/android/angle/aztec_ruins/16.shader_test when
the input NIR is shuffled a bit (from reordering passes).

Fixes: 129d390bd8 ("pan/mdg: Fix bound setting in RA for sources")
Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19093>
(cherry picked from commit 829f769e60)
This commit is contained in:
Alyssa Rosenzweig
2022-10-15 21:32:11 -04:00
committed by Dylan Baker
parent 9a7a02799e
commit 86f250ac27
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@@ -22,7 +22,7 @@
"description": "pan/mdg: Fix 16-bit alignment with spiller",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "129d390bd8cc50f55b748ae6e95bed8c6074a488"
},

18
src/panfrost/midgard/midgard_ra.c
View File

@@ -518,6 +518,18 @@ allocate_registers(compiler_context *ctx, bool *spilled)
}
}
/* Anything read as 16-bit needs proper alignment to ensure the
* resulting code can be packed.
*/
mir_foreach_src(ins, s) {
unsigned src_size = nir_alu_type_get_type_size(ins->src_types[s]);
if (src_size == 16 && ins->src[s] < SSA_FIXED_MINIMUM)
min_bound[ins->src[s]] = MAX2(min_bound[ins->src[s]], 8);
}
/* Everything after this concerns only the destination, not the
* sources.
*/
if (ins->dest >= SSA_FIXED_MINIMUM) continue;
unsigned size = nir_alu_type_get_type_size(ins->dest_type);
@@ -547,12 +559,6 @@ allocate_registers(compiler_context *ctx, bool *spilled)
if (size == 16 && min_alignment[dest] != 4)
min_bound[dest] = 8;
mir_foreach_src(ins, s) {
unsigned src_size = nir_alu_type_get_type_size(ins->src_types[s]);
if (src_size == 16 && ins->src[s] < SSA_FIXED_MINIMUM)
min_bound[ins->src[s]] = MAX2(min_bound[ins->src[s]], 8);
}
/* We don't have a swizzle for the conditional and we don't
* want to muck with the conditional itself, so just force
* alignment for now */