diff options
| author | Stephen Hines <srhines@google.com> | 2015-01-29 21:54:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 21:54:51 +0000 |
| commit | 4e18f8fb700656330c307f80a826823271182b01 (patch) | |
| tree | 576bd84ca2eba60f7f91c13540048e679b7470bb /lib/CodeGen/ScheduleDAGInstrs.cpp | |
| parent | 1d70b3af1c1b8f321eba07127518a71878bce7a9 (diff) | |
| parent | e5656de27822209f895cc8d3524f74c6f9f9afcb (diff) | |
| download | external_llvm-4e18f8fb700656330c307f80a826823271182b01.zip external_llvm-4e18f8fb700656330c307f80a826823271182b01.tar.gz external_llvm-4e18f8fb700656330c307f80a826823271182b01.tar.bz2 | |
am e5656de2: Merge "MISched: Fix moving stores across barriers"
* commit 'e5656de27822209f895cc8d3524f74c6f9f9afcb':
MISched: Fix moving stores across barriers
Diffstat (limited to 'lib/CodeGen/ScheduleDAGInstrs.cpp')
| -rw-r--r-- | lib/CodeGen/ScheduleDAGInstrs.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/CodeGen/ScheduleDAGInstrs.cpp b/lib/CodeGen/ScheduleDAGInstrs.cpp index d8d8422..dece643 100644 --- a/lib/CodeGen/ScheduleDAGInstrs.cpp +++ b/lib/CodeGen/ScheduleDAGInstrs.cpp @@ -920,6 +920,13 @@ void ScheduleDAGInstrs::buildSchedGraph(AliasAnalysis *AA, AliasMemDefs.clear(); AliasMemUses.clear(); } else if (MI->mayStore()) { + // Add dependence on barrier chain, if needed. + // There is no point to check aliasing on barrier event. Even if + // SU and barrier _could_ be reordered, they should not. In addition, + // we have lost all RejectMemNodes below barrier. + if (BarrierChain) + BarrierChain->addPred(SDep(SU, SDep::Barrier)); + UnderlyingObjectsVector Objs; getUnderlyingObjectsForInstr(MI, MFI, Objs); @@ -989,12 +996,6 @@ void ScheduleDAGInstrs::buildSchedGraph(AliasAnalysis *AA, adjustChainDeps(AA, MFI, SU, &ExitSU, RejectMemNodes, TrueMemOrderLatency); } - // Add dependence on barrier chain, if needed. - // There is no point to check aliasing on barrier event. Even if - // SU and barrier _could_ be reordered, they should not. In addition, - // we have lost all RejectMemNodes below barrier. - if (BarrierChain) - BarrierChain->addPred(SDep(SU, SDep::Barrier)); } else if (MI->mayLoad()) { bool MayAlias = true; if (MI->isInvariantLoad(AA)) { |