[Mlir-commits] [mlir] 832955f - [mlir] Cleanup DialectDocGen to check for the dialect early

[River Riddle]

Author: River Riddle
Date: 2022-10-12T14:43:20-07:00
New Revision: 832955f6c60cf0f6976b6f648f24c21c2ccda93b

URL: https://github.com/llvm/llvm-project/commit/832955f6c60cf0f6976b6f648f24c21c2ccda93b
DIFF: https://github.com/llvm/llvm-project/commit/832955f6c60cf0f6976b6f648f24c21c2ccda93b.diff

LOG: [mlir] Cleanup DialectDocGen to check for the dialect early

We only ever generate documentation for one dialect, so there
isn't a good reason to collect every possible dialect entity.

Differential Revision: https://reviews.llvm.org/D135812

Added: 
    

Modified: 
    mlir/include/mlir/Dialect/MemRef/IR/CMakeLists.txt
    mlir/tools/mlir-tblgen/OpDocGen.cpp

Removed: 
    


################################################################################
diff  --git a/mlir/include/mlir/Dialect/MemRef/IR/CMakeLists.txt b/mlir/include/mlir/Dialect/MemRef/IR/CMakeLists.txt
index 47efc6dd38fcc..be40d7bca6669 100644
--- a/mlir/include/mlir/Dialect/MemRef/IR/CMakeLists.txt
+++ b/mlir/include/mlir/Dialect/MemRef/IR/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_mlir_dialect(MemRefOps memref)
-add_mlir_doc(MemRefOps MemRefOps Dialects/ -gen-dialect-doc)
+add_mlir_doc(MemRefOps MemRefOps Dialects/ -gen-dialect-doc -dialect=memref)

diff  --git a/mlir/tools/mlir-tblgen/OpDocGen.cpp b/mlir/tools/mlir-tblgen/OpDocGen.cpp
index ed9e514695644..8ebcd333a24e2 100644
--- a/mlir/tools/mlir-tblgen/OpDocGen.cpp
+++ b/mlir/tools/mlir-tblgen/OpDocGen.cpp
@@ -360,6 +360,13 @@ static void emitDialectDoc(const Dialect &dialect,
 }
 
 static bool emitDialectDoc(const RecordKeeper &recordKeeper, raw_ostream &os) {
+  std::vector<Record *> dialectDefs =
+      recordKeeper.getAllDerivedDefinitionsIfDefined("Dialect");
+  SmallVector<Dialect> dialects(dialectDefs.begin(), dialectDefs.end());
+  Optional<Dialect> dialect = findDialectToGenerate(dialects);
+  if (!dialect)
+    return true;
+
   std::vector<Record *> opDefs = getRequestedOpDefinitions(recordKeeper);
   std::vector<Record *> attrDefs =
       recordKeeper.getAllDerivedDefinitionsIfDefined("DialectAttr");
@@ -370,61 +377,31 @@ static bool emitDialectDoc(const RecordKeeper &recordKeeper, raw_ostream &os) {
   std::vector<Record *> attrDefDefs =
       recordKeeper.getAllDerivedDefinitionsIfDefined("AttrDef");
 
-  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;
+  std::vector<Attribute> dialectAttrs;
+  std::vector<AttrDef> dialectAttrDefs;
+  std::vector<Operator> dialectOps;
+  std::vector<Type> dialectTypes;
+  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 *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);
-    }
-  }
-
-  Optional<Dialect> dialect =
-      findDialectToGenerate(dialectsWithDocs.getArrayRef());
-  if (!dialect)
-    return true;
+  auto addIfInDialect = [&](llvm::Record *record, const auto &def, auto &vec) {
+    if (seen.insert(record).second && def.getDialect() == *dialect)
+      vec.push_back(def);
+  };
+
+  for (Record *def : attrDefDefs)
+    addIfInDialect(def, AttrDef(def), dialectAttrDefs);
+  for (Record *def : attrDefs)
+    addIfInDialect(def, Attribute(def), dialectAttrs);
+  for (Record *def : opDefs)
+    addIfInDialect(def, Operator(def), dialectOps);
+  for (Record *def : typeDefDefs)
+    addIfInDialect(def, TypeDef(def), dialectTypeDefs);
+  for (Record *def : typeDefs)
+    addIfInDialect(def, Type(def), dialectTypes);
 
   os << "<!-- Autogenerated by mlir-tblgen; don't manually edit -->\n";
-  StringRef dialectName = dialect->getName();
-  emitDialectDoc(*dialect, dialectAttrs[dialectName],
-                 dialectAttrDefs[dialectName], dialectOps[dialectName],
-                 dialectTypes[dialectName], dialectTypeDefs[dialectName], os);
+  emitDialectDoc(*dialect, dialectAttrs, dialectAttrDefs, dialectOps,
+                 dialectTypes, dialectTypeDefs, os);
   return false;
 }