[llvm-commits] [llvm] r161454 - /llvm/trunk/lib/CodeGen/TwoAddressInstructionPass.cpp

[Jakob Stoklund Olesen]

Author: stoklund
Date: Tue Aug  7 17:47:06 2012
New Revision: 161454

URL: http://llvm.org/viewvc/llvm-project?rev=161454&view=rev
Log:
Skip tied operand pairs that already have the same register.

Modified:
    llvm/trunk/lib/CodeGen/TwoAddressInstructionPass.cpp

Modified: llvm/trunk/lib/CodeGen/TwoAddressInstructionPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/TwoAddressInstructionPass.cpp?rev=161454&r1=161453&r2=161454&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/TwoAddressInstructionPass.cpp (original)
+++ llvm/trunk/lib/CodeGen/TwoAddressInstructionPass.cpp Tue Aug  7 17:47:06 2012
@@ -1209,27 +1209,28 @@
     if (!MI->isRegTiedToDefOperand(SrcIdx, &DstIdx))
       continue;
     AnyOps = true;
+    MachineOperand &SrcMO = MI->getOperand(SrcIdx);
+    MachineOperand &DstMO = MI->getOperand(DstIdx);
+    unsigned SrcReg = SrcMO.getReg();
+    unsigned DstReg = DstMO.getReg();
+    // Tied constraint already satisfied?
+    if (SrcReg == DstReg)
+      continue;
 
-    assert(MI->getOperand(SrcIdx).isReg() &&
-           MI->getOperand(SrcIdx).getReg() &&
-           MI->getOperand(SrcIdx).isUse() &&
-           "two address instruction invalid");
-
-    unsigned RegB = MI->getOperand(SrcIdx).getReg();
+    assert(SrcReg && SrcMO.isUse() && "two address instruction invalid");
 
     // Deal with <undef> uses immediately - simply rewrite the src operand.
-    if (MI->getOperand(SrcIdx).isUndef()) {
-      unsigned DstReg = MI->getOperand(DstIdx).getReg();
+    if (SrcMO.isUndef()) {
       // Constrain the DstReg register class if required.
       if (TargetRegisterInfo::isVirtualRegister(DstReg))
         if (const TargetRegisterClass *RC = TII->getRegClass(MCID, SrcIdx,
                                                              TRI, *MF))
           MRI->constrainRegClass(DstReg, RC);
-      MI->getOperand(SrcIdx).setReg(DstReg);
+      SrcMO.setReg(DstReg);
       DEBUG(dbgs() << "\t\trewrite undef:\t" << *MI);
       continue;
     }
-    TiedOperands[RegB].push_back(std::make_pair(SrcIdx, DstIdx));
+    TiedOperands[SrcReg].push_back(std::make_pair(SrcIdx, DstIdx));
   }
   return AnyOps;
 }