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

[Evan Cheng]

Changes in directory llvm/lib/CodeGen/SelectionDAG:

ScheduleDAGList.cpp updated: 1.17 -> 1.18
---
Log message:

Remove some code that doesn't make sense

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

 ScheduleDAGList.cpp |   17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)


Index: llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp:1.17 llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp:1.18
--- llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp:1.17	Mon Mar  6 00:08:54 2006
+++ llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp	Mon Mar  6 01:31:44 2006
@@ -120,8 +120,6 @@
 /// Sorting functions for the Available queue.
 struct ls_rr_sort : public std::binary_function<SUnit*, SUnit*, bool> {
   bool operator()(const SUnit* left, const SUnit* right) const {
-    bool LFloater = (left ->Preds.size() == 0);
-    bool RFloater = (right->Preds.size() == 0);
     int LBonus = (int)left ->isDefNUseOperand;
     int RBonus = (int)right->isDefNUseOperand;
 
@@ -144,19 +142,14 @@
     int LPriority2 = left ->SethiUllman + LBonus;
     int RPriority2 = right->SethiUllman + RBonus;
 
-    // Favor floaters (i.e. node with no non-passive predecessors):
-    // e.g. MOV32ri.
-    if (!LFloater && RFloater)
+    if (LPriority1 > RPriority1)
       return true;
-    else if (LFloater == RFloater)
-      if (LPriority1 > RPriority1)
+    else if (LPriority1 == RPriority1)
+      if (LPriority2 < RPriority2)
         return true;
-      else if (LPriority1 == RPriority1)
-        if (LPriority2 < RPriority2)
+      else if (LPriority2 == RPriority2)
+        if (left->CycleBound > right->CycleBound) 
           return true;
-        else if (LPriority2 == RPriority2)
-          if (left->CycleBound > right->CycleBound) 
-            return true;
 
     return false;
   }