diff --git a/mlir/include/mlir/Conversion/MemRefToLLVM/MemRefToLLVM.h b/mlir/include/mlir/Conversion/MemRefToLLVM/MemRefToLLVM.h --- a/mlir/include/mlir/Conversion/MemRefToLLVM/MemRefToLLVM.h +++ b/mlir/include/mlir/Conversion/MemRefToLLVM/MemRefToLLVM.h @@ -16,15 +16,13 @@ class LLVMTypeConverter; class RewritePatternSet; -#define GEN_PASS_DECL_CONVERTMEMREFTOLLVM +#define GEN_PASS_DECL_MEMREFTOLLVMCONVERSIONPASS #include "mlir/Conversion/Passes.h.inc" /// Collect a set of patterns to convert memory-related operations from the /// MemRef dialect to the LLVM dialect. void populateMemRefToLLVMConversionPatterns(LLVMTypeConverter &converter, RewritePatternSet &patterns); - -std::unique_ptr createMemRefToLLVMPass(); } // namespace mlir #endif // MLIR_CONVERSION_MEMREFTOLLVM_MEMREFTOLLVM_H diff --git a/mlir/include/mlir/Conversion/Passes.td b/mlir/include/mlir/Conversion/Passes.td --- a/mlir/include/mlir/Conversion/Passes.td +++ b/mlir/include/mlir/Conversion/Passes.td @@ -541,10 +541,9 @@ // MemRefToLLVM //===----------------------------------------------------------------------===// -def ConvertMemRefToLLVM : Pass<"convert-memref-to-llvm", "ModuleOp"> { +def MemRefToLLVMConversionPass : Pass<"convert-memref-to-llvm", "ModuleOp"> { let summary = "Convert operations from the MemRef dialect to the LLVM " "dialect"; - let constructor = "mlir::createMemRefToLLVMPass()"; let dependentDialects = ["LLVM::LLVMDialect"]; let options = [ Option<"useAlignedAlloc", "use-aligned-alloc", "bool", /*default=*/"false", diff --git a/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp b/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp --- a/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp +++ b/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp @@ -24,7 +24,7 @@ #include "llvm/ADT/SmallBitVector.h" namespace mlir { -#define GEN_PASS_DEF_CONVERTMEMREFTOLLVM +#define GEN_PASS_DEF_MEMREFTOLLVMCONVERSIONPASS #include "mlir/Conversion/Passes.h.inc" } // namespace mlir @@ -2108,9 +2108,9 @@ } namespace { -struct MemRefToLLVMPass - : public impl::ConvertMemRefToLLVMBase { - MemRefToLLVMPass() = default; +struct MemRefToLLVMConversionPass + : public impl::MemRefToLLVMConversionPassBase { + using MemRefToLLVMConversionPassBase::MemRefToLLVMConversionPassBase; void runOnOperation() override { Operation *op = getOperation(); @@ -2137,7 +2137,3 @@ } }; } // namespace - -std::unique_ptr mlir::createMemRefToLLVMPass() { - return std::make_unique(); -} diff --git a/mlir/lib/Dialect/SparseTensor/Pipelines/SparseTensorPipelines.cpp b/mlir/lib/Dialect/SparseTensor/Pipelines/SparseTensorPipelines.cpp --- a/mlir/lib/Dialect/SparseTensor/Pipelines/SparseTensorPipelines.cpp +++ b/mlir/lib/Dialect/SparseTensor/Pipelines/SparseTensorPipelines.cpp @@ -76,7 +76,7 @@ pm.addNestedPass(createConvertSCFToCFPass()); pm.addPass(createLowerAffinePass()); pm.addPass(createConvertVectorToLLVMPass(options.lowerVectorToLLVMOptions())); - pm.addPass(createMemRefToLLVMPass()); + pm.addPass(createMemRefToLLVMConversionPass()); pm.addNestedPass(createConvertComplexToStandardPass()); pm.addNestedPass( mlir::arith::createArithmeticExpandOpsPass()); diff --git a/mlir/tools/mlir-vulkan-runner/mlir-vulkan-runner.cpp b/mlir/tools/mlir-vulkan-runner/mlir-vulkan-runner.cpp --- a/mlir/tools/mlir-vulkan-runner/mlir-vulkan-runner.cpp +++ b/mlir/tools/mlir-vulkan-runner/mlir-vulkan-runner.cpp @@ -55,7 +55,7 @@ passManager.addPass(createConvertGpuLaunchFuncToVulkanLaunchFuncPass()); LowerToLLVMOptions llvmOptions(module.getContext(), DataLayout(module)); - passManager.addPass(createMemRefToLLVMPass()); + passManager.addPass(createMemRefToLLVMConversionPass()); passManager.nest().addPass(LLVM::createRequestCWrappersPass()); passManager.addPass(createConvertFuncToLLVMPass(llvmOptions)); passManager.addPass(createReconcileUnrealizedCastsPass()); diff --git a/mlir/unittests/ExecutionEngine/Invoke.cpp b/mlir/unittests/ExecutionEngine/Invoke.cpp --- a/mlir/unittests/ExecutionEngine/Invoke.cpp +++ b/mlir/unittests/ExecutionEngine/Invoke.cpp @@ -53,7 +53,7 @@ /// dialects lowering to LLVM Dialect. static LogicalResult lowerToLLVMDialect(ModuleOp module) { PassManager pm(module.getContext()); - pm.addPass(mlir::createMemRefToLLVMPass()); + pm.addPass(mlir::createMemRefToLLVMConversionPass()); pm.addNestedPass( mlir::arith::createConvertArithmeticToLLVMPass()); pm.addPass(mlir::createConvertFuncToLLVMPass());