diff options
| author | Tim Northover <Tim.Northover@arm.com> | 2012-09-05 18:37:53 +0000 |
|---|---|---|
| committer | Tim Northover <Tim.Northover@arm.com> | 2012-09-05 18:37:53 +0000 |
| commit | 7bebddf55ece46995f310d79195afb4e5b239886 (patch) | |
| tree | 90b2316e8ee16bbf80b7a323b1db4f52a0440fc8 /lib | |
| parent | b985e9aacdd604a5a503496a1633fa9c6ef7235c (diff) | |
| download | external_llvm-7bebddf55ece46995f310d79195afb4e5b239886.tar.gz external_llvm-7bebddf55ece46995f310d79195afb4e5b239886.tar.bz2 external_llvm-7bebddf55ece46995f310d79195afb4e5b239886.zip | |
Strip old MachineInstrs *after* we know we can put them back.
Previous patch accidentally decided it couldn't convert a VFP to a
NEON instruction after it had already destroyed the old one. Not a
good move.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@163230 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Target/ARM/ARMBaseInstrInfo.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/Target/ARM/ARMBaseInstrInfo.cpp b/lib/Target/ARM/ARMBaseInstrInfo.cpp index dc4b67a832..f8e554fcbf 100644 --- a/lib/Target/ARM/ARMBaseInstrInfo.cpp +++ b/lib/Target/ARM/ARMBaseInstrInfo.cpp @@ -3479,9 +3479,6 @@ ARMBaseInstrInfo::setExecutionDomain(MachineInstr *MI, unsigned Domain) const { DstReg = MI->getOperand(0).getReg(); SrcReg = MI->getOperand(1).getReg(); - for (unsigned i = MI->getDesc().getNumOperands(); i; --i) - MI->RemoveOperand(i-1); - DReg = getCorrespondingDRegAndLane(TRI, DstReg, Lane); // If we insert both a novel <def> and an <undef> on the DReg, we break @@ -3491,6 +3488,9 @@ ARMBaseInstrInfo::setExecutionDomain(MachineInstr *MI, unsigned Domain) const { if (!MI->definesRegister(DReg, TRI) && !MI->readsRegister(DReg, TRI)) break; + for (unsigned i = MI->getDesc().getNumOperands(); i; --i) + MI->RemoveOperand(i-1); + // Convert to %DDst = VSETLNi32 %DDst, %RSrc, Lane, 14, %noreg (; imps) // Again DDst may be undefined at the beginning of this instruction. MI->setDesc(get(ARM::VSETLNi32)); @@ -3512,9 +3512,6 @@ ARMBaseInstrInfo::setExecutionDomain(MachineInstr *MI, unsigned Domain) const { DstReg = MI->getOperand(0).getReg(); SrcReg = MI->getOperand(1).getReg(); - for (unsigned i = MI->getDesc().getNumOperands(); i; --i) - MI->RemoveOperand(i-1); - unsigned DstLane = 0, SrcLane = 0, DDst, DSrc; DDst = getCorrespondingDRegAndLane(TRI, DstReg, DstLane); DSrc = getCorrespondingDRegAndLane(TRI, SrcReg, SrcLane); @@ -3526,6 +3523,9 @@ ARMBaseInstrInfo::setExecutionDomain(MachineInstr *MI, unsigned Domain) const { if (!MI->definesRegister(DDst, TRI) && !MI->readsRegister(DDst, TRI)) break; + for (unsigned i = MI->getDesc().getNumOperands(); i; --i) + MI->RemoveOperand(i-1); + if (DSrc == DDst) { // Destination can be: // %DDst = VDUPLN32d %DDst, Lane, 14, %noreg (; implicits) |