[llvm-commits] [llvm] r59667 - in /llvm/trunk: include/llvm/CodeGen/ScheduleDAG.h lib/CodeGen/SelectionDAG/ScheduleDAG.cpp lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp

[Dan Gohman]

Author: djg
Date: Wed Nov 19 16:09:45 2008
New Revision: 59667

URL: http://llvm.org/viewvc/llvm-project?rev=59667&view=rev
Log:
Move the code for printing a graph node label for an SUnit into
a virtual method of SelectionDAG.

Modified:
    llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
    llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp

Modified: llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h?rev=59667&r1=59666&r2=59667&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h (original)
+++ llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h Wed Nov 19 16:09:45 2008
@@ -396,6 +396,10 @@
     ///
     virtual void Schedule() = 0;
 
+    /// getGraphpNodeLabel - Return a label for an SUnit node in a Graphviz or similar
+    /// graph visualization.
+    virtual std::string getGraphNodeLabel(const SUnit *SU) const;
+
   private:
     /// EmitSubregNode - Generate machine code for subreg nodes.
     ///

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp?rev=59667&r1=59666&r2=59667&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp Wed Nov 19 16:09:45 2008
@@ -468,7 +468,7 @@
       FlaggedNodes.push_back(N);
     while (!FlaggedNodes.empty()) {
       O << "    ";
-      FlaggedNodes.back()->dump(G->DAG);
+      FlaggedNodes.back()->print(O, G->DAG);
       O << "\n";
       FlaggedNodes.pop_back();
     }

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp?rev=59667&r1=59666&r2=59667&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp Wed Nov 19 16:09:45 2008
@@ -444,32 +444,29 @@
 
 std::string DOTGraphTraits<ScheduleDAG*>::getNodeLabel(const SUnit *SU,
                                                        const ScheduleDAG *G) {
-  std::string Op;
+  return G->getGraphNodeLabel(SU);
+}
 
-  if (G->DAG) {
-    if (!SU->getNode())
-      Op = "<CROSS RC COPY>";
-    else {
-      SmallVector<SDNode *, 4> FlaggedNodes;
-      for (SDNode *N = SU->getNode(); N; N = N->getFlaggedNode())
-        FlaggedNodes.push_back(N);
-      while (!FlaggedNodes.empty()) {
-        Op += DOTGraphTraits<SelectionDAG*>::getNodeLabel(FlaggedNodes.back(),
-                                                          G->DAG) + "\n";
-        FlaggedNodes.pop_back();
-      }
+std::string ScheduleDAG::getGraphNodeLabel(const SUnit *SU) const {
+  std::string s;
+  raw_string_ostream O(s);
+  O << "SU(" << SU->NodeNum << "): ";
+  if (SU->getNode()) {
+    SmallVector<SDNode *, 4> FlaggedNodes;
+    for (SDNode *N = SU->getNode(); N; N = N->getFlaggedNode())
+      FlaggedNodes.push_back(N);
+    while (!FlaggedNodes.empty()) {
+      O << DOTGraphTraits<SelectionDAG*>::getNodeLabel(FlaggedNodes.back(), DAG);
+      FlaggedNodes.pop_back();
+      if (!FlaggedNodes.empty())
+        O << "\n    ";
     }
   } else {
-    std::string s;
-    raw_string_ostream oss(s);
-    SU->getInstr()->print(oss);
-    Op += oss.str();
+    O << "CROSS RC COPY";
   }
-
-  return Op;
+  return O.str();
 }
 
-
 /// viewGraph - Pop up a ghostview window with the reachable parts of the DAG
 /// rendered using 'dot'.
 ///