diff options
author | Rhys Perry <[email protected]> | 2019-11-11 14:15:04 +0000 |
---|---|---|
committer | Rhys Perry <[email protected]> | 2019-11-15 17:36:21 +0000 |
commit | b062b92ab1a6504772a63a6b44f89b4579aef9a3 (patch) | |
tree | e1577b6fe49706bb97812f49ecb59c95621fefd4 | |
parent | d7b0d9a8d8a5a7f3b26a30c8e7005c2fb3f2f4af (diff) |
aco: don't combine literals into v_cndmask_b32/v_subb/v_addc
No pipeline-db changes
Signed-off-by: Rhys Perry <[email protected]>
Fixes: 93c8ebfa ('aco: Initial commit of independent AMD compiler')
Reviewed-by: Daniel Schürmann <[email protected]>
-rw-r--r-- | src/amd/compiler/aco_optimizer.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/amd/compiler/aco_optimizer.cpp b/src/amd/compiler/aco_optimizer.cpp index d3b35761704..5b4fcf75126 100644 --- a/src/amd/compiler/aco_optimizer.cpp +++ b/src/amd/compiler/aco_optimizer.cpp @@ -481,6 +481,12 @@ bool can_accept_constant(aco_ptr<Instruction>& instr, unsigned operand) bool valu_can_accept_literal(opt_ctx& ctx, aco_ptr<Instruction>& instr, unsigned operand) { + /* instructions like v_cndmask_b32 can't take a literal because they always + * read SGPRs */ + if (instr->operands.size() >= 3 && + instr->operands[2].isTemp() && instr->operands[2].regClass().type() == RegType::sgpr) + return false; + // TODO: VOP3 can take a literal on GFX10 return !instr->isSDWA() && !instr->isDPP() && !instr->isVOP3() && operand == 0 && can_accept_constant(instr, operand); |