* Eliminate the LiveVarSet class, making applyTranferFuncForMInst a static
function in the one .cpp file that uses it. Use ValueSet's instead.
* Prepare to delete LiveVarSet.h & LiveVarSet.cpp
* Eliminate the ValueSet class, making all old member functions into global
templates that will eventually be moved to Support.
* Eliminate some irrelevant const's
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1712 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/RegAlloc/InterferenceGraph.cpp b/lib/CodeGen/RegAlloc/InterferenceGraph.cpp
index a366c11..c90ae4a 100644
--- a/lib/CodeGen/RegAlloc/InterferenceGraph.cpp
+++ b/lib/CodeGen/RegAlloc/InterferenceGraph.cpp
@@ -133,8 +133,8 @@
// LiveRangeInfo::unionAndUpdateLRs for that purpose.
//----------------------------------------------------------------------------
-void InterferenceGraph::mergeIGNodesOfLRs(const LiveRange *const LR1,
- LiveRange *const LR2 ) {
+void InterferenceGraph::mergeIGNodesOfLRs(const LiveRange *LR1,
+ LiveRange *LR2) {
assert( LR1 != LR2); // cannot merge the same live range
@@ -145,8 +145,8 @@
assertIGNode( SrcNode );
if( DEBUG_RA > 1) {
- cerr << "Merging LRs: \""; LR1->printSet();
- cerr << "\" and \""; LR2->printSet();
+ cerr << "Merging LRs: \""; printSet(*LR1);
+ cerr << "\" and \""; printSet(*LR2);
cerr << "\"\n";
}
@@ -236,7 +236,7 @@
if (Node) {
cerr << " [" << Node->getIndex() << "] ";
- Node->getParentLR()->printSet();
+ printSet(*Node->getParentLR());
//int Deg = Node->getCurDegree();
cerr << "\t <# of Neighs: " << Node->getNumOfNeighbors() << ">\n";
}
diff --git a/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp b/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp
index 590c88f..aef8431 100644
--- a/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp
+++ b/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp
@@ -12,7 +12,7 @@
LiveRangeInfo::LiveRangeInfo(const Method *const M,
const TargetMachine& tm,
std::vector<RegClass *> &RCL)
- : Meth(M), LiveRangeMap(), TM(tm),
+ : Meth(M), TM(tm),
RegClassList(RCL), MRI(tm.getRegInfo())
{ }
@@ -48,18 +48,16 @@
// Note: the caller must make sure that L1 and L2 are distinct and both
// LRs don't have suggested colors
//---------------------------------------------------------------------------
-void LiveRangeInfo::unionAndUpdateLRs(LiveRange *const L1, LiveRange *L2)
-{
- assert( L1 != L2);
- L1->setUnion( L2 ); // add elements of L2 to L1
- ValueSet::iterator L2It;
- for( L2It = L2->begin() ; L2It != L2->end(); ++L2It) {
+void LiveRangeInfo::unionAndUpdateLRs(LiveRange *L1, LiveRange *L2) {
+ assert(L1 != L2 && (!L1->hasSuggestedColor() || !L2->hasSuggestedColor()));
+ set_union(*L1, *L2); // add elements of L2 to L1
+ for(ValueSet::iterator L2It = L2->begin(); L2It != L2->end(); ++L2It) {
//assert(( L1->getTypeID() == L2->getTypeID()) && "Merge:Different types");
L1->insert(*L2It); // add the var in L2 to L1
- LiveRangeMap[ *L2It ] = L1; // now the elements in L2 should map
+ LiveRangeMap[*L2It] = L1; // now the elements in L2 should map
//to L1
}
@@ -69,15 +67,15 @@
// must have the same color.
if(L2->hasSuggestedColor())
- L1->setSuggestedColor( L2->getSuggestedColor() );
+ L1->setSuggestedColor(L2->getSuggestedColor());
- if( L2->isCallInterference() )
+ if (L2->isCallInterference())
L1->setCallInterference();
-
- L1->addSpillCost( L2->getSpillCost() ); // add the spill costs
-
+ // add the spill costs
+ L1->addSpillCost(L2->getSpillCost());
+
delete L2; // delete L2 as it is no longer needed
}
@@ -394,7 +392,7 @@
for( ; HMI != LiveRangeMap.end(); ++HMI) {
if (HMI->first && HMI->second) {
cerr << " " << RAV(HMI->first) << "\t: ";
- HMI->second->printSet(); cerr << "\n";
+ printSet(*HMI->second); cerr << "\n";
}
}
}
diff --git a/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp b/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
index 90de8b9..938ab1b 100644
--- a/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
+++ b/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
@@ -15,7 +15,7 @@
#include "llvm/CodeGen/MachineInstr.h"
#include "llvm/CodeGen/MachineCodeForMethod.h"
#include "llvm/Analysis/LiveVar/MethodLiveVarInfo.h"
-#include "llvm/Analysis/LiveVar/LiveVarSet.h"
+#include "llvm/Analysis/LiveVar/ValueSet.h"
#include "llvm/Analysis/LoopInfo.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/MachineFrameInfo.h"
@@ -151,11 +151,11 @@
// class as that of live var. The live var passed to this function is the
// LVset AFTER the instruction
//----------------------------------------------------------------------------
-void PhyRegAlloc::addInterference(const Value *const Def,
- const LiveVarSet *const LVSet,
- const bool isCallInst) {
+void PhyRegAlloc::addInterference(const Value *Def,
+ const ValueSet *LVSet,
+ bool isCallInst) {
- LiveVarSet::const_iterator LIt = LVSet->begin();
+ ValueSet::const_iterator LIt = LVSet->begin();
// get the live range of instruction
//
@@ -207,7 +207,7 @@
//----------------------------------------------------------------------------
void PhyRegAlloc::setCallInterferences(const MachineInstr *MInst,
- const LiveVarSet *const LVSetAft ) {
+ const ValueSet *LVSetAft) {
// Now find the LR of the return value of the call
// We do this because, we look at the LV set *after* the instruction
@@ -226,7 +226,7 @@
if( DEBUG_RA)
cerr << "\n For call inst: " << *MInst;
- LiveVarSet::const_iterator LIt = LVSetAft->begin();
+ ValueSet::const_iterator LIt = LVSetAft->begin();
// for each live var in live variable set after machine inst
//
@@ -238,7 +238,7 @@
if( LR && DEBUG_RA) {
cerr << "\n\tLR Aft Call: ";
- LR->printSet();
+ printSet(*LR);
}
@@ -249,7 +249,7 @@
LR->setCallInterference();
if( DEBUG_RA) {
cerr << "\n ++Added call interf for LR: " ;
- LR->printSet();
+ printSet(*LR);
}
}
@@ -293,8 +293,7 @@
// get the LV set after the instruction
//
- const LiveVarSet *const LVSetAI =
- LVI->getLiveVarSetAfterMInst(MInst, *BBI);
+ const ValueSet *LVSetAI = LVI->getLiveVarSetAfterMInst(MInst, *BBI);
const bool isCallInst = TM.getInstrInfo().isCall(MInst->getOpCode());
@@ -416,15 +415,14 @@
//----------------------------------------------------------------------------
// This method will add interferences for incoming arguments to a method.
//----------------------------------------------------------------------------
-void PhyRegAlloc::addInterferencesForArgs()
-{
- // get the InSet of root BB
- const LiveVarSet *const InSet = LVI->getInSetOfBB( Meth->front() );
+void PhyRegAlloc::addInterferencesForArgs() {
+ // get the InSet of root BB
+ const ValueSet *InSet = LVI->getInSetOfBB(Meth->front());
- // get the argument list
+ // get the argument list
const Method::ArgumentListType& ArgList = Meth->getArgumentList();
- // get an iterator to arg list
+ // get an iterator to arg list
Method::ArgumentListType::const_iterator ArgIt = ArgList.begin();
@@ -683,7 +681,7 @@
unsigned RegType = MRI.getRegType( LR );
int SpillOff = LR->getSpillOffFromFP();
RegClass *RC = LR->getRegClass();
- const LiveVarSet *LVSetBef = LVI->getLiveVarSetBeforeMInst(MInst, BB);
+ const ValueSet *LVSetBef = LVI->getLiveVarSetBeforeMInst(MInst, BB);
mcInfo.pushTempValue(TM, MRI.getSpilledRegSize(RegType) );
@@ -715,10 +713,7 @@
if(MIAft)
AI->InstrnsAfter.push_front(MIAft);
-
- }
- else { // if this is a Def
-
+ } else { // if this is a Def
// for a DEF, we have to store the value produced by this instruction
// on the stack position allocated for this LR
@@ -736,22 +731,17 @@
} // if !DEF
cerr << "\nFor Inst " << *MInst;
- cerr << " - SPILLED LR: "; LR->printSet();
+ cerr << " - SPILLED LR: "; printSet(*LR);
cerr << "\n - Added Instructions:";
- if( MIBef ) cerr << *MIBef;
+ if (MIBef) cerr << *MIBef;
cerr << *AdIMid;
- if( MIAft ) cerr << *MIAft;
+ if (MIAft) cerr << *MIAft;
- Op.setRegForValue( TmpRegU ); // set the opearnd
-
-
+ Op.setRegForValue(TmpRegU); // set the opearnd
}
-
-
-
//----------------------------------------------------------------------------
// We can use the following method to get a temporary register to be used
// BEFORE any given machine instruction. If there is a register available,
@@ -764,7 +754,7 @@
int PhyRegAlloc::getUsableUniRegAtMI(RegClass *RC,
const int RegType,
const MachineInstr *MInst,
- const LiveVarSet *LVSetBef,
+ const ValueSet *LVSetBef,
MachineInstr *MIBef,
MachineInstr *MIAft) {
@@ -801,7 +791,7 @@
//----------------------------------------------------------------------------
int PhyRegAlloc::getUnusedUniRegAtMI(RegClass *RC,
const MachineInstr *MInst,
- const LiveVarSet *LVSetBef) {
+ const ValueSet *LVSetBef) {
unsigned NumAvailRegs = RC->getNumOfAvailRegs();
@@ -810,7 +800,7 @@
for(unsigned i=0; i < NumAvailRegs; i++) // Reset array
IsColorUsedArr[i] = false;
- LiveVarSet::const_iterator LIt = LVSetBef->begin();
+ ValueSet::const_iterator LIt = LVSetBef->begin();
// for each live var in live variable set after machine inst
for( ; LIt != LVSetBef->end(); ++LIt) {