From 45d6c69b9993b8e0f1d0ca79f8ff6ec9e02b1b4e Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Tue, 24 Sep 2019 13:36:16 +0100 Subject: [PATCH] aco: use can_accept_constant in valu_can_accept_literal MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rhys Perry Reviewed-by: Daniel Schürmann --- src/amd/compiler/aco_optimizer.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/amd/compiler/aco_optimizer.cpp b/src/amd/compiler/aco_optimizer.cpp index a142ccba9a1..6d600d55254 100644 --- a/src/amd/compiler/aco_optimizer.cpp +++ b/src/amd/compiler/aco_optimizer.cpp @@ -439,12 +439,6 @@ void to_VOP3(opt_ctx& ctx, aco_ptr& instr) } } -bool valu_can_accept_literal(opt_ctx& ctx, aco_ptr& instr) -{ - // TODO: VOP3 can take a literal on GFX10 - return !instr->isSDWA() && !instr->isDPP() && !instr->isVOP3(); -} - /* only covers special cases */ bool can_accept_constant(aco_ptr& instr, unsigned operand) { @@ -473,6 +467,13 @@ bool can_accept_constant(aco_ptr& instr, unsigned operand) } } +bool valu_can_accept_literal(opt_ctx& ctx, aco_ptr& instr, unsigned operand) +{ + // TODO: VOP3 can take a literal on GFX10 + return !instr->isSDWA() && !instr->isDPP() && !instr->isVOP3() && + operand == 0 && can_accept_constant(instr, operand); +} + bool parse_base_offset(opt_ctx &ctx, Instruction* instr, unsigned op_index, Temp *base, uint32_t *offset) { Operand op = instr->operands[op_index]; @@ -2307,7 +2308,7 @@ void select_instruction(opt_ctx &ctx, aco_ptr& instr) if (ctx.uses[instr->operands[literal_idx].tempId()] == 0) instr->operands[literal_idx] = Operand(ctx.info[instr->operands[literal_idx].tempId()].val); } - } else if (instr->isVALU() && valu_can_accept_literal(ctx, instr) && + } else if (instr->isVALU() && valu_can_accept_literal(ctx, instr, 0) && instr->operands[0].isTemp() && ctx.info[instr->operands[0].tempId()].is_literal() && ctx.uses[instr->operands[0].tempId()] < threshold) { -- 2.30.2