fix: do not necessitate the internal attribute's mnemonic

Author: rebel-jueonpark

mlir/include/mlir/IR/OpImplementation.h

@@ -212,15 +212,29 @@ class AsmPrinter {
             std::enable_if_t<std::is_convertible_v<AttrOrType, Attribute>> *
                 sfinae = nullptr>
   void printQualifiedAttrOrType(AttrOrType attrOrType) {
-    printAttribute(attrOrType);
+    Attribute attr = attrOrType;
+    Dialect &dialect = attr.getDialect();
+    StringRef dialectNamespace = dialect.getNamespace();
+    if (dialectNamespace.empty() || dialectNamespace == "builtin") {
+      printStrippedAttrOrType(attrOrType);
+      return;
+    }
+    printAttribute(attr);
   }
 
   template <typename AttrOrType,
             std::enable_if_t<std::is_convertible_v<AttrOrType, Type> &&
                              !std::is_convertible_v<AttrOrType, Attribute>> *
                 sfinae = nullptr>
   void printQualifiedAttrOrType(AttrOrType attrOrType) {
-    printType(attrOrType);
+    Type type = attrOrType;
+    Dialect &dialect = type.getDialect();
+    StringRef dialectNamespace = dialect.getNamespace();
+    if (dialectNamespace.empty() || dialectNamespace == "builtin") {
+      printStrippedAttrOrType(attrOrType);
+      return;
+    }
+    printType(type);
   }
 
   template <typename ElementT,

mlir/test/mlir-tblgen/op-format.mlir

@@ -352,16 +352,16 @@ module attributes {test.internal = #test.internal<key = 8, value = 9>} {
 
 //-----
 
-// CHECK: module attributes {test.external = #test.external<internal = #test.internal<key = 1, value = 2>>} {
+// CHECK: module attributes {test.external = #test.external<internal = <key = 1, value = 2>>} {
 // CHECK-NEXT: }
-module attributes {test.external = #test.external<internal = #test.internal<key = 1, value = 2>>} {
+module attributes {test.external = #test.external<internal = <key = 1, value = 2>>} {
 }
 
 //-----
 
-// CHECK: module attributes {test.external_array = #test.external_array<[internals = #test.internal<key = 1, value = 2>, #test.internal<key = 8, value = 9>]>} {
+// CHECK: module attributes {test.external_array = #test.external_array<[internals = <key = 1, value = 2>, <key = 8, value = 9>]>} {
 // CHECK-NEXT: }
-module attributes {test.external_array = #test.external_array<[internals = #test.internal<key = 1, value = 2>, #test.internal<key = 8, value = 9>]>} {
+module attributes {test.external_array = #test.external_array<[internals = <key = 1, value = 2>, <key = 8, value = 9>]>} {
 }
 
 //-----

mlir/tools/mlir-tblgen/AttrOrTypeFormatGen.cpp

@@ -146,8 +146,23 @@ class StructDirective
 /// into this category to avoid ambiguity when nested within structured
 /// properties.
 static bool shouldPrintQualified(ParameterElement *param) {
-  StringRef cppType = param->getParam().getCppType();
-  return cppType.contains("Attr") || cppType.contains("Type");
+  const AttrOrTypeParameter &parameter = param->getParam();
+  StringRef cppType = parameter.getCppType();
+  if (!cppType.contains("Attr") && !cppType.contains("Type"))
+    return false;
+
+  if (parameter.getPrinter())
+    return false;
+
+  if (const llvm::Init *init = parameter.getDef())
+    if (const auto *defInit = dyn_cast<llvm::DefInit>(init))
+      if (defInit->getDef()->isSubClassOf("EnumAttrInfo"))
+        return false;
+
+  if (cppType.contains("mlir::Attribute") || cppType.contains("mlir::Type"))
+    return true;
+
+  return false;
 }
 
 //===----------------------------------------------------------------------===//