diff options
| author | Andrew Trick <atrick@apple.com> | 2012-01-11 03:56:08 +0000 |
|---|---|---|
| committer | Andrew Trick <atrick@apple.com> | 2012-01-11 03:56:08 +0000 |
| commit | 08c66642d70879cc479b502c048df4f5fdeaefae (patch) | |
| tree | 32687eafef45bb74f9839dd22b230c5be5ab2e81 /lib/Target | |
| parent | bc9beda433e87988c748a729c40238df24c21ec0 (diff) | |
| download | external_llvm-08c66642d70879cc479b502c048df4f5fdeaefae.zip external_llvm-08c66642d70879cc479b502c048df4f5fdeaefae.tar.gz external_llvm-08c66642d70879cc479b502c048df4f5fdeaefae.tar.bz2 | |
ARM Ld/St Optimizer fix.
Allow LDRD to be formed from pairs with different LDR encodings. This was the original intention of the pass. Somewhere along the way, the LDR opcodes were refined which broke the optimization. We really don't care what the original opcodes are as long as they both map to the same LDRD and the immediate still fits.
Fixes rdar://10435045 ARMLoadStoreOptimization cannot handle mixed LDRi8/LDRi12
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@147922 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target')
| -rw-r--r-- | lib/Target/ARM/ARMLoadStoreOptimizer.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/Target/ARM/ARMLoadStoreOptimizer.cpp b/lib/Target/ARM/ARMLoadStoreOptimizer.cpp index 6712fb6..af6a5b8 100644 --- a/lib/Target/ARM/ARMLoadStoreOptimizer.cpp +++ b/lib/Target/ARM/ARMLoadStoreOptimizer.cpp @@ -1639,8 +1639,9 @@ bool ARMPreAllocLoadStoreOpt::RescheduleOps(MachineBasicBlock *MBB, LastOp = Op; } - unsigned Opcode = Op->getOpcode(); - if (LastOpcode && Opcode != LastOpcode) + unsigned LSMOpcode + = getLoadStoreMultipleOpcode(Op->getOpcode(), ARM_AM::ia); + if (LastOpcode && LSMOpcode != LastOpcode) break; int Offset = getMemoryOpOffset(Op); @@ -1651,7 +1652,7 @@ bool ARMPreAllocLoadStoreOpt::RescheduleOps(MachineBasicBlock *MBB, } LastOffset = Offset; LastBytes = Bytes; - LastOpcode = Opcode; + LastOpcode = LSMOpcode; if (++NumMove == 8) // FIXME: Tune this limit. break; } |