openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2025-02-17 08:27:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ir3: Fix compress_regs_left accounting for half-regs

Browse Source 
This was just wrong - we need to check against the entire register file,
and we need to include removed full regs even if the register we're
trying to insert is a half-reg, or else we could run out of space when
reinserting full regs after it. There does need to be an additional
check so that we don't try to insert a half-reg beyond the half-reg
limit, but that has to happen in addition to the normal check.

This fixes KHR-GLES31.core.arrays_of_arrays.InteractionArgumentAliasing6
once spilling is added.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12033>
This commit is contained in:
Connor Abbott 2021-08-19 18:50:07 +02:00 committed by Marge Bot
parent cca2e0fc14
commit 6a5312bf86
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/freedreno/ir3/ir3_ra.c
View File

@ -876,27 +876,23 @@ compress_regs_left(struct ra_ctx *ctx, struct ra_file *file, unsigned size,
intervals_count = intervals_sz = 0;
intervals = NULL;
unsigned removed_full_size = 0;
unsigned removed_half_size = 0;
unsigned removed_size = 0, removed_half_size = 0;
unsigned file_size =
align == 1 ? MIN2(file->size, RA_HALF_SIZE) : file->size;
physreg_t start_reg = 0;
foreach_interval_rev_safe (interval, file) {
/* Check if we can sort the intervals *after* this one and have
* enough space leftover to accomodate "size" units.
/* Check if we can sort the intervals *after* this one and have enough
* space leftover to accomodate "size" units. Also check that we have
* enough space leftover for half-registers, if we're inserting a
* half-register (otherwise we only shift any half-registers down so they
* should be safe).
*/
if (align == 1) {
if (interval->physreg_end + removed_half_size <= file_size - size) {
start_reg = interval->physreg_end;
break;
}
} else {
if (interval->physreg_end + removed_half_size <=
file_size - removed_full_size - size) {
start_reg = interval->physreg_end;
break;
}
if (interval->physreg_end + size + removed_size <= file->size &&
(align != 1 ||
interval->physreg_end + size + removed_half_size <= file_size)) {
start_reg = interval->physreg_end;
break;
}
/* We assume that all frozen intervals are at the start and that we
@ -908,12 +904,11 @@ compress_regs_left(struct ra_ctx *ctx, struct ra_file *file, unsigned size,
* overlap the register we're trying to add.
*/
if (!interval->is_killed && !is_source) {
if (interval->interval.reg->flags & IR3_REG_HALF)
removed_half_size +=
interval->physreg_end - interval->physreg_start;
else
removed_full_size +=
interval->physreg_end - interval->physreg_start;
removed_size += interval->physreg_end - interval->physreg_start;
if (interval->interval.reg->flags & IR3_REG_HALF) {
removed_half_size += interval->physreg_end -
interval->physreg_start;
}
}
/* Now that we've done the accounting, pop this off */