Review feedback

Author: jurahul

llvm/test/TableGen/SDNodeInfoEmitter/advanced.td

@@ -47,13 +47,15 @@ def my_node_3 : SDNode<
 >;
 
 // CHECK:       namespace llvm::MyTargetISD {
+// CHECK-EMPTY:
 // CHECK-NEXT:  enum GenNodeType : unsigned {
 // CHECK-NEXT:    NODE_1 = ISD::BUILTIN_OP_END,
 // CHECK-NEXT:    NODE_2,
 // CHECK-NEXT:    NODE_3,
 // CHECK-NEXT:  };
 // CHECK-EMPTY:
 // CHECK-NEXT:  static constexpr unsigned GENERATED_OPCODE_END = NODE_3 + 1;
+// CHECK-EMPTY:
 // CHECK-NEXT:  } // namespace llvm::MyTargetISD
 
 // CHECK:       static constexpr char MyTargetSDNodeNamesStorage[] =

llvm/test/TableGen/SDNodeInfoEmitter/ambiguous-constraints-2.td

@@ -10,12 +10,14 @@ def my_node_2a : SDNode<"MyTargetISD::NODE_2", SDTypeProfile<1, 0, [SDTCisVT<0,
 def my_node_2b : SDNode<"MyTargetISD::NODE_2", SDTypeProfile<1, 0, [SDTCisVT<0, untyped>]>>;
 
 // CHECK:       namespace llvm::MyTargetISD {
+// CHECK-EMPTY:
 // CHECK-NEXT:  enum GenNodeType : unsigned {
 // CHECK-NEXT:    NODE_1 = ISD::BUILTIN_OP_END,
 // CHECK-NEXT:    NODE_2,
 // CHECK-NEXT:  };
 // CHECK-EMPTY:
 // CHECK-NEXT:  static constexpr unsigned GENERATED_OPCODE_END = NODE_2 + 1;
+// CHECK-EMPTY:
 // CHECK-NEXT:  } // namespace llvm::MyTargetISD
 
 // CHECK:       static constexpr char MyTargetSDNodeNamesStorage[] =

llvm/test/TableGen/SDNodeInfoEmitter/namespace.td

@@ -14,7 +14,9 @@ def node_1 : SDNode<"MyTargetISD::NODE", SDTypeProfile<1, 0, [SDTCisVT<0, i1>]>>
 def node_2 : SDNode<"MyCustomISD::NODE", SDTypeProfile<0, 1, [SDTCisVT<0, i2>]>>;
 
 // EMPTY:        namespace llvm::EmptyISD {
+// EMPTY-EMPTY:
 // EMPTY-NEXT:   static constexpr unsigned GENERATED_OPCODE_END = ISD::BUILTIN_OP_END;
+// EMPTY-EMPTY:
 // EMPTY-NEXT:   } // namespace llvm::EmptyISD
 
 // EMPTY:        static constexpr char MyTargetSDNodeNamesStorage[] =
@@ -33,11 +35,13 @@ def node_2 : SDNode<"MyCustomISD::NODE", SDTypeProfile<0, 1, [SDTCisVT<0, i2>]>>
 // EMPTY-NEXT:       MyTargetSDNodeNames, MyTargetSDTypeConstraints);
 
 // COMMON:       namespace llvm::[[NS]] {
+// COMMON-EMPTY:
 // COMMON-NEXT:  enum GenNodeType : unsigned {
 // COMMON-NEXT:    NODE = ISD::BUILTIN_OP_END,
 // COMMON-NEXT:  };
 // COMMON-EMPTY:
 // COMMON-NEXT:  static constexpr unsigned GENERATED_OPCODE_END = NODE + 1;
+// COMMON-EMPTY:
 // COMMON-NEXT:  } // namespace llvm::[[NS]]
 
 // COMMON:       static constexpr char MyTargetSDNodeNamesStorage[] =

llvm/test/TableGen/SDNodeInfoEmitter/no-nodes.td

@@ -8,7 +8,9 @@ def MyTarget : Target;
 // CHECK-NEXT:  #undef GET_SDNODE_ENUM
 // CHECK-EMPTY:
 // CHECK-NEXT:  namespace llvm::MyTargetISD {
+// CHECK-EMPTY:
 // CHECK-NEXT:  static constexpr unsigned GENERATED_OPCODE_END = ISD::BUILTIN_OP_END;
+// CHECK-EMPTY:
 // CHECK-NEXT:  } // namespace llvm::MyTargetISD
 // CHECK-EMPTY:
 // CHECK-NEXT:  #endif // GET_SDNODE_ENUM
@@ -18,6 +20,7 @@ def MyTarget : Target;
 // CHECK-EMPTY:
 // CHECK-NEXT:  namespace llvm {
 // CHECK-EMPTY:
+// CHECK-EMPTY:
 // CHECK-NEXT:  #ifdef __GNUC__
 // CHECK-NEXT:  #pragma GCC diagnostic push
 // CHECK-NEXT:  #pragma GCC diagnostic ignored "-Woverlength-strings"

llvm/test/TableGen/SDNodeInfoEmitter/trivial-node.td

@@ -7,11 +7,13 @@ def MyTarget : Target;
 def my_noop : SDNode<"MyTargetISD::NOOP", SDTypeProfile<0, 0, []>>;
 
 // CHECK:       namespace llvm::MyTargetISD {
+// CHECK-EMPTY:
 // CHECK-NEXT:  enum GenNodeType : unsigned {
 // CHECK-NEXT:    NOOP = ISD::BUILTIN_OP_END,
 // CHECK-NEXT:  };
 // CHECK-EMPTY:
 // CHECK-NEXT:  static constexpr unsigned GENERATED_OPCODE_END = NOOP + 1;
+// CHECK-EMPTY:
 // CHECK-NEXT:  } // namespace llvm::MyTargetISD
 
 // CHECK:       static constexpr char MyTargetSDNodeNamesStorage[] =

llvm/utils/TableGen/SDNodeInfoEmitter.cpp

@@ -322,7 +322,7 @@ void SDNodeInfoEmitter::emitDescs(raw_ostream &OS) const {
   StringRef TargetName = Target.getName();
 
   IfDefEmitter IfDef(OS, "GET_SDNODE_DESC");
-  NamespaceEmitter LlvmNs(OS, "llvm");
+  NamespaceEmitter NS(OS, "llvm");
 
   std::vector<unsigned> NameOffsets = emitNodeNames(OS);
   std::vector<std::pair<unsigned, unsigned>> ConstraintOffsetsAndCounts =
@@ -339,7 +339,7 @@ void SDNodeInfoEmitter::emitDescs(raw_ostream &OS) const {
 
   OS << formatv("static const SDNodeInfo {0}GenSDNodeInfo(\n"
                 "    /*NumOpcodes=*/{1}, {0}SDNodeDescs,\n"
-                "    {0}SDNodeNames, {0}SDTypeConstraints);\n\n",
+                "    {0}SDNodeNames, {0}SDTypeConstraints);\n",
                 TargetName, NodesByName.size());
 }