commit 9feca8e2b5db5352038aa79e532ae5888ddfa613
author Dan Gohman <gohman@apple.com> Tue Nov 18 21:22:20 2008 +0000
committer Dan Gohman <gohman@apple.com> Tue Nov 18 21:22:20 2008 +0000
tree bfb713cdaa0a4ccd86ccdcb1071d1da952b3b663
parent bcb0ccb5ccde98258fb4fb7918b24a73b94bb3c2

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

lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp

diff --git a/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp b/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp
index def8868..0af0358 100644
--- a/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp
+++ b/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp
@@ -161,7 +161,9 @@
 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 @@
 
     if (!CurSU)
       Sequence.push_back(0);
-    else {
+    else
       ScheduleNodeBottomUp(CurSU, CurCycle);
-      Sequence.push_back(CurSU);
-    }
     ++CurCycle;
   }
 

lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp

diff --git a/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp b/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
index 7cec092..9047155 100644
--- a/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
+++ b/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
@@ -302,9 +302,9 @@
 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 @@
   }
 
   SU->isScheduled = true;
+  AvailableQueue->ScheduledNode(SU);
 }
 
 /// CapturePred - This does the opposite of ReleasePred. Since SU is being
@@ -1060,10 +1061,8 @@
 
     if (!CurSU)
       Sequence.push_back(0);
-    else {
+    else
       ScheduleNodeBottomUp(CurSU, CurCycle);
-      Sequence.push_back(CurSU);
-    }
     ++CurCycle;
   }
 
@@ -1193,9 +1192,8 @@
 
     if (!CurSU)
       Sequence.push_back(0);
-    else {
+    else
       ScheduleNodeTopDown(CurSU, CurCycle);
-    }
     ++CurCycle;
   }