From b281843974aa86594288ca3c096eedf9965739f5 Mon Sep 17 00:00:00 2001 From: Icecream95 Date: Fri, 10 Dec 2021 23:44:25 +1300 Subject: [PATCH] pan/mdg: Use MAX2 to set min_alignment If a value is written in a vector CSEL but then written again by other instructions, it still needs full alignment, so set min_alignment using MAX2 to avoid ever reducing it. Fixes: 1798f6bfc33 ("pan/midgard: Fix masks/alignment for 64-bit loads") Part-of: --- src/panfrost/midgard/midgard_ra.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/panfrost/midgard/midgard_ra.c b/src/panfrost/midgard/midgard_ra.c index e02fb743a55..e3922639432 100644 --- a/src/panfrost/midgard/midgard_ra.c +++ b/src/panfrost/midgard/midgard_ra.c @@ -504,7 +504,7 @@ allocate_registers(compiler_context *ctx, bool *spilled) unsigned s = ins->src[v]; if (s < ctx->temp_count) - min_alignment[s] = 3; + min_alignment[s] = MAX2(3, min_alignment[s]); } } @@ -514,7 +514,7 @@ allocate_registers(compiler_context *ctx, bool *spilled) unsigned size = nir_alu_type_get_type_size(ins->src_types[v]); if (s < ctx->temp_count) - min_alignment[s] = (size == 64) ? 3 : 2; + min_alignment[s] = MAX2((size == 64) ? 3 : 2, min_alignment[s]); } } @@ -537,10 +537,11 @@ allocate_registers(compiler_context *ctx, bool *spilled) found_class[dest] = MAX2(found_class[dest], bytes); min_alignment[dest] = - (size == 16) ? 1 : /* (1 << 1) = 2-byte */ - (size == 32) ? 2 : /* (1 << 2) = 4-byte */ - (size == 64) ? 3 : /* (1 << 3) = 8-byte */ - 3; /* 8-bit todo */ + MAX2(min_alignment[dest], + (size == 16) ? 1 : /* (1 << 1) = 2-byte */ + (size == 32) ? 2 : /* (1 << 2) = 4-byte */ + (size == 64) ? 3 : /* (1 << 3) = 8-byte */ + 3); /* 8-bit todo */ /* We can't cross xy/zw boundaries. TODO: vec8 can */ if (size == 16 && min_alignment[dest] != 4)