[mlir][func] Use the generated pass options in func to llvm.

[gysit]

Summary

Update the FuncToLLVM pass to use the generated constructors and
the generated pass option struct. The hand written constructor
got out of sync after some refactorings. Using a generated constructor
and options struct ensures the everything remains in sync.

[zero9178]

mlir/include/mlir/Conversion/FuncToLLVM/ConvertFuncToLLVMPass.h

28

These constructor functions will be auto generated by TableGen, although currently they do not have matching names.
The name is simply create + TableGenRecordDefName. So if you rename ConvertFuncToLLVM to ConvertFuncToLLVMPass in the td file it should create both of these two declarations and the definitions in the cpp file for you and you'll be able to delete them here.

[gysit]

Address review comment that further simplifies the pass definition.

[zero9178]

LGTM!

[gysit]

Use Base::Base.

[gysit]

Fix build bot error.

mlir/include/mlir/Conversion/FuncToLLVM/ConvertFuncToLLVMPass.h

 class ModuleOp;
 template <typename T>
 class OperationPass;
 class Pass;
 
 #define GEN_PASS_DECL_CONVERTFUNCTOLLVM
 #include "mlir/Conversion/Passes.h.inc"
 
-/// Creates a pass to convert the Func dialect into the LLVMIR dialect.
+/// Creates a pass to convert the Func dialect into the LLVM dialect.
 std::unique_ptr<OperationPass<ModuleOp>> createConvertFuncToLLVMPass();
 std::unique_ptr<OperationPass<ModuleOp>>
-createConvertFuncToLLVMPass(const LowerToLLVMOptions &options);
+createConvertFuncToLLVMPass(const ConvertFuncToLLVMOptions &options);
 
 } // namespace mlir
 
 #endif // MLIR_CONVERSION_FUNCTOLLVM_CONVERTFUNCTOLLVMPASS_H_

mlir/include/mlir/Conversion/Passes.td

let description = [{
     #### Output IR
 
     Functions converted to LLVM IR. Function arguments types are converted
     one-to-one. Function results are converted one-to-one and, in case more than
     1 value is returned, packed into an LLVM IR struct type. Function calls and
     returns are updated accordingly. Block argument types are updated to use
     LLVM IR types.
   }];
-  let constructor = "mlir::createConvertFuncToLLVMPass()";
   let dependentDialects = ["LLVM::LLVMDialect"];
   let options = [
     Option<"useBarePtrCallConv", "use-bare-ptr-memref-call-conv", "bool",
            /*default=*/"false",
            "Replace FuncOp's MemRef arguments with bare pointers to the MemRef "
            "element types">,
     Option<"indexBitwidth", "index-bitwidth", "unsigned",
            /*default=kDeriveIndexBitwidthFromDataLayout*/"0",

mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp

patterns.add<
       ReturnOpLowering>(converter);
   // clang-format on
 }
 
 namespace {
 /// A pass converting Func operations into the LLVM IR dialect.
 struct ConvertFuncToLLVMPass
     : public impl::ConvertFuncToLLVMBase<ConvertFuncToLLVMPass> {
-  ConvertFuncToLLVMPass() = default;
-  ConvertFuncToLLVMPass(bool useBarePtrCallConv, unsigned indexBitwidth,
-                        bool useAlignedAlloc,
-                        const llvm::DataLayout &dataLayout) {
-    this->useBarePtrCallConv = useBarePtrCallConv;
-    this->indexBitwidth = indexBitwidth;
-    this->dataLayout = dataLayout.getStringRepresentation();
-  }
+  using ConvertFuncToLLVMBase::ConvertFuncToLLVMBase;
 
   /// Run the dialect converter on the module.
   void runOnOperation() override {
     if (failed(LLVM::LLVMDialect::verifyDataLayoutString(
             this->dataLayout, [this](const Twine &message) {
               getOperation().emitError() << message.str();
             }))) {
       signalPassFailure();

 };
 } // namespace
 
 std::unique_ptr<OperationPass<ModuleOp>> mlir::createConvertFuncToLLVMPass() {
   return std::make_unique<ConvertFuncToLLVMPass>();
 }
 
 std::unique_ptr<OperationPass<ModuleOp>>
-mlir::createConvertFuncToLLVMPass(const LowerToLLVMOptions &options) {
-  auto allocLowering = options.allocLowering;
-  // There is no way to provide additional patterns for pass, so
-  // AllocLowering::None will always fail.
-  assert(allocLowering != LowerToLLVMOptions::AllocLowering::None &&
-         "ConvertFuncToLLVMPass doesn't support AllocLowering::None");
-  bool useAlignedAlloc =
-      (allocLowering == LowerToLLVMOptions::AllocLowering::AlignedAlloc);
-  return std::make_unique<ConvertFuncToLLVMPass>(
-      options.useBarePtrCallConv, options.getIndexBitwidth(), useAlignedAlloc,
-      options.dataLayout);
+mlir::createConvertFuncToLLVMPass(const ConvertFuncToLLVMOptions &options) {
+  return std::make_unique<ConvertFuncToLLVMPass>(options);
 }