[llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp ScheduleDAGList.cpp

[Chris Lattner]

Changes in directory llvm/lib/CodeGen/SelectionDAG:

ScheduleDAG.cpp updated: 1.75 -> 1.76
ScheduleDAGList.cpp updated: 1.39 -> 1.40
---
Log message:

Make EmitNode take a SDNode instead of a NodeInfo*


---
Diffs of the changes:  (+6 -12)

 ScheduleDAG.cpp     |    7 +++----
 ScheduleDAGList.cpp |   11 +++--------
 2 files changed, 6 insertions(+), 12 deletions(-)


Index: llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.75 llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.76
--- llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.75	Fri Mar 10 01:25:12 2006
+++ llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp	Fri Mar 10 01:28:36 2006
@@ -202,10 +202,9 @@
 
 /// EmitNode - Generate machine code for an node and needed dependencies.
 ///
-void ScheduleDAG::EmitNode(NodeInfo *NI, 
+void ScheduleDAG::EmitNode(SDNode *Node, 
                            std::map<SDNode*, unsigned> &VRBaseMap) {
   unsigned VRBase = 0;                 // First virtual register for node
-  SDNode *Node = NI->Node;
   
   // If machine instruction
   if (Node->isTargetOpcode()) {
@@ -396,9 +395,9 @@
     NodeInfo *NI = Ordering[i];
     if (NI->isInGroup()) {
       NodeGroupIterator NGI(Ordering[i]);
-      while (NodeInfo *NI = NGI.next()) EmitNode(NI, VRBaseMap);
+      while (NodeInfo *NI = NGI.next()) EmitNode(NI->Node, VRBaseMap);
     } else {
-      EmitNode(NI, VRBaseMap);
+      EmitNode(NI->Node, VRBaseMap);
     }
   }
 }


Index: llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp:1.39 llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp:1.40
--- llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp:1.39	Fri Mar 10 01:25:12 2006
+++ llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp	Fri Mar 10 01:28:36 2006
@@ -613,11 +613,9 @@
   std::map<SDNode*, unsigned> VRBaseMap;
   for (unsigned i = 0, e = Sequence.size(); i != e; i++) {
     if (SUnit *SU = Sequence[i]) {
-      for (unsigned j = 0, ee = SU->FlaggedNodes.size(); j != ee; j++) {
-        SDNode *N = SU->FlaggedNodes[j];
-        EmitNode(getNI(N), VRBaseMap);
-      }
-      EmitNode(getNI(SU->Node), VRBaseMap);
+      for (unsigned j = 0, ee = SU->FlaggedNodes.size(); j != ee; j++)
+        EmitNode(SU->FlaggedNodes[j], VRBaseMap);
+      EmitNode(SU->Node, VRBaseMap);
     } else {
       // Null SUnit* is a noop.
       EmitNoop();
@@ -641,9 +639,6 @@
 void ScheduleDAGList::Schedule() {
   DEBUG(std::cerr << "********** List Scheduling **********\n");
 
-  // Set up minimum info for scheduling
-  PrepareNodeInfo();
-  
   // Build scheduling units.
   BuildSchedUnits();