From ef8abfa7908974f571786e83b047b187af0e48c7 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Mon, 16 Dec 2019 13:58:16 +0000 Subject: [PATCH] aco: disable add combining for ds_swizzle_b32 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ds_bpermute_b32/ds_permute_b32 are fine, I think Signed-off-by: Rhys Perry Fixes: 93c8ebfa780 ('aco: Initial commit of independent AMD compiler') Reviewed-by: Daniel Schürmann Part-of: --- src/amd/compiler/aco_optimizer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/amd/compiler/aco_optimizer.cpp b/src/amd/compiler/aco_optimizer.cpp index e224d1a3a5f..48a56a57f35 100644 --- a/src/amd/compiler/aco_optimizer.cpp +++ b/src/amd/compiler/aco_optimizer.cpp @@ -701,7 +701,7 @@ void label_instruction(opt_ctx &ctx, Block& block, aco_ptr& instr) DS_instruction *ds = static_cast(instr.get()); Temp base; uint32_t offset; - if (i == 0 && parse_base_offset(ctx, instr.get(), i, &base, &offset) && base.regClass() == instr->operands[i].regClass()) { + if (i == 0 && parse_base_offset(ctx, instr.get(), i, &base, &offset) && base.regClass() == instr->operands[i].regClass() && instr->opcode != aco_opcode::ds_swizzle_b32) { if (instr->opcode == aco_opcode::ds_write2_b32 || instr->opcode == aco_opcode::ds_read2_b32 || instr->opcode == aco_opcode::ds_write2_b64 || instr->opcode == aco_opcode::ds_read2_b64) { if (offset % 4 == 0 && -- 2.30.2