Added ARM::mls for armv6t2.

[oota-llvm.git] / lib / CodeGen / ScheduleDAG.cpp

diff --git a/lib/CodeGen/ScheduleDAG.cpp b/lib/CodeGen/ScheduleDAG.cpp
index f9ec225f3eb44ef79d31946430b681aee6a0ab7a..a8452dff272b8d741898d56d76efcb4c8b9d9c0f 100644 (file)
--- a/lib/CodeGen/ScheduleDAG.cpp
+++ b/lib/CodeGen/ScheduleDAG.cpp
@@ -14,6 +14,7 @@
 
 #define DEBUG_TYPE "pre-RA-sched"
 #include "llvm/CodeGen/ScheduleDAG.h"
+#include "llvm/CodeGen/ScheduleHazardRecognizer.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetRegisterInfo.h"
@@ -21,14 +22,14 @@
 #include <climits>
 using namespace llvm;
 
-ScheduleDAG::ScheduleDAG(SelectionDAG *dag, MachineBasicBlock *bb,
-                         const TargetMachine &tm)
-  : DAG(dag), BB(bb), TM(tm), MRI(BB->getParent()->getRegInfo()) {
-  TII = TM.getInstrInfo();
-  MF  = BB->getParent();
-  TRI = TM.getRegisterInfo();
-  TLI = TM.getTargetLowering();
-  ConstPool = MF->getConstantPool();
+ScheduleDAG::ScheduleDAG(MachineFunction &mf)
+  : TM(mf.getTarget()),
+    TII(TM.getInstrInfo()),
+    TRI(TM.getRegisterInfo()),
+    TLI(TM.getTargetLowering()),
+    MF(mf), MRI(mf.getRegInfo()),
+    ConstPool(MF.getConstantPool()),
+    EntrySU(), ExitSU() {
 }
 
 ScheduleDAG::~ScheduleDAG() {}
@@ -46,9 +47,18 @@ void ScheduleDAG::dumpSchedule() const {
 
 /// Run - perform scheduling.
 ///
-void ScheduleDAG::Run() {
+void ScheduleDAG::Run(MachineBasicBlock *bb,
+                      MachineBasicBlock::iterator insertPos) {
+  BB = bb;
+  InsertPos = insertPos;
+
+  SUnits.clear();
+  Sequence.clear();
+  EntrySU = SUnit();
+  ExitSU = SUnit();
+
   Schedule();
-  
+
   DOUT << "*** Final schedule ***\n";
   DEBUG(dumpSchedule());
   DOUT << "\n";
@@ -59,8 +69,9 @@ void ScheduleDAG::Run() {
 /// specified node.
 void SUnit::addPred(const SDep &D) {
   // If this node already has this depenence, don't add a redundant one.
-  for (unsigned i = 0, e = (unsigned)Preds.size(); i != e; ++i)
-    if (Preds[i] == D)
+  for (SmallVector<SDep, 4>::const_iterator I = Preds.begin(), E = Preds.end();
+       I != E; ++I)
+    if (*I == D)
       return;
   // Now add a corresponding succ to N.
   SDep P = D;
@@ -75,10 +86,12 @@ void SUnit::addPred(const SDep &D) {
     ++NumPredsLeft;
   if (!isScheduled)
     ++N->NumSuccsLeft;
-  N->Succs.push_back(P);
   Preds.push_back(D);
-  this->setDepthDirty();
-  N->setHeightDirty();
+  N->Succs.push_back(P);
+  if (P.getLatency() != 0) {
+    this->setDepthDirty();
+    N->setHeightDirty();
+  }
 }
 
 /// removePred - This removes the specified edge as a pred of the current
@@ -103,8 +116,8 @@ void SUnit::removePred(const SDep &D) {
         }
       assert(FoundSucc && "Mismatching preds / succs lists!");
       Preds.erase(I);
-      // Update the bookkeeping;
-      if (D.getKind() == SDep::Data) {
+      // Update the bookkeeping.
+      if (P.getKind() == SDep::Data) {
         --NumPreds;
         --N->NumSuccs;
       }
@@ -112,38 +125,44 @@ void SUnit::removePred(const SDep &D) {
         --NumPredsLeft;
       if (!isScheduled)
         --N->NumSuccsLeft;
-      this->setDepthDirty();
-      N->setHeightDirty();
+      if (P.getLatency() != 0) {
+        this->setDepthDirty();
+        N->setHeightDirty();
+      }
       return;
     }
 }
 
 void SUnit::setDepthDirty() {
+  if (!isDepthCurrent) return;
   SmallVector<SUnit*, 8> WorkList;
   WorkList.push_back(this);
-  while (!WorkList.empty()) {
-    SUnit *SU = WorkList.back();
-    WorkList.pop_back();
-    if (!SU->isDepthCurrent) continue;
+  do {
+    SUnit *SU = WorkList.pop_back_val();
     SU->isDepthCurrent = false;
-    for (SUnit::const_succ_iterator I = Succs.begin(),
-         E = Succs.end(); I != E; ++I)
-      WorkList.push_back(I->getSUnit());
-  }
+    for (SUnit::const_succ_iterator I = SU->Succs.begin(),
+         E = SU->Succs.end(); I != E; ++I) {
+      SUnit *SuccSU = I->getSUnit();
+      if (SuccSU->isDepthCurrent)
+        WorkList.push_back(SuccSU);
+    }
+  } while (!WorkList.empty());
 }
 
 void SUnit::setHeightDirty() {
+  if (!isHeightCurrent) return;
   SmallVector<SUnit*, 8> WorkList;
   WorkList.push_back(this);
-  while (!WorkList.empty()) {
-    SUnit *SU = WorkList.back();
-    WorkList.pop_back();
-    if (!SU->isHeightCurrent) continue;
+  do {
+    SUnit *SU = WorkList.pop_back_val();
     SU->isHeightCurrent = false;
-    for (SUnit::const_pred_iterator I = Preds.begin(),
-         E = Preds.end(); I != E; ++I)
-      WorkList.push_back(I->getSUnit());
-  }
+    for (SUnit::const_pred_iterator I = SU->Preds.begin(),
+         E = SU->Preds.end(); I != E; ++I) {
+      SUnit *PredSU = I->getSUnit();
+      if (PredSU->isHeightCurrent)
+        WorkList.push_back(PredSU);
+    }
+  } while (!WorkList.empty());
 }
 
 /// setDepthToAtLeast - Update this node's successors to reflect the
@@ -173,7 +192,7 @@ void SUnit::setHeightToAtLeast(unsigned NewHeight) {
 void SUnit::ComputeDepth() {
   SmallVector<SUnit*, 8> WorkList;
   WorkList.push_back(this);
-  while (!WorkList.empty()) {
+  do {
     SUnit *Cur = WorkList.back();
 
     bool Done = true;
@@ -198,7 +217,7 @@ void SUnit::ComputeDepth() {
       }
       Cur->isDepthCurrent = true;
     }
-  }
+  } while (!WorkList.empty());
 }
 
 /// ComputeHeight - Calculate the maximal path from the node to the entry.
@@ -206,7 +225,7 @@ void SUnit::ComputeDepth() {
 void SUnit::ComputeHeight() {
   SmallVector<SUnit*, 8> WorkList;
   WorkList.push_back(this);
-  while (!WorkList.empty()) {
+  do {
     SUnit *Cur = WorkList.back();
 
     bool Done = true;
@@ -231,7 +250,7 @@ void SUnit::ComputeHeight() {
       }
       Cur->isHeightCurrent = true;
     }
-  }
+  } while (!WorkList.empty());
 }
 
 /// SUnit - Scheduling unit. It's an wrapper around either a single SDNode or
@@ -463,7 +482,7 @@ void ScheduleDAGTopologicalSort::DFS(const SUnit *SU, int UpperBound,
   WorkList.reserve(SUnits.size()); 
 
   WorkList.push_back(SU);
-  while (!WorkList.empty()) {
+  do {
     SU = WorkList.back();
     WorkList.pop_back();
     Visited.set(SU->NodeNum);
@@ -478,7 +497,7 @@ void ScheduleDAGTopologicalSort::DFS(const SUnit *SU, int UpperBound,
         WorkList.push_back(SU->Succs[I].getSUnit());
       } 
     } 
-  }
+  } while (!WorkList.empty());
 }
 
 /// Shift - Renumber the nodes so that the topological ordering is 
@@ -549,3 +568,5 @@ void ScheduleDAGTopologicalSort::Allocate(int n, int index) {
 ScheduleDAGTopologicalSort::ScheduleDAGTopologicalSort(
                                                      std::vector<SUnit> &sunits)
  : SUnits(sunits) {}
+
+ScheduleHazardRecognizer::~ScheduleHazardRecognizer() {}