diff options
| author | Dan Gohman <gohman@apple.com> | 2008-11-21 02:18:56 +0000 | 
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2008-11-21 02:18:56 +0000 | 
| commit | 67b35bd4d1344075ab06520e9d741d39dc59cce0 (patch) | |
| tree | ad3e1d4ac00cc63541ed83f3000855602aa89023 /llvm/lib | |
| parent | d10202bfb14cf9eff68f845fe40b10c05a541892 (diff) | |
| download | bcm5719-llvm-67b35bd4d1344075ab06520e9d741d39dc59cce0.tar.gz bcm5719-llvm-67b35bd4d1344075ab06520e9d741d39dc59cce0.zip  | |
Rename SDep's isSpecial to isArtificial, to make this field a little
less mysterious.
llvm-svn: 59782
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/CodeGen/ScheduleDAG.cpp | 4 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/ScheduleDAGPrinter.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp | 40 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp | 40 | 
4 files changed, 43 insertions, 43 deletions
diff --git a/llvm/lib/CodeGen/ScheduleDAG.cpp b/llvm/lib/CodeGen/ScheduleDAG.cpp index cf9896b3fba..046d3379a64 100644 --- a/llvm/lib/CodeGen/ScheduleDAG.cpp +++ b/llvm/lib/CodeGen/ScheduleDAG.cpp @@ -188,7 +188,7 @@ void SUnit::dumpAll(const ScheduleDAG *G) const {        else          cerr << "   val #";        cerr << I->Dep << " - SU(" << I->Dep->NodeNum << ")"; -      if (I->isSpecial) +      if (I->isArtificial)          cerr << " *";        cerr << "\n";      } @@ -202,7 +202,7 @@ void SUnit::dumpAll(const ScheduleDAG *G) const {        else          cerr << "   val #";        cerr << I->Dep << " - SU(" << I->Dep->NodeNum << ")"; -      if (I->isSpecial) +      if (I->isArtificial)          cerr << " *";        cerr << "\n";      } diff --git a/llvm/lib/CodeGen/ScheduleDAGPrinter.cpp b/llvm/lib/CodeGen/ScheduleDAGPrinter.cpp index b5d030c1b81..2f0e662c6bd 100644 --- a/llvm/lib/CodeGen/ScheduleDAGPrinter.cpp +++ b/llvm/lib/CodeGen/ScheduleDAGPrinter.cpp @@ -50,7 +50,7 @@ namespace llvm {      /// edge, override this method.      template<typename EdgeIter>      static std::string getEdgeAttributes(const void *Node, EdgeIter EI) { -      if (EI.isSpecialDep()) +      if (EI.isArtificialDep())          return "color=cyan,style=dashed";        if (EI.isCtrlDep())          return "color=blue,style=dashed"; diff --git a/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp b/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp index 5993bcd7fe6..f684c3efcfe 100644 --- a/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp @@ -80,12 +80,12 @@ public:    /// AddPred - This adds the specified node X as a predecessor of     /// the current node Y if not already.    /// This returns true if this is a new predecessor. -  bool AddPred(SUnit *Y, SUnit *X, bool isCtrl, bool isSpecial, +  bool AddPred(SUnit *Y, SUnit *X, bool isCtrl, bool isArtificial,                 unsigned PhyReg = 0, int Cost = 1);    /// RemovePred - This removes the specified node N from the predecessors of     /// the current node M. -  bool RemovePred(SUnit *M, SUnit *N, bool isCtrl, bool isSpecial); +  bool RemovePred(SUnit *M, SUnit *N, bool isCtrl, bool isArtificial);  private:    void ReleasePred(SUnit *SU, SUnit *PredSU, bool isChain); @@ -189,16 +189,16 @@ void ScheduleDAGFast::ScheduleNodeBottomUp(SUnit *SU, unsigned CurCycle) {  }  /// AddPred - adds an edge from SUnit X to SUnit Y. -bool ScheduleDAGFast::AddPred(SUnit *Y, SUnit *X, bool isCtrl, bool isSpecial, -                              unsigned PhyReg, int Cost) { -  return Y->addPred(X, isCtrl, isSpecial, PhyReg, Cost); +bool ScheduleDAGFast::AddPred(SUnit *Y, SUnit *X, bool isCtrl, +                              bool isArtificial, unsigned PhyReg, int Cost) { +  return Y->addPred(X, isCtrl, isArtificial, PhyReg, Cost);  }  /// RemovePred - This removes the specified node N from the predecessors of   /// the current node M.  bool ScheduleDAGFast::RemovePred(SUnit *M, SUnit *N,  -                                 bool isCtrl, bool isSpecial) { -  return M->removePred(N, isCtrl, isSpecial); +                                 bool isCtrl, bool isArtificial) { +  return M->removePred(N, isCtrl, isArtificial);  }  /// CopyAndMoveSuccessors - Clone the specified node and move its scheduled @@ -295,10 +295,10 @@ SUnit *ScheduleDAGFast::CopyAndMoveSuccessors(SUnit *SU) {           I != E; ++I) {        if (I->isCtrl)          ChainSuccs.push_back(SDep(I->Dep, I->Reg, I->Cost, -                                  I->isCtrl, I->isSpecial)); +                                  I->isCtrl, I->isArtificial));        else          NodeSuccs.push_back(SDep(I->Dep, I->Reg, I->Cost, -                                 I->isCtrl, I->isSpecial)); +                                 I->isCtrl, I->isArtificial));      }      if (ChainPred) { @@ -308,29 +308,29 @@ SUnit *ScheduleDAGFast::CopyAndMoveSuccessors(SUnit *SU) {      }      for (unsigned i = 0, e = LoadPreds.size(); i != e; ++i) {        SDep *Pred = &LoadPreds[i]; -      RemovePred(SU, Pred->Dep, Pred->isCtrl, Pred->isSpecial); +      RemovePred(SU, Pred->Dep, Pred->isCtrl, Pred->isArtificial);        if (isNewLoad) { -        AddPred(LoadSU, Pred->Dep, Pred->isCtrl, Pred->isSpecial, +        AddPred(LoadSU, Pred->Dep, Pred->isCtrl, Pred->isArtificial,                  Pred->Reg, Pred->Cost);        }      }      for (unsigned i = 0, e = NodePreds.size(); i != e; ++i) {        SDep *Pred = &NodePreds[i]; -      RemovePred(SU, Pred->Dep, Pred->isCtrl, Pred->isSpecial); -      AddPred(NewSU, Pred->Dep, Pred->isCtrl, Pred->isSpecial, +      RemovePred(SU, Pred->Dep, Pred->isCtrl, Pred->isArtificial); +      AddPred(NewSU, Pred->Dep, Pred->isCtrl, Pred->isArtificial,                Pred->Reg, Pred->Cost);      }      for (unsigned i = 0, e = NodeSuccs.size(); i != e; ++i) {        SDep *Succ = &NodeSuccs[i]; -      RemovePred(Succ->Dep, SU, Succ->isCtrl, Succ->isSpecial); -      AddPred(Succ->Dep, NewSU, Succ->isCtrl, Succ->isSpecial, +      RemovePred(Succ->Dep, SU, Succ->isCtrl, Succ->isArtificial); +      AddPred(Succ->Dep, NewSU, Succ->isCtrl, Succ->isArtificial,                Succ->Reg, Succ->Cost);      }      for (unsigned i = 0, e = ChainSuccs.size(); i != e; ++i) {        SDep *Succ = &ChainSuccs[i]; -      RemovePred(Succ->Dep, SU, Succ->isCtrl, Succ->isSpecial); +      RemovePred(Succ->Dep, SU, Succ->isCtrl, Succ->isArtificial);        if (isNewLoad) { -        AddPred(Succ->Dep, LoadSU, Succ->isCtrl, Succ->isSpecial, +        AddPred(Succ->Dep, LoadSU, Succ->isCtrl, Succ->isArtificial,                  Succ->Reg, Succ->Cost);        }      }  @@ -353,7 +353,7 @@ SUnit *ScheduleDAGFast::CopyAndMoveSuccessors(SUnit *SU) {    // New SUnit has the exact same predecessors.    for (SUnit::pred_iterator I = SU->Preds.begin(), E = SU->Preds.end();         I != E; ++I) -    if (!I->isSpecial) { +    if (!I->isArtificial) {        AddPred(NewSU, I->Dep, I->isCtrl, false, I->Reg, I->Cost);        NewSU->Depth = std::max(NewSU->Depth, I->Dep->Depth+1);      } @@ -363,7 +363,7 @@ SUnit *ScheduleDAGFast::CopyAndMoveSuccessors(SUnit *SU) {    SmallVector<std::pair<SUnit*, bool>, 4> DelDeps;    for (SUnit::succ_iterator I = SU->Succs.begin(), E = SU->Succs.end();         I != E; ++I) { -    if (I->isSpecial) +    if (I->isArtificial)        continue;      if (I->Dep->isScheduled) {        NewSU->Height = std::max(NewSU->Height, I->Dep->Height+1); @@ -400,7 +400,7 @@ void ScheduleDAGFast::InsertCCCopiesAndMoveSuccs(SUnit *SU, unsigned Reg,    SmallVector<std::pair<SUnit*, bool>, 4> DelDeps;    for (SUnit::succ_iterator I = SU->Succs.begin(), E = SU->Succs.end();         I != E; ++I) { -    if (I->isSpecial) +    if (I->isArtificial)        continue;      if (I->Dep->isScheduled) {        AddPred(I->Dep, CopyToSU, I->isCtrl, false, I->Reg, I->Cost); diff --git a/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp b/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp index 2f234b29ee0..bdca21ec78e 100644 --- a/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp @@ -94,12 +94,12 @@ public:    /// the current node Y if not already.    /// This returns true if this is a new predecessor.    /// Updates the topological ordering if required. -  bool AddPred(SUnit *Y, SUnit *X, bool isCtrl, bool isSpecial, +  bool AddPred(SUnit *Y, SUnit *X, bool isCtrl, bool isArtificial,                 unsigned PhyReg = 0, int Cost = 1);    /// RemovePred - This removes the specified node N from the predecessors of     /// the current node M. Updates the topological ordering if required. -  bool RemovePred(SUnit *M, SUnit *N, bool isCtrl, bool isSpecial); +  bool RemovePred(SUnit *M, SUnit *N, bool isCtrl, bool isArtificial);  private:    void ReleasePred(SUnit *SU, SUnit *PredSU, bool isChain); @@ -482,8 +482,8 @@ void ScheduleDAGRRList::InitDAGTopologicalSorting() {  /// AddPred - adds an edge from SUnit X to SUnit Y.  /// Updates the topological ordering if required. -bool ScheduleDAGRRList::AddPred(SUnit *Y, SUnit *X, bool isCtrl, bool isSpecial, -                 unsigned PhyReg, int Cost) { +bool ScheduleDAGRRList::AddPred(SUnit *Y, SUnit *X, bool isCtrl, +                 bool isArtificial, unsigned PhyReg, int Cost) {    int UpperBound, LowerBound;    LowerBound = Node2Index[Y->NodeNum];    UpperBound = Node2Index[X->NodeNum]; @@ -498,15 +498,15 @@ bool ScheduleDAGRRList::AddPred(SUnit *Y, SUnit *X, bool isCtrl, bool isSpecial,      Shift(Visited, LowerBound, UpperBound);    }    // Now really insert the edge. -  return Y->addPred(X, isCtrl, isSpecial, PhyReg, Cost); +  return Y->addPred(X, isCtrl, isArtificial, PhyReg, Cost);  }  /// RemovePred - This removes the specified node N from the predecessors of   /// the current node M. Updates the topological ordering if required.  bool ScheduleDAGRRList::RemovePred(SUnit *M, SUnit *N,  -                                   bool isCtrl, bool isSpecial) { +                                   bool isCtrl, bool isArtificial) {    // InitDAGTopologicalSorting(); -  return M->removePred(N, isCtrl, isSpecial); +  return M->removePred(N, isCtrl, isArtificial);  }  /// DFS - Make a DFS traversal to mark all nodes reachable from SU and mark @@ -696,10 +696,10 @@ SUnit *ScheduleDAGRRList::CopyAndMoveSuccessors(SUnit *SU) {           I != E; ++I) {        if (I->isCtrl)          ChainSuccs.push_back(SDep(I->Dep, I->Reg, I->Cost, -                                  I->isCtrl, I->isSpecial)); +                                  I->isCtrl, I->isArtificial));        else          NodeSuccs.push_back(SDep(I->Dep, I->Reg, I->Cost, -                                 I->isCtrl, I->isSpecial)); +                                 I->isCtrl, I->isArtificial));      }      if (ChainPred) { @@ -709,29 +709,29 @@ SUnit *ScheduleDAGRRList::CopyAndMoveSuccessors(SUnit *SU) {      }      for (unsigned i = 0, e = LoadPreds.size(); i != e; ++i) {        SDep *Pred = &LoadPreds[i]; -      RemovePred(SU, Pred->Dep, Pred->isCtrl, Pred->isSpecial); +      RemovePred(SU, Pred->Dep, Pred->isCtrl, Pred->isArtificial);        if (isNewLoad) { -        AddPred(LoadSU, Pred->Dep, Pred->isCtrl, Pred->isSpecial, +        AddPred(LoadSU, Pred->Dep, Pred->isCtrl, Pred->isArtificial,                  Pred->Reg, Pred->Cost);        }      }      for (unsigned i = 0, e = NodePreds.size(); i != e; ++i) {        SDep *Pred = &NodePreds[i]; -      RemovePred(SU, Pred->Dep, Pred->isCtrl, Pred->isSpecial); -      AddPred(NewSU, Pred->Dep, Pred->isCtrl, Pred->isSpecial, +      RemovePred(SU, Pred->Dep, Pred->isCtrl, Pred->isArtificial); +      AddPred(NewSU, Pred->Dep, Pred->isCtrl, Pred->isArtificial,                Pred->Reg, Pred->Cost);      }      for (unsigned i = 0, e = NodeSuccs.size(); i != e; ++i) {        SDep *Succ = &NodeSuccs[i]; -      RemovePred(Succ->Dep, SU, Succ->isCtrl, Succ->isSpecial); -      AddPred(Succ->Dep, NewSU, Succ->isCtrl, Succ->isSpecial, +      RemovePred(Succ->Dep, SU, Succ->isCtrl, Succ->isArtificial); +      AddPred(Succ->Dep, NewSU, Succ->isCtrl, Succ->isArtificial,                Succ->Reg, Succ->Cost);      }      for (unsigned i = 0, e = ChainSuccs.size(); i != e; ++i) {        SDep *Succ = &ChainSuccs[i]; -      RemovePred(Succ->Dep, SU, Succ->isCtrl, Succ->isSpecial); +      RemovePred(Succ->Dep, SU, Succ->isCtrl, Succ->isArtificial);        if (isNewLoad) { -        AddPred(Succ->Dep, LoadSU, Succ->isCtrl, Succ->isSpecial, +        AddPred(Succ->Dep, LoadSU, Succ->isCtrl, Succ->isArtificial,                  Succ->Reg, Succ->Cost);        }      }  @@ -758,7 +758,7 @@ SUnit *ScheduleDAGRRList::CopyAndMoveSuccessors(SUnit *SU) {    // New SUnit has the exact same predecessors.    for (SUnit::pred_iterator I = SU->Preds.begin(), E = SU->Preds.end();         I != E; ++I) -    if (!I->isSpecial) { +    if (!I->isArtificial) {        AddPred(NewSU, I->Dep, I->isCtrl, false, I->Reg, I->Cost);        NewSU->Depth = std::max(NewSU->Depth, I->Dep->Depth+1);      } @@ -768,7 +768,7 @@ SUnit *ScheduleDAGRRList::CopyAndMoveSuccessors(SUnit *SU) {    SmallVector<std::pair<SUnit*, bool>, 4> DelDeps;    for (SUnit::succ_iterator I = SU->Succs.begin(), E = SU->Succs.end();         I != E; ++I) { -    if (I->isSpecial) +    if (I->isArtificial)        continue;      if (I->Dep->isScheduled) {        NewSU->Height = std::max(NewSU->Height, I->Dep->Height+1); @@ -810,7 +810,7 @@ void ScheduleDAGRRList::InsertCCCopiesAndMoveSuccs(SUnit *SU, unsigned Reg,    SmallVector<std::pair<SUnit*, bool>, 4> DelDeps;    for (SUnit::succ_iterator I = SU->Succs.begin(), E = SU->Succs.end();         I != E; ++I) { -    if (I->isSpecial) +    if (I->isArtificial)        continue;      if (I->Dep->isScheduled) {        CopyToSU->Height = std::max(CopyToSU->Height, I->Dep->Height+1);  | 

