SelectionDAGDumper: print datatypes behind node names

[MatzeB]

Summary

Before:
t2: i32,ch = load t0, t0, t1<LD4[FixedStack-1]> [ORD=1]
t7: i32 = Constant<0>
Now:
t2 = load:i32,ch t0, t0, t1 <LD4[FixedStack-1]> [ORD=1]
t7 = Constant:i32 <0>

[resistor]

Why?

[MatzeB]

Mainly to make http://reviews.llvm.org/D12567 work.

[MatzeB]

ping

[hfinkel]

I'm not sure how much I care either way, but can't you just omit the '=' sign when printing the constants inline?

[MatzeB]

My thinking here was:

• The datatype is just another attribute stored with the node, it is not an attribute of the magic value marker tXX
• the output is consistent for inlined and non-inlined nodes.

In D12565#248873, @hfinkel wrote:

I'm not sure how much I care either way, but can't you just omit the '=' sign when printing the constants inline?

Anyway I don't really care either for this (the inline printing is what I care about). So if this won't get a LGTM I'll change it to the suggested variant of just leaving out the equal sign when printing inline.

[hfinkel]

In D12565#248898, @MatzeB wrote:

My thinking here was:

• The datatype is just another attribute stored with the node, it is not an attribute of the magic value marker tXX
• the output is consistent for inlined and non-inlined nodes.

In D12565#248873, @hfinkel wrote:

I'm not sure how much I care either way, but can't you just omit the '=' sign when printing the constants inline?

Anyway I don't really care either for this (the inline printing is what I care about). So if this won't get a LGTM I'll change it to the suggested variant of just leaving out the equal sign when printing inline.

I think that I'd prefer that. I'm leaning toward saying that the node:type formatting actually makes things more difficult to read.

[MatzeB]

I adapted http://reviews.llvm.org/D12567 to not depend on this anymore.

lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp

 
 void SDNode::dump() const { dump(nullptr); }
 void SDNode::dump(const SelectionDAG *G) const {
   print(dbgs(), G);
   dbgs() << '\n';
 }
 
 void SDNode::print_types(raw_ostream &OS, const SelectionDAG *G) const {
-  OS << PrintNodeId(*this) << ": ";
+  OS << PrintNodeId(*this) << " = ";
 
+  OS << getOperationName(G) << ':';
   for (unsigned i = 0, e = getNumValues(); i != e; ++i) {
     if (i) OS << ",";
     if (getValueType(i) == MVT::Other)
       OS << "ch";
     else
       OS << getValueType(i).getEVTString();
   }
-  OS << " = " << getOperationName(G);
 }
 
 void SDNode::print_details(raw_ostream &OS, const SelectionDAG *G) const {
   if (const MachineSDNode *MN = dyn_cast<MachineSDNode>(this)) {
     if (!MN->memoperands_empty()) {
       OS << "<";
       OS << "Mem:";
       for (MachineSDNode::mmo_iterator i = MN->memoperands_begin(),
void SelectionDAG::dump() const {
   }
 
   if (getRoot().getNode()) DumpNodes(getRoot().getNode(), 2, this);
   dbgs() << "\n\n";
 }
 
 void SDNode::printr(raw_ostream &OS, const SelectionDAG *G) const {
   print_types(OS, G);
+  OS << ' ';
   print_details(OS, G);
 }
 
 typedef SmallPtrSet<const SDNode *, 128> VisitedSDNodeSet;
 static void DumpNodesr(raw_ostream &OS, const SDNode *N, unsigned indent,
                        const SelectionDAG *G, VisitedSDNodeSet &once) {
   if (!once.insert(N).second) // If we've been here before, return now.
     return;