diff options
author | Philip Reames <listmail@philipreames.com> | 2019-02-26 04:30:33 +0000 |
---|---|---|
committer | Philip Reames <listmail@philipreames.com> | 2019-02-26 04:30:33 +0000 |
commit | 38b14e33a82bbaf2700dd1d1193603d2770e9624 (patch) | |
tree | 56b967c2342ea628f0649acdb0a1ca3e5bfc981c /llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp | |
parent | d2a56ac6612032e6e4446897747dc268b2b7a389 (diff) | |
download | bcm5719-llvm-38b14e33a82bbaf2700dd1d1193603d2770e9624.tar.gz bcm5719-llvm-38b14e33a82bbaf2700dd1d1193603d2770e9624.zip |
[ARM] Be super conservative about atomics
As requested during review of D57601 <https://reviews.llvm.org/D57601> https://reviews.llvm.org/D57601, be equally conservative for atomic MMOs as for volatile MMOs in all in tree backends. At the moment, all atomic MMOs are also volatile, but I'm about to change that.
Differential Revision: https://reviews.llvm.org/D58490
Note: D58498 landed in several pieces as individual backends were approved. This is the last chunk.
llvm-svn: 354845
Diffstat (limited to 'llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp')
-rw-r--r-- | llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp b/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp index 132030d0393..13b5445eaba 100644 --- a/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp +++ b/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp @@ -1580,7 +1580,9 @@ static bool isMemoryOp(const MachineInstr &MI) { const MachineMemOperand &MMO = **MI.memoperands_begin(); // Don't touch volatile memory accesses - we may be changing their order. - if (MMO.isVolatile()) + // TODO: We could allow unordered and monotonic atomics here, but we need to + // make sure the resulting ldm/stm is correctly marked as atomic. + if (MMO.isVolatile() || MMO.isAtomic()) return false; // Unaligned ldr/str is emulated by some kernels, but unaligned ldm/stm is @@ -2144,7 +2146,8 @@ ARMPreAllocLoadStoreOpt::CanFormLdStDWord(MachineInstr *Op0, MachineInstr *Op1, // At the moment, we ignore the memoryoperand's value. // If we want to use AliasAnalysis, we should check it accordingly. if (!Op0->hasOneMemOperand() || - (*Op0->memoperands_begin())->isVolatile()) + (*Op0->memoperands_begin())->isVolatile() || + (*Op0->memoperands_begin())->isAtomic()) return false; unsigned Align = (*Op0->memoperands_begin())->getAlignment(); |