diff options
| author | Chris Lattner <sabre@nondot.org> | 2008-01-06 23:38:27 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2008-01-06 23:38:27 +0000 |
| commit | 834f1ce0312e3d00d836f9560cb63182c2c4570f (patch) | |
| tree | fa9d9d5b1ad73454fca5dd87fe5dd8b848b8bdc7 /lib/CodeGen | |
| parent | 9e7aba2739fb3edb3ddcf04c5d36c7c1cccb0581 (diff) | |
rename isLoad -> isSimpleLoad due to evan's desire to have such a predicate.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@45667 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen')
| -rw-r--r-- | lib/CodeGen/BranchFolding.cpp | 2 | ||||
| -rw-r--r-- | lib/CodeGen/LiveIntervalAnalysis.cpp | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/CodeGen/BranchFolding.cpp b/lib/CodeGen/BranchFolding.cpp index 97491628ee..151c63e373 100644 --- a/lib/CodeGen/BranchFolding.cpp +++ b/lib/CodeGen/BranchFolding.cpp @@ -353,7 +353,7 @@ static unsigned EstimateRuntime(MachineBasicBlock::iterator I, const TargetInstrDescriptor &TID = TII->get(I->getOpcode()); if (TID.Flags & M_CALL_FLAG) Time += 10; - else if (TID.Flags & (M_LOAD_FLAG|M_MAY_STORE_FLAG)) + else if (TID.isSimpleLoad() || (TID.Flags & M_MAY_STORE_FLAG)) Time += 2; else ++Time; diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp index 5c9d69a231..f32ada7503 100644 --- a/lib/CodeGen/LiveIntervalAnalysis.cpp +++ b/lib/CodeGen/LiveIntervalAnalysis.cpp @@ -618,7 +618,7 @@ bool LiveIntervals::isReMaterializable(const LiveInterval &li, const TargetInstrDescriptor *TID = MI->getInstrDescriptor(); if ((TID->Flags & M_IMPLICIT_DEF_FLAG) || tii_->isTriviallyReMaterializable(MI)) { - isLoad = TID->Flags & M_LOAD_FLAG; + isLoad = TID->isSimpleLoad(); return true; } @@ -1226,7 +1226,7 @@ addIntervalsForSpills(const LiveInterval &li, int LdSlot = 0; bool isLoadSS = DefIsReMat && tii_->isLoadFromStackSlot(ReMatDefMI, LdSlot); bool isLoad = isLoadSS || - (DefIsReMat && (ReMatDefMI->getInstrDescriptor()->Flags & M_LOAD_FLAG)); + (DefIsReMat && (ReMatDefMI->getInstrDescriptor()->isSimpleLoad())); bool IsFirstRange = true; for (LiveInterval::Ranges::const_iterator I = li.ranges.begin(), E = li.ranges.end(); I != E; ++I) { @@ -1308,7 +1308,7 @@ addIntervalsForSpills(const LiveInterval &li, int LdSlot = 0; bool isLoadSS = DefIsReMat && tii_->isLoadFromStackSlot(ReMatDefMI, LdSlot); bool isLoad = isLoadSS || - (DefIsReMat && (ReMatDefMI->getInstrDescriptor()->Flags & M_LOAD_FLAG)); + (DefIsReMat && ReMatDefMI->getInstrDescriptor()->isSimpleLoad()); rewriteInstructionsForSpills(li, TrySplit, I, ReMatOrigDefMI, ReMatDefMI, Slot, LdSlot, isLoad, isLoadSS, DefIsReMat, CanDelete, vrm, RegInfo, rc, ReMatIds, loopInfo, @@ -1423,8 +1423,7 @@ addIntervalsForSpills(const LiveInterval &li, int LdSlot = 0; bool isLoadSS = tii_->isLoadFromStackSlot(ReMatDefMI, LdSlot); // If the rematerializable def is a load, also try to fold it. - if (isLoadSS || - (ReMatDefMI->getInstrDescriptor()->Flags & M_LOAD_FLAG)) + if (isLoadSS || ReMatDefMI->getInstrDescriptor()->isSimpleLoad()) Folded = tryFoldMemoryOperand(MI, vrm, ReMatDefMI, index, Ops, isLoadSS, LdSlot, VReg); } |