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

[Chris Lattner]

Changes in directory llvm/lib/CodeGen/SelectionDAG:

SelectionDAG.cpp updated: 1.140 -> 1.141
---
Log message:

Allow passing a dag into dump and getOperationName.  If one is available
when printing a node, use it to render target operations with their 
target instruction name instead of "<<unknown>>".


---
Diffs of the changes:  (+21 -9)

 SelectionDAG.cpp |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)


Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp:1.140 llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp:1.141
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp:1.140	Tue Aug 16 13:17:10 2005
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp	Tue Aug 16 13:33:07 2005
@@ -18,6 +18,8 @@
 #include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Target/TargetLowering.h"
+#include "llvm/Target/TargetInstrInfo.h"
+#include "llvm/Target/TargetMachine.h"
 #include <iostream>
 #include <set>
 #include <cmath>
@@ -1752,9 +1754,18 @@
 }
 
 
-const char *SDNode::getOperationName() const {
+const char *SDNode::getOperationName(const SelectionDAG *G) const {
   switch (getOpcode()) {
-  default: return "<<Unknown>>";
+  default:
+    if (getOpcode() < ISD::BUILTIN_OP_END)
+      return "<<Unknown DAG Node>>";
+    else {
+      if (G)
+        if (const TargetInstrInfo *TII = G->getTarget().getInstrInfo())
+          return TII->getName(getOpcode()-ISD::BUILTIN_OP_END);
+      return "<<Unknown Target Node>>";
+    }
+   
   case ISD::PCMARKER:      return "PCMarker";
   case ISD::SRCVALUE:      return "SrcValue";
   case ISD::EntryToken:    return "EntryToken";
@@ -1883,7 +1894,8 @@
   }
 }
 
-void SDNode::dump() const {
+void SDNode::dump() const { dump(0); }
+void SDNode::dump(const SelectionDAG *G) const {
   std::cerr << (void*)this << ": ";
 
   for (unsigned i = 0, e = getNumValues(); i != e; ++i) {
@@ -1893,7 +1905,7 @@
     else
       std::cerr << MVT::getValueTypeString(getValueType(i));
   }
-  std::cerr << " = " << getOperationName();
+  std::cerr << " = " << getOperationName(G);
 
   std::cerr << " ";
   for (unsigned i = 0, e = getNumOperands(); i != e; ++i) {
@@ -1934,17 +1946,17 @@
   }
 }
 
-static void DumpNodes(SDNode *N, unsigned indent) {
+static void DumpNodes(SDNode *N, unsigned indent, const SelectionDAG *G) {
   for (unsigned i = 0, e = N->getNumOperands(); i != e; ++i)
     if (N->getOperand(i).Val->hasOneUse())
-      DumpNodes(N->getOperand(i).Val, indent+2);
+      DumpNodes(N->getOperand(i).Val, indent+2, G);
     else
       std::cerr << "\n" << std::string(indent+2, ' ')
                 << (void*)N->getOperand(i).Val << ": <multiple use>";
 
 
   std::cerr << "\n" << std::string(indent, ' ');
-  N->dump();
+  N->dump(G);
 }
 
 void SelectionDAG::dump() const {
@@ -1954,10 +1966,10 @@
 
   for (unsigned i = 0, e = Nodes.size(); i != e; ++i) {
     if (!Nodes[i]->hasOneUse() && Nodes[i] != getRoot().Val)
-      DumpNodes(Nodes[i], 2);
+      DumpNodes(Nodes[i], 2, this);
   }
 
-  DumpNodes(getRoot().Val, 2);
+  DumpNodes(getRoot().Val, 2, this);
 
   std::cerr << "\n\n";
 }