diff options
| author | Matt Arsenault <Matthew.Arsenault@amd.com> | 2014-09-26 17:54:52 +0000 |
|---|---|---|
| committer | Matt Arsenault <Matthew.Arsenault@amd.com> | 2014-09-26 17:54:52 +0000 |
| commit | 5885bef6cf82ed6a2a37c700162b0949dc7748df (patch) | |
| tree | 62980b6bc4945b9015419d31cb428683bbd3f28a /llvm/lib | |
| parent | 0bea8d830e4f2eb1db9d04b3579581e09a794dc0 (diff) | |
| download | bcm5719-llvm-5885bef6cf82ed6a2a37c700162b0949dc7748df.tar.gz bcm5719-llvm-5885bef6cf82ed6a2a37c700162b0949dc7748df.zip | |
R600/SI: Don't move operands that are required to be SGPRs
e.g. v_cndmask_b32 requires the condition operand be an SGPR.
If one of the source operands were an SGPR, that would be considered
the one SGPR use and the condition operand would be illegally moved.
llvm-svn: 218529
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Target/R600/SIInstrInfo.cpp | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/llvm/lib/Target/R600/SIInstrInfo.cpp b/llvm/lib/Target/R600/SIInstrInfo.cpp index bc3f9ddf1df..b2d4a1c2f00 100644 --- a/llvm/lib/Target/R600/SIInstrInfo.cpp +++ b/llvm/lib/Target/R600/SIInstrInfo.cpp @@ -1357,8 +1357,27 @@ void SIInstrInfo::legalizeOperands(MachineInstr *MI) const { // XXX - Do any VOP3 instructions read VCC? // Legalize VOP3 if (isVOP3(MI->getOpcode())) { - int VOP3Idx[3] = {Src0Idx, Src1Idx, Src2Idx}; + const MCInstrDesc &Desc = get(MI->getOpcode()); unsigned SGPRReg = AMDGPU::NoRegister; + + int VOP3Idx[3] = { Src0Idx, Src1Idx, Src2Idx }; + + // First we need to consider the instruction's operand requirements before + // legalizing. Some operands are required to be SGPRs, but we are still + // bound by the constant bus requirement to only use one. + // + // If the operand's class is an SGPR, we can never move it. + for (unsigned i = 0; i < 3; ++i) { + int Idx = VOP3Idx[i]; + if (Idx == -1) + break; + + if (RI.isSGPRClassID(Desc.OpInfo[Idx].RegClass)) { + SGPRReg = MI->getOperand(Idx).getReg(); + break; + } + } + for (unsigned i = 0; i < 3; ++i) { int Idx = VOP3Idx[i]; if (Idx == -1) |

