Tidy up ScheduleNodeBottomUp methods, and make them more

consistent with ScheduleNodeTopDown methods.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@59550 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp b/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp
index def8868da95460b3232cddd09846836ab7c24e70..0af03580f6641e3cf7f5df8c942fb26fc7949def 100644 (file)
--- a/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp
+++ b/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp
@@ -161,7 +161,9 @@ void ScheduleDAGFast::ReleasePred(SUnit *SU, SUnit *PredSU, bool isChain) {
 void ScheduleDAGFast::ScheduleNodeBottomUp(SUnit *SU, unsigned CurCycle) {
   DOUT << "*** Scheduling [" << CurCycle << "]: ";
   DEBUG(SU->dump(this));
+
   SU->Cycle = CurCycle;
+  Sequence.push_back(SU);
 
   // Bottom up: release predecessors
   for (SUnit::pred_iterator I = SU->Preds.begin(), E = SU->Preds.end();
@@ -589,10 +591,8 @@ void ScheduleDAGFast::ListScheduleBottomUp() {
 
     if (!CurSU)
       Sequence.push_back(0);
-    else {
+    else
       ScheduleNodeBottomUp(CurSU, CurCycle);
-      Sequence.push_back(CurSU);
-    }
     ++CurCycle;
   }
 

diff --git a/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp b/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
index 7cec092c0219ba16ff3791f38fe4914017cc4405..90471551f4331e0e0ae24c3fb9927c2c65e1cb4c 100644 (file)
--- a/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
+++ b/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
@@ -302,9 +302,9 @@ void ScheduleDAGRRList::ReleasePred(SUnit *SU, SUnit *PredSU, bool isChain) {
 void ScheduleDAGRRList::ScheduleNodeBottomUp(SUnit *SU, unsigned CurCycle) {
   DOUT << "*** Scheduling [" << CurCycle << "]: ";
   DEBUG(SU->dump(this));
-  SU->Cycle = CurCycle;
 
-  AvailableQueue->ScheduledNode(SU);
+  SU->Cycle = CurCycle;
+  Sequence.push_back(SU);
 
   // Bottom up: release predecessors
   for (SUnit::pred_iterator I = SU->Preds.begin(), E = SU->Preds.end();
@@ -339,6 +339,7 @@ void ScheduleDAGRRList::ScheduleNodeBottomUp(SUnit *SU, unsigned CurCycle) {
   }
 
   SU->isScheduled = true;
+  AvailableQueue->ScheduledNode(SU);
 }
 
 /// CapturePred - This does the opposite of ReleasePred. Since SU is being
@@ -1060,10 +1061,8 @@ void ScheduleDAGRRList::ListScheduleBottomUp() {
 
     if (!CurSU)
       Sequence.push_back(0);
-    else {
+    else
       ScheduleNodeBottomUp(CurSU, CurCycle);
-      Sequence.push_back(CurSU);
-    }
     ++CurCycle;
   }
 
@@ -1193,9 +1192,8 @@ void ScheduleDAGRRList::ListScheduleTopDown() {
 
     if (!CurSU)
       Sequence.push_back(0);
-    else {
+    else
       ScheduleNodeTopDown(CurSU, CurCycle);
-    }
     ++CurCycle;
   }