[llvm-commits] CVS: llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp SchedGraph.cpp
Misha Brukman
brukman at cs.uiuc.edu
Thu May 22 16:25:01 PDT 2003
Changes in directory llvm/lib/CodeGen/InstrSched:
InstrScheduling.cpp updated: 1.51 -> 1.52
SchedGraph.cpp updated: 1.41 -> 1.42
---
Log message:
Kill `using' directives.
---
Diffs of the changes:
Index: llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
diff -u llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp:1.51 llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp:1.52
--- llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp:1.51 Tue Jan 14 17:05:03 2003
+++ llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp Thu May 22 16:24:35 2003
@@ -14,8 +14,6 @@
#include "llvm/BasicBlock.h"
#include "Support/CommandLine.h"
#include <algorithm>
-using std::cerr;
-using std::vector;
SchedDebugLevel_t SchedDebugLevel;
@@ -64,7 +62,7 @@
/*ctor*/ InstrGroup(); // disable: DO NOT IMPLEMENT
private:
- vector<const SchedGraphNode*> group;
+ std::vector<const SchedGraphNode*> group;
};
@@ -130,8 +128,8 @@
private:
const unsigned int nslots;
unsigned int numInstr;
- vector<InstrGroup*> groups; // indexed by cycle number
- vector<cycles_t> startTime; // indexed by node id
+ std::vector<InstrGroup*> groups; // indexed by cycle number
+ std::vector<cycles_t> startTime; // indexed by node id
public: // iterators
typedef ScheduleIterator<SchedGraphNode> iterator;
@@ -300,7 +298,7 @@
private:
const SchedGraphNode* brNode;
unsigned int ndelays;
- vector<const SchedGraphNode*> delayNodeVec;
+ std::vector<const SchedGraphNode*> delayNodeVec;
cycles_t delayedNodeCycle;
unsigned int delayedNodeSlotNum;
@@ -314,7 +312,7 @@
return ndelays;
}
- inline const vector<const SchedGraphNode*>& getDelayNodeVec() {
+ inline const std::vector<const SchedGraphNode*>& getDelayNodeVec() {
return delayNodeVec;
}
@@ -349,10 +347,11 @@
unsigned int totalInstrCount;
cycles_t curTime;
cycles_t nextEarliestIssueTime; // next cycle we can issue
- vector<hash_set<const SchedGraphNode*> > choicesForSlot; // indexed by slot#
- vector<const SchedGraphNode*> choiceVec; // indexed by node ptr
- vector<int> numInClass; // indexed by sched class
- vector<cycles_t> nextEarliestStartTime; // indexed by opCode
+ // indexed by slot#
+ std::vector<hash_set<const SchedGraphNode*> > choicesForSlot;
+ std::vector<const SchedGraphNode*> choiceVec; // indexed by node ptr
+ std::vector<int> numInClass; // indexed by sched class
+ std::vector<cycles_t> nextEarliestStartTime; // indexed by opCode
hash_map<const SchedGraphNode*, DelaySlotInfo*> delaySlotInfoForBranches;
// indexed by branch node ptr
@@ -987,15 +986,15 @@
{
for (cycles_t c = firstCycle; c <= S.getTime(); c++)
{
- cerr << " Cycle " << (long)c << " : Scheduled instructions:\n";
+ std::cerr << " Cycle " << (long)c <<" : Scheduled instructions:\n";
const InstrGroup* igroup = S.isched.getIGroup(c);
for (unsigned int s=0; s < S.nslots; s++)
{
- cerr << " ";
+ std::cerr << " ";
if ((*igroup)[s] != NULL)
- cerr << * ((*igroup)[s])->getMachineInstr() << "\n";
+ std::cerr << * ((*igroup)[s])->getMachineInstr() << "\n";
else
- cerr << "<none>\n";
+ std::cerr << "<none>\n";
}
}
}
@@ -1141,7 +1140,7 @@
void
FindUsefulInstructionsForDelaySlots(SchedulingManager& S,
SchedGraphNode* brNode,
- vector<SchedGraphNode*>& sdelayNodeVec)
+ std::vector<SchedGraphNode*>& sdelayNodeVec)
{
const TargetInstrInfo& mii = S.getInstrInfo();
unsigned ndelays =
@@ -1155,7 +1154,7 @@
// Use a separate vector to hold the feasible multi-cycle nodes.
// These will be used if not enough single-cycle nodes are found.
//
- vector<SchedGraphNode*> mdelayNodeVec;
+ std::vector<SchedGraphNode*> mdelayNodeVec;
for (sg_pred_iterator P = pred_begin(brNode);
P != pred_end(brNode) && sdelayNodeVec.size() < ndelays; ++P)
@@ -1203,10 +1202,10 @@
//
static void ReplaceNopsWithUsefulInstr(SchedulingManager& S,
SchedGraphNode* node,
- vector<SchedGraphNode*> sdelayNodeVec,
+ std::vector<SchedGraphNode*> sdelayNodeVec,
SchedGraph* graph)
{
- vector<SchedGraphNode*> nopNodeVec; // this will hold unused NOPs
+ std::vector<SchedGraphNode*> nopNodeVec; // this will hold unused NOPs
const TargetInstrInfo& mii = S.getInstrInfo();
const MachineInstr* brInstr = node->getMachineInstr();
unsigned ndelays= mii.getNumDelaySlots(brInstr->getOpCode());
@@ -1287,7 +1286,7 @@
Instruction *termInstr = (Instruction*)MBB.getBasicBlock()->getTerminator();
MachineCodeForInstruction &termMvec=MachineCodeForInstruction::get(termInstr);
- vector<SchedGraphNode*> delayNodeVec;
+ std::vector<SchedGraphNode*> delayNodeVec;
const MachineInstr* brInstr = NULL;
if (termInstr->getOpcode() != Instruction::Ret)
@@ -1510,7 +1509,7 @@
if (SchedDebugLevel >= Sched_PrintSchedGraphs)
{
- cerr << "\n*** SCHEDULING GRAPHS FOR INSTRUCTION SCHEDULING\n";
+ std::cerr << "\n*** SCHEDULING GRAPHS FOR INSTRUCTION SCHEDULING\n";
graphSet.dump();
}
@@ -1521,7 +1520,7 @@
MachineBasicBlock &MBB = graph->getBasicBlock();
if (SchedDebugLevel >= Sched_PrintSchedTrace)
- cerr << "\n*** TRACE OF INSTRUCTION SCHEDULING OPERATIONS\n\n";
+ std::cerr << "\n*** TRACE OF INSTRUCTION SCHEDULING OPERATIONS\n\n";
// expensive!
SchedPriorities schedPrio(&F, graph, getAnalysis<FunctionLiveVarInfo>());
@@ -1534,7 +1533,7 @@
if (SchedDebugLevel >= Sched_PrintMachineCode)
{
- cerr << "\n*** Machine instructions after INSTRUCTION SCHEDULING\n";
+ std::cerr << "\n*** Machine instructions after INSTRUCTION SCHEDULING\n";
MachineFunction::get(&F).dump();
}
Index: llvm/lib/CodeGen/InstrSched/SchedGraph.cpp
diff -u llvm/lib/CodeGen/InstrSched/SchedGraph.cpp:1.41 llvm/lib/CodeGen/InstrSched/SchedGraph.cpp:1.42
--- llvm/lib/CodeGen/InstrSched/SchedGraph.cpp:1.41 Tue Jan 14 15:58:42 2003
+++ llvm/lib/CodeGen/InstrSched/SchedGraph.cpp Thu May 22 16:24:35 2003
@@ -18,18 +18,15 @@
#include "Support/StringExtras.h"
#include "Support/STLExtras.h"
-using std::vector;
-using std::pair;
-using std::cerr;
-
//*********************** Internal Data Structures *************************/
// The following two types need to be classes, not typedefs, so we can use
// opaque declarations in SchedGraph.h
//
-struct RefVec: public vector<pair<SchedGraphNode*, int> > {
- typedef vector< pair<SchedGraphNode*, int> >:: iterator iterator;
- typedef vector< pair<SchedGraphNode*, int> >::const_iterator const_iterator;
+struct RefVec: public std::vector<std::pair<SchedGraphNode*, int> > {
+ typedef std::vector<std::pair<SchedGraphNode*,int> >::iterator iterator;
+ typedef
+ std::vector<std::pair<SchedGraphNode*,int> >::const_iterator const_iterator;
};
struct RegToRefVecMap: public hash_map<int, RefVec> {
@@ -126,7 +123,7 @@
}
void SchedGraphEdge::dump(int indent) const {
- cerr << std::string(indent*2, ' ') << *this;
+ std::cerr << std::string(indent*2, ' ') << *this;
}
@@ -160,7 +157,7 @@
}
void SchedGraphNode::dump(int indent) const {
- cerr << std::string(indent*2, ' ') << *this;
+ std::cerr << std::string(indent*2, ' ') << *this;
}
@@ -229,20 +226,20 @@
void
SchedGraph::dump() const
{
- cerr << " Sched Graph for Basic Block: ";
- cerr << MBB.getBasicBlock()->getName()
- << " (" << MBB.getBasicBlock() << ")";
+ std::cerr << " Sched Graph for Basic Block: ";
+ std::cerr << MBB.getBasicBlock()->getName()
+ << " (" << MBB.getBasicBlock() << ")";
- cerr << "\n\n Actual Root nodes : ";
+ std::cerr << "\n\n Actual Root nodes : ";
for (unsigned i=0, N=graphRoot->outEdges.size(); i < N; i++)
- cerr << graphRoot->outEdges[i]->getSink()->getNodeId()
- << ((i == N-1)? "" : ", ");
+ std::cerr << graphRoot->outEdges[i]->getSink()->getNodeId()
+ << ((i == N-1)? "" : ", ");
- cerr << "\n Graph Nodes:\n";
+ std::cerr << "\n Graph Nodes:\n";
for (const_iterator I=begin(); I != end(); ++I)
- cerr << "\n" << *I->second;
+ std::cerr << "\n" << *I->second;
- cerr << "\n";
+ std::cerr << "\n";
}
@@ -431,7 +428,7 @@
// latency does not otherwise matter (true dependences enforce that).
//
void
-SchedGraph::addMemEdges(const vector<SchedGraphNode*>& memNodeVec,
+SchedGraph::addMemEdges(const std::vector<SchedGraphNode*>& memNodeVec,
const TargetMachine& target)
{
const TargetInstrInfo& mii = target.getInstrInfo();
@@ -467,12 +464,12 @@
// like with control dependences.
//
void
-SchedGraph::addCallCCEdges(const vector<SchedGraphNode*>& memNodeVec,
+SchedGraph::addCallCCEdges(const std::vector<SchedGraphNode*>& memNodeVec,
MachineBasicBlock& bbMvec,
const TargetMachine& target)
{
const TargetInstrInfo& mii = target.getInstrInfo();
- vector<SchedGraphNode*> callNodeVec;
+ std::vector<SchedGraphNode*> callNodeVec;
// Find the call instruction nodes and put them in a vector.
for (unsigned im=0, NM=memNodeVec.size(); im < NM; im++)
@@ -671,7 +668,7 @@
void
SchedGraph::findDefUseInfoAtInstr(const TargetMachine& target,
SchedGraphNode* node,
- vector<SchedGraphNode*>& memNodeVec,
+ std::vector<SchedGraphNode*>& memNodeVec,
RegToRefVecMap& regToRefVecMap,
ValueToDefVecMap& valueToDefVecMap)
{
@@ -728,7 +725,7 @@
void
SchedGraph::buildNodesForBB(const TargetMachine& target,
MachineBasicBlock& MBB,
- vector<SchedGraphNode*>& memNodeVec,
+ std::vector<SchedGraphNode*>& memNodeVec,
RegToRefVecMap& regToRefVecMap,
ValueToDefVecMap& valueToDefVecMap)
{
@@ -761,7 +758,7 @@
// We use this to add memory dependence edges without a second full walk.
//
// vector<const Instruction*> memVec;
- vector<SchedGraphNode*> memNodeVec;
+ std::vector<SchedGraphNode*> memNodeVec;
// Use this data structure to note any uses or definitions of
// machine registers so we can add edges for those later without
@@ -858,14 +855,14 @@
void
SchedGraphSet::dump() const
{
- cerr << "======== Sched graphs for function `" << method->getName()
- << "' ========\n\n";
+ std::cerr << "======== Sched graphs for function `" << method->getName()
+ << "' ========\n\n";
for (const_iterator I=begin(); I != end(); ++I)
(*I)->dump();
- cerr << "\n====== End graphs for function `" << method->getName()
- << "' ========\n\n";
+ std::cerr << "\n====== End graphs for function `" << method->getName()
+ << "' ========\n\n";
}
More information about the llvm-commits
mailing list