6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-17 21:29:20 +00:00
Code Issues Projects Releases Wiki Activity

Move some simple-sched-specific instance vars to the simple scheduler.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@26690 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2006-03-10 07:42:02 +00:00
parent 1e433c59e0
commit 2f5806c2b3
4 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/llvm/CodeGen/ScheduleDAG.h
View File

@ -284,7 +284,6 @@ namespace llvm {
class ScheduleDAG {
public:
SchedHeuristics Heuristic; // Scheduling heuristic
SelectionDAG &DAG; // DAG of the current basic block
MachineBasicBlock *BB; // Current basic block
const TargetMachine &TM; // Target processor
@ -292,38 +291,18 @@ namespace llvm {
const MRegisterInfo *MRI; // Target processor register info
SSARegMap *RegMap; // Virtual/real register map
MachineConstantPool *ConstPool; // Target constant pool
std::map<SDNode *, NodeInfo *> Map; // Map nodes to info
unsigned NodeCount; // Number of nodes in DAG
bool HasGroups; // True if there are any groups
NodeInfo *Info; // Info for nodes being scheduled
NIVector Ordering; // Emit ordering of nodes
NodeGroup *HeadNG, *TailNG; // Keep track of allocated NodeGroups
ScheduleDAG(SchedHeuristics hstc, SelectionDAG &dag, MachineBasicBlock *bb,
ScheduleDAG(SelectionDAG &dag, MachineBasicBlock *bb,
const TargetMachine &tm)
: Heuristic(hstc), DAG(dag), BB(bb), TM(tm), NodeCount(0),
HasGroups(false), Info(NULL), HeadNG(NULL), TailNG(NULL) {}
: DAG(dag), BB(bb), TM(tm) {}
virtual ~ScheduleDAG() {
if (Info)
delete[] Info;
NodeGroup *NG = HeadNG;
while (NG) {
NodeGroup *NextSU = NG->Next;
delete NG;
NG = NextSU;
}
};
/// Run - perform scheduling.
///
MachineBasicBlock *Run();
/// getNI - Returns the node info for the specified node.
///
NodeInfo *getNI(SDNode *Node) { return Map[Node]; }
/// isPassiveNode - Return true if the node is a non-scheduled leaf.
///
static bool isPassiveNode(SDNode *Node) {

3
lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
View File

@ -346,9 +346,6 @@ MachineBasicBlock *ScheduleDAG::Run() {
RegMap = BB->getParent()->getSSARegMap();
ConstPool = BB->getParent()->getConstantPool();
// Number the nodes
NodeCount = std::distance(DAG.allnodes_begin(), DAG.allnodes_end());
Schedule();
return BB;
}

2
lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp
View File

@ -189,7 +189,7 @@ public:
const TargetMachine &tm, bool isbottomup,
SchedulingPriorityQueue *priorityqueue,
HazardRecognizer *HR)
: ScheduleDAG(listSchedulingBURR, dag, bb, tm),
: ScheduleDAG(dag, bb, tm),
CurrCycle(0), isBottomUp(isbottomup),
PriorityQueue(priorityqueue), HazardRec(HR) {
}

31
lib/CodeGen/SelectionDAG/ScheduleDAGSimple.cpp
View File

@ -188,24 +188,48 @@ public:
///
class ScheduleDAGSimple : public ScheduleDAG {
private:
SchedHeuristics Heuristic; // Scheduling heuristic
ResourceTally<unsigned> Tally; // Resource usage tally
unsigned NSlots; // Total latency
static const unsigned NotFound = ~0U; // Search marker
unsigned NodeCount; // Number of nodes in DAG
std::map<SDNode *, NodeInfo *> Map; // Map nodes to info
bool HasGroups; // True if there are any groups
NodeInfo *Info; // Info for nodes being scheduled
NIVector Ordering; // Emit ordering of nodes
NodeGroup *HeadNG, *TailNG; // Keep track of allocated NodeGroups
public:
// Ctor.
ScheduleDAGSimple(SchedHeuristics hstc, SelectionDAG &dag,
MachineBasicBlock *bb, const TargetMachine &tm)
: ScheduleDAG(hstc, dag, bb, tm), Tally(), NSlots(0) {
: ScheduleDAG(dag, bb, tm), Heuristic(hstc), Tally(), NSlots(0),
NodeCount(0), HasGroups(false), Info(NULL), HeadNG(NULL), TailNG(NULL) {
assert(&TII && "Target doesn't provide instr info?");
assert(&MRI && "Target doesn't provide register info?");
}
virtual ~ScheduleDAGSimple() {};
virtual ~ScheduleDAGSimple() {
if (Info)
delete[] Info;
NodeGroup *NG = HeadNG;
while (NG) {
NodeGroup *NextSU = NG->Next;
delete NG;
NG = NextSU;
}
}
void Schedule();
/// getNI - Returns the node info for the specified node.
///
NodeInfo *getNI(SDNode *Node) { return Map[Node]; }
private:
static bool isDefiner(NodeInfo *A, NodeInfo *B);
void IncludeNode(NodeInfo *NI);
@ -826,6 +850,9 @@ void ScheduleDAGSimple::ScheduleForward() {
/// Schedule - Order nodes according to selected style.
///
void ScheduleDAGSimple::Schedule() {
// Number the nodes
NodeCount = std::distance(DAG.allnodes_begin(), DAG.allnodes_end());
// Set up minimum info for scheduling
PrepareNodeInfo();
// Construct node groups for flagged nodes