IRDL-to-C++

mlir/include/mlir/Target/IRDLToCpp/IRDLToCpp.h

@@ -29,7 +29,7 @@ namespace irdl {
 ///
 ///  // This define generates code for the dialect's class definitions
 ///  #define GEN_DIALECT_DEF
-LogicalResult translateIRDLDialectToCpp(irdl::DialectOp dialect,
+LogicalResult translateIRDLDialectToCpp(llvm::ArrayRef<irdl::DialectOp> dialect,
                                         raw_ostream &output);
 
 } // namespace irdl

mlir/lib/Target/IRDLToCpp/IRDLToCpp.cpp

@@ -76,7 +76,7 @@ static std::string snakeToCamel(llvm::StringRef in, bool capitalize = false) {
 }
 
 static std::string snakeToPascal(llvm::StringRef in) {
-    return snakeToCamel(in, /*capitalize=*/true);
+  return snakeToCamel(in, /*capitalize=*/true);
 }
 
 static std::string typeToCppName(irdl::TypeOp type) {
@@ -490,61 +490,81 @@ static LogicalResult verifySupported(irdl::DialectOp dialect) {
   return success();
 }
 
-LogicalResult irdl::translateIRDLDialectToCpp(irdl::DialectOp dialect,
-                                              raw_ostream &output) {
+LogicalResult
+irdl::translateIRDLDialectToCpp(llvm::ArrayRef<irdl::DialectOp> dialects,
+                                raw_ostream &output) {
   static const auto typeDefTempl = detail::Template(
 #include "Templates/TypeDef.txt"
   );
 
-  StringRef dialectName = dialect.getSymName();
+  llvm::LogicalResult result = success();
 
-  // TODO: deal with no more constraints than the verifier allows.
-  if (dialectName.size() < 1)
-    return dialect->emitError("dialect name must be more than one character");
-  if (!llvm::isAlpha(dialectName[0]))
-    return dialect->emitError("dialect name must start with a letter");
-  if (!llvm::all_of(dialectName,
-                    [](char c) { return llvm::isAlnum(c) || c == '_'; }))
-    return dialect->emitError(
-        "dialect name must only contain letters, numbers or underscores");
+  for (auto dialect : dialects) {
+    StringRef dialectName = dialect.getSymName();
 
-  if (failed(verifySupported(dialect)))
-    return failure();
-
-  llvm::SmallVector<llvm::SmallString<8>> namespaceAbsolutePath{{"mlir"},
-                                                                dialectName};
-  std::string namespaceOpen;
-  std::string namespaceClose;
-  std::string namespacePath;
-  llvm::raw_string_ostream namespaceOpenStream(namespaceOpen);
-  llvm::raw_string_ostream namespaceCloseStream(namespaceClose);
-  llvm::raw_string_ostream namespacePathStream(namespacePath);
-  for (auto &pathElement : namespaceAbsolutePath) {
-    namespaceOpenStream << "namespace " << pathElement << " {\n";
-    namespaceCloseStream << "} // namespace " << pathElement << "\n";
-    namespacePathStream << "::" << pathElement;
-  }
-
-  std::string cppShortName = snakeToPascal(dialectName);
-  std::string dialectBaseTypeName = llvm::formatv("{0}Type", cppShortName);
-  std::string cppName = llvm::formatv("{0}Dialect", cppShortName);
-
-  DialectStrings dialectStrings;
-  dialectStrings.dialectName = dialectName;
-  dialectStrings.dialectBaseTypeName = dialectBaseTypeName;
-  dialectStrings.dialectCppName = cppName;
-  dialectStrings.dialectCppShortName = cppShortName;
-  dialectStrings.namespaceOpen = namespaceOpen;
-  dialectStrings.namespaceClose = namespaceClose;
-  dialectStrings.namespacePath = namespacePath;
+    // TODO: deal with no more constraints than the verifier allows.
+    if (dialectName.size() < 1) {
+      result =
+          dialect->emitError("dialect name must be more than one character");
+      continue;
+    }
+    if (!llvm::isAlpha(dialectName[0])) {
+      result = dialect->emitError("dialect name must start with a letter");
+      continue;
+    }
+    if (!llvm::all_of(dialectName,
+                      [](char c) { return llvm::isAlnum(c) || c == '_'; })) {
+      result = dialect->emitError(
+          "dialect name must only contain letters, numbers or underscores");
+      continue;
+    }
 
-  output << headerTemplateText;
+    if (failed(verifySupported(dialect)))
+      result = failure();
+
+    llvm::SmallVector<llvm::SmallString<8>> namespaceAbsolutePath{{"mlir"},
+                                                                  dialectName};
+    std::string namespaceOpen;
+    std::string namespaceClose;
+    std::string namespacePath;
+    llvm::raw_string_ostream namespaceOpenStream(namespaceOpen);
+    llvm::raw_string_ostream namespaceCloseStream(namespaceClose);
+    llvm::raw_string_ostream namespacePathStream(namespacePath);
+    for (auto &pathElement : namespaceAbsolutePath) {
+      namespaceOpenStream << "namespace " << pathElement << " {\n";
+      namespaceCloseStream << "} // namespace " << pathElement << "\n";
+      namespacePathStream << "::" << pathElement;
+    }
 
-  if (failed(generateInclude(dialect, output, dialectStrings)))
-    return failure();
+    std::string cppShortName = snakeToPascal(dialectName);
+    std::string dialectBaseTypeName = llvm::formatv("{0}Type", cppShortName);
+    std::string cppName = llvm::formatv("{0}Dialect", cppShortName);
+
+    DialectStrings dialectStrings;
+    dialectStrings.dialectName = dialectName;
+    dialectStrings.dialectBaseTypeName = dialectBaseTypeName;
+    dialectStrings.dialectCppName = cppName;
+    dialectStrings.dialectCppShortName = cppShortName;
+    dialectStrings.namespaceOpen = namespaceOpen;
+    dialectStrings.namespaceClose = namespaceClose;
+    dialectStrings.namespacePath = namespacePath;
+
+    output << headerTemplateText;
+
+    if (failed(generateInclude(dialect, output, dialectStrings))) {
+      dialect->emitError("Error in Dialect " + dialectName +
+                         " while generating headers");
+      result = failure();
+      continue;
+    }
 
-  if (failed(generateLib(dialect, output, dialectStrings)))
-    return failure();
+    if (failed(generateLib(dialect, output, dialectStrings))) {
+      dialect->emitError("Error in Dialect " + dialectName +
+                         " while generating library");
+      result = failure();
+      continue;
+    }
+  }
 
-  return success();
+  return result;
 }

mlir/lib/Target/IRDLToCpp/Templates/PerOperationDecl.txt

@@ -108,12 +108,23 @@ public:
   std::pair<unsigned, unsigned> getODSOperandIndexAndLength(unsigned index) {
     return {index, __OP_OPERAND_COUNT__};
   }
+
   ::mlir::Operation::operand_range getODSOperands(unsigned index) {
     auto valueRange = getODSOperandIndexAndLength(index);
     return {std::next(getOperation()->operand_begin(), valueRange.first),
              std::next(getOperation()->operand_begin(), valueRange.first + valueRange.second)};
   }
 
+  std::pair<unsigned, unsigned> getODSResultIndexAndLength(unsigned index) {
+    return {index, __OP_RESULT_COUNT__};
+  }
+
+  ::mlir::Operation::result_range getODSResults(unsigned index) {
+    auto valueRange = getODSResultIndexAndLength(index);
+    return {std::next(getOperation()->result_begin(), valueRange.first),
+             std::next(getOperation()->result_begin(), valueRange.first + valueRange.second)};
+  }
+
   __OP_GETTER_DECLS__
 
   __OP_BUILD_DECLS__

mlir/tools/mlir-irdl-to-cpp/mlir-irdl-to-cpp.cpp

@@ -82,36 +82,20 @@ static LogicalResult translateIRDLToCpp(int argc, char **argv) {
     return failure();
 
   auto moduleOp = llvm::cast<ModuleOp>(*op);
+  llvm::SmallVector<irdl::DialectOp> dialects{
+      moduleOp.getOps<irdl::DialectOp>()};
 
   if (!verifyDiagnostics) {
     SourceMgrDiagnosticHandler sourceMgrHandler(*sourceMgr, &ctx);
+    if (failed(irdl::translateIRDLDialectToCpp(dialects, output->os())))
+      return failure();
 
-    for (Operation &op : moduleOp.getOps()) {
-      auto dialectOp = llvm::dyn_cast<irdl::DialectOp>(op);
-      if (!dialectOp)
-        continue;
-
-      // TODO: accept multiple operations in translation to not generate headers
-      // multiple times.
-      if (failed(irdl::translateIRDLDialectToCpp(dialectOp, output->os()))) {
-        return failure();
-      }
-    }
     output->keep();
     return success();
   }
 
   SourceMgrDiagnosticVerifierHandler sourceMgrHandler(*sourceMgr, &ctx);
-
-  for (Operation &op : moduleOp.getOps()) {
-    auto dialectOp = llvm::dyn_cast<irdl::DialectOp>(op);
-    if (!dialectOp)
-      continue;
-
-    // TODO: accept multiple operations in translation to not generate headers
-    // multiple times.
-    ((void)irdl::translateIRDLDialectToCpp(dialectOp, output->os()));
-  }
+  ((void)irdl::translateIRDLDialectToCpp(dialects, output->os()));
   return sourceMgrHandler.verify();
 }