diff options
| author | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2010-11-10 23:55:56 +0000 |
|---|---|---|
| committer | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2010-11-10 23:55:56 +0000 |
| commit | e93198af07517b92f276192c974ce3a6006ce998 (patch) | |
| tree | e3fdcf02ff04ca63d5815ef52546b24d796c6310 /lib | |
| parent | 954ffff79bf2f48ac6fd8b4406fe51e3d19440e3 (diff) | |
| download | llvm-e93198af07517b92f276192c974ce3a6006ce998.tar.gz llvm-e93198af07517b92f276192c974ce3a6006ce998.tar.bz2 llvm-e93198af07517b92f276192c974ce3a6006ce998.tar.xz | |
Hook up AliasAnalysis in InlineSpiller. This is used for rematerializing
constant loads.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118741 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CodeGen/InlineSpiller.cpp | 5 | ||||
| -rw-r--r-- | lib/CodeGen/RegAllocLinearScan.cpp | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/CodeGen/InlineSpiller.cpp b/lib/CodeGen/InlineSpiller.cpp index f19b1754f7..0e8f302b6a 100644 --- a/lib/CodeGen/InlineSpiller.cpp +++ b/lib/CodeGen/InlineSpiller.cpp @@ -17,6 +17,7 @@ #include "LiveRangeEdit.h" #include "SplitKit.h" #include "VirtRegMap.h" +#include "llvm/Analysis/AliasAnalysis.h" #include "llvm/CodeGen/LiveIntervalAnalysis.h" #include "llvm/CodeGen/LiveStackAnalysis.h" #include "llvm/CodeGen/MachineDominators.h" @@ -47,6 +48,7 @@ class InlineSpiller : public Spiller { LiveStacks &lss_; MachineDominatorTree &mdt_; MachineLoopInfo &loops_; + AliasAnalysis *aa_; VirtRegMap &vrm_; MachineFrameInfo &mfi_; MachineRegisterInfo &mri_; @@ -76,6 +78,7 @@ public: lss_(pass.getAnalysis<LiveStacks>()), mdt_(pass.getAnalysis<MachineDominatorTree>()), loops_(pass.getAnalysis<MachineLoopInfo>()), + aa_(&pass.getAnalysis<AliasAnalysis>()), vrm_(vrm), mfi_(*mf.getFrameInfo()), mri_(mf.getRegInfo()), @@ -219,7 +222,7 @@ bool InlineSpiller::reMaterializeFor(MachineBasicBlock::iterator MI) { /// and trim the live ranges after. void InlineSpiller::reMaterializeAll() { // Do a quick scan of the interval values to find if any are remattable. - if (!edit_->anyRematerializable(lis_, tii_, 0)) + if (!edit_->anyRematerializable(lis_, tii_, aa_)) return; usedValues_.clear(); diff --git a/lib/CodeGen/RegAllocLinearScan.cpp b/lib/CodeGen/RegAllocLinearScan.cpp index 947a6c74bd..81b9070af2 100644 --- a/lib/CodeGen/RegAllocLinearScan.cpp +++ b/lib/CodeGen/RegAllocLinearScan.cpp @@ -15,6 +15,7 @@ #include "VirtRegMap.h" #include "VirtRegRewriter.h" #include "Spiller.h" +#include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Function.h" #include "llvm/CodeGen/CalcSpillWeights.h" #include "llvm/CodeGen/LiveIntervalAnalysis.h" @@ -193,6 +194,8 @@ namespace { virtual void getAnalysisUsage(AnalysisUsage &AU) const { AU.setPreservesCFG(); + AU.addRequired<AliasAnalysis>(); + AU.addPreserved<AliasAnalysis>(); AU.addRequired<LiveIntervals>(); AU.addPreserved<SlotIndexes>(); if (StrongPHIElim) @@ -391,6 +394,7 @@ INITIALIZE_PASS_DEPENDENCY(LiveStacks) INITIALIZE_PASS_DEPENDENCY(MachineLoopInfo) INITIALIZE_PASS_DEPENDENCY(VirtRegMap) INITIALIZE_AG_DEPENDENCY(RegisterCoalescer) +INITIALIZE_AG_DEPENDENCY(AliasAnalysis) INITIALIZE_PASS_END(RALinScan, "linearscan-regalloc", "Linear Scan Register Allocator", false, false) |