Address review comments:

- Remove struct prefix
- Remove underscores

Author: piotrAMD

example/ExampleDialect.td

@@ -369,7 +369,6 @@ def StructBackedType : DialectType<ExampleDialect, "struct.backed"> {
   }];
   let typeArguments = (args AttrI32:$field0, AttrI32:$field1, AttrI32:$field2);
   let representation = (repr_struct (IntegerType 41));
-  let structPrefix = "sb_";
 
   let defaultGetterHasExplicitContextArgument = 1;
 }

include/llvm-dialects/Dialect/Dialect.td

@@ -239,7 +239,6 @@ class DialectType<Dialect dialect_, string mnemonic_> : Type, Predicate {
   ///    discriminant; the discriminant should be a type that cannot naturally
   ///    appear elsewhere, e.g. (repr_struct (IntegerType 41))
   dag representation = (repr_targetext);
-  string structPrefix = "";
 }
 
 def and;

include/llvm-dialects/TableGen/DialectType.h

@@ -78,7 +78,6 @@ class DialectType : public BaseCppPredicate {
 
   bool m_structBacked = false;
   unsigned m_structSentinelBitWidth;
-  std::string m_structPrefix;
 };
 
 } // namespace llvm_dialects

lib/TableGen/DialectType.cpp

@@ -60,11 +60,6 @@ bool DialectType::init(raw_ostream &errs, GenDialectsContext &context,
               ->getValue();
     }
   }
-  if (auto *p = record->getValue("structPrefix"))
-    m_structPrefix = record->getValueAsString("structPrefix").str();
-  else
-    m_structPrefix =
-        (m_dialectRec->getValueAsString("name").str() + "." + m_mnemonic + ".");
 
   for (unsigned argIdx = 0; argIdx < m_arguments.size(); ++argIdx)
     m_canDerive.push_back(true);
@@ -269,6 +264,10 @@ void DialectType::emitDefinition(raw_ostream &out, GenDialect *dialect) const {
   fmt.addSubst("types", symbols.chooseName("types"));
   fmt.addSubst("ints", symbols.chooseName("ints"));
   fmt.addSubst("_errs", symbols.chooseName("errs"));
+  fmt.addSubst("os", symbols.chooseName("os"));
+  fmt.addSubst("name", symbols.chooseName("name"));
+  fmt.addSubst("fields", symbols.chooseName("fields"));
+  fmt.addSubst("st", symbols.chooseName("st"));
 
   if (m_structBacked) {
     out << tgfmt("$_type* $_type::get(", &fmt);
@@ -297,29 +296,30 @@ void DialectType::emitDefinition(raw_ostream &out, GenDialect *dialect) const {
       }
     }
 
-    out << "  std::string __name; ::llvm::raw_string_ostream __os(__name);\n";
-    out << tgfmt("  __os << \"$0\";\n", &fmt, m_structPrefix);
+    out << tgfmt(
+        "  std::string $name; ::llvm::raw_string_ostream $os($name);\n", &fmt);
+    out << tgfmt("  $os << \"$0\";\n", &fmt, m_mnemonic);
     for (const auto &getterArg : getterArgs)
-      out << "  __os << (uint64_t)" << getterArg.name << " << '.';\n";
+      out << tgfmt("  $os << '.' << (uint64_t)$0;\n", &fmt, getterArg.name);
 
-    out << tgfmt("  ::std::vector<::llvm::Type*> __fields;\n", &fmt);
+    out << tgfmt("  ::std::vector<::llvm::Type*> $fields;\n", &fmt);
     out << tgfmt(
-        "  __fields.push_back(::llvm::IntegerType::get($_context, $0));\n",
-        &fmt, Twine(m_structSentinelBitWidth));
+        "  $fields.push_back(::llvm::IntegerType::get($_context, $0));\n", &fmt,
+        Twine(m_structSentinelBitWidth));
 
     for (const auto &getterArg : getterArgs) {
       out << tgfmt(R"(
   if ($0 == 0)
-    __fields.push_back(::llvm::StructType::get($_context));
+    $fields.push_back(::llvm::StructType::get($_context));
   else
-    __fields.push_back(::llvm::IntegerType::get($_context, $0));
+    $fields.push_back(::llvm::IntegerType::get($_context, $0));
 )",
                    &fmt, getterArg.name);
     }
-    out << tgfmt("  auto *__st = ::llvm::StructType::create($_context, "
-                 "__fields, __os.str(), /*isPacked=*/false);\n",
+    out << tgfmt("  auto *$st = ::llvm::StructType::create($_context, "
+                 "$fields, $os.str(), /*isPacked=*/false);\n",
                  &fmt);
-    out << tgfmt("  return static_cast<$_type *>(__st);\n}\n\n", &fmt);
+    out << tgfmt("  return static_cast<$_type *>($st);\n}\n\n", &fmt);
 
     out << tgfmt(R"(
 bool $_type::classof(const ::llvm::Type *t) {

test/example/generated/ExampleDialect.cpp.inc

@@ -262,30 +262,30 @@ StructBackedType* StructBackedType::get(::llvm::LLVMContext & ctx, uint32_t fiel
 
 
 
-  std::string __name; ::llvm::raw_string_ostream __os(__name);
-  __os << "sb_";
-  __os << (uint64_t)field0 << '.';
-  __os << (uint64_t)field1 << '.';
-  __os << (uint64_t)field2 << '.';
-  ::std::vector<::llvm::Type*> __fields;
-  __fields.push_back(::llvm::IntegerType::get(ctx, 41));
+  std::string name; ::llvm::raw_string_ostream os(name);
+  os << "struct.backed";
+  os << '.' << (uint64_t)field0;
+  os << '.' << (uint64_t)field1;
+  os << '.' << (uint64_t)field2;
+  ::std::vector<::llvm::Type*> fields;
+  fields.push_back(::llvm::IntegerType::get(ctx, 41));
 
   if (field0 == 0)
-    __fields.push_back(::llvm::StructType::get(ctx));
+    fields.push_back(::llvm::StructType::get(ctx));
   else
-    __fields.push_back(::llvm::IntegerType::get(ctx, field0));
+    fields.push_back(::llvm::IntegerType::get(ctx, field0));
 
   if (field1 == 0)
-    __fields.push_back(::llvm::StructType::get(ctx));
+    fields.push_back(::llvm::StructType::get(ctx));
   else
-    __fields.push_back(::llvm::IntegerType::get(ctx, field1));
+    fields.push_back(::llvm::IntegerType::get(ctx, field1));
 
   if (field2 == 0)
-    __fields.push_back(::llvm::StructType::get(ctx));
+    fields.push_back(::llvm::StructType::get(ctx));
   else
-    __fields.push_back(::llvm::IntegerType::get(ctx, field2));
-  auto *__st = ::llvm::StructType::create(ctx, __fields, __os.str(), /*isPacked=*/false);
-  return static_cast<StructBackedType *>(__st);
+    fields.push_back(::llvm::IntegerType::get(ctx, field2));
+  auto *st = ::llvm::StructType::create(ctx, fields, os.str(), /*isPacked=*/false);
+  return static_cast<StructBackedType *>(st);
 }