[mlir][doc] Avoid duplication with constraints and defs

[jpienaar]

Summary

Where a constraint also has a def, emit the def only to avoid duplicate
output (and def has more complete info). Also move attributes and types
to the end rather than some on top and some at end.

[Mogball]

Forgot to update the test?

[jpienaar]

In D127823#3584114, @Mogball wrote:

Forgot to update the test?

Indeed! I don't know why I didn't notice this locally ... need to update a hook or two :) Will update and land.

mlir/tools/mlir-tblgen/OpDocGen.cpp

static void emitDialectDoc(const Dialect &dialect,
   emitIfNotEmpty(dialect.getSummary(), os);
   emitIfNotEmpty(dialect.getDescription(), os);
 
   // Generate a TOC marker except if description already contains one.
   llvm::Regex r("^[[:space:]]*\\[TOC\\]$", llvm::Regex::RegexFlags::Newline);
   if (!r.match(dialect.getDescription()))
     os << "[TOC]\n\n";
 
+  if (!ops.empty()) {
+    os << "## Operation definition\n\n";
+    for (const Operator &op : ops)
+      emitOpDoc(op, os);
+  }
+
   if (!attributes.empty()) {
     os << "## Attribute constraint definition\n\n";
     for (const Attribute &attr : attributes)
       emitAttrDoc(attr, os);
   }
 
   if (!attrDefs.empty()) {
     os << "## Attribute definition\n\n";
     for (const AttrDef &def : attrDefs)
       emitAttrOrTypeDefDoc(def, os);
   }
 
   // TODO: Add link between use and def for types
   if (!types.empty()) {
     os << "## Type constraint definition\n\n";
     for (const Type &type : types)
       emitTypeDoc(type, os);
   }
 
-  if (!ops.empty()) {
-    os << "## Operation definition\n\n";
-    for (const Operator &op : ops)
-      emitOpDoc(op, os);
-  }
-
   if (!typeDefs.empty()) {
     os << "## Type definition\n\n";
     for (const TypeDef &def : typeDefs)
       emitAttrOrTypeDefDoc(def, os);
   }
 }
 
 static bool emitDialectDoc(const RecordKeeper &recordKeeper, raw_ostream &os) {
static bool emitDialectDoc(const RecordKeeper &recordKeeper, raw_ostream &os) {
   llvm::SetVector<Dialect, SmallVector<Dialect>, std::set<Dialect>>
       dialectsWithDocs;
 
   llvm::StringMap<std::vector<Attribute>> dialectAttrs;
   llvm::StringMap<std::vector<AttrDef>> dialectAttrDefs;
   llvm::StringMap<std::vector<Operator>> dialectOps;
   llvm::StringMap<std::vector<Type>> dialectTypes;
   llvm::StringMap<std::vector<TypeDef>> dialectTypeDefs;
+  llvm::SmallDenseSet<Record*> seen;
+  for (Record *attrDef : attrDefDefs) {
+    AttrDef attr(attrDef);
+    dialectAttrDefs[attr.getDialect().getName()].push_back(attr);
+    dialectsWithDocs.insert(attr.getDialect());
+    seen.insert(attrDef);
+  }
   for (Record *attrDef : attrDefs) {
+    if (seen.count(attrDef))
+      continue;
     Attribute attr(attrDef);
     if (const Dialect &dialect = attr.getDialect()) {
       dialectAttrs[dialect.getName()].push_back(attr);
       dialectsWithDocs.insert(dialect);
     }
   }
-  for (Record *attrDef : attrDefDefs) {
-    AttrDef attr(attrDef);
-    dialectAttrDefs[attr.getDialect().getName()].push_back(attr);
-    dialectsWithDocs.insert(attr.getDialect());
-  }
   for (Record *opDef : opDefs) {
     Operator op(opDef);
     dialectOps[op.getDialect().getName()].push_back(op);
     dialectsWithDocs.insert(op.getDialect());
   }
+  for (Record *typeDef : typeDefDefs) {
+    TypeDef type(typeDef);
+    dialectTypeDefs[type.getDialect().getName()].push_back(type);
+    dialectsWithDocs.insert(type.getDialect());
+    seen.insert(typeDef);
+  }
   for (Record *typeDef : typeDefs) {
+    if (seen.count(typeDef))
+      continue;
     Type type(typeDef);
     if (const Dialect &dialect = type.getDialect()) {
       dialectTypes[dialect.getName()].push_back(type);
       dialectsWithDocs.insert(dialect);
     }
   }
-  for (Record *typeDef : typeDefDefs) {
-    TypeDef type(typeDef);
-    dialectTypeDefs[type.getDialect().getName()].push_back(type);
-    dialectsWithDocs.insert(type.getDialect());
-  }
 
   Optional<Dialect> dialect =
       findDialectToGenerate(dialectsWithDocs.getArrayRef());
   if (!dialect)
     return true;
 
   os << "<!-- Autogenerated by mlir-tblgen; don't manually edit -->\n";
   StringRef dialectName = dialect->getName();