rebase to polygeist upstream

llvm · May 24, 2022 · 524ccc8 · 524ccc8
1 parent 52f6117
commit 524ccc8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/include/polygeist/Passes/Passes.td b/include/polygeist/Passes/Passes.td
@@ -78,7 +78,7 @@ def RemoveTrivialUse : Pass<"trivialuse"> {
   let constructor = "mlir::polygeist::createRemoveTrivialUsePass()";
 }
 
-def LowerPolygeistOps : Pass<"lower-polygeist-ops", "FuncOp"> {
+def LowerPolygeistOps : Pass<"lower-polygeist-ops"> {
   let summary = "Lower polygeist ops to memref operations";
   let constructor = "mlir::polygeist::createLowerPolygeistOpsPass()";
   let dependentDialects = ["::mlir::memref::MemRefDialect"];

diff --git a/lib/polygeist/Passes/LowerPolygeistOps.cpp b/lib/polygeist/Passes/LowerPolygeistOps.cpp
@@ -15,8 +15,6 @@
 
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
-#include "mlir/Dialect/StandardOps/IR/Ops.h"
-#include "mlir/Dialect/StandardOps/Transforms/Passes.h"
 #include "mlir/Rewrite/FrozenRewritePatternSet.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "polygeist/Dialect.h"
@@ -68,14 +66,13 @@ struct LowerPolygeistOpsPass
 
   void runOnOperation() override {
     auto op = getOperation();
-    auto ctx = op.getContext();
+    auto ctx = op->getContext();
     RewritePatternSet patterns(ctx);
     patterns.insert<SubIndexToReinterpretCast>(ctx);
 
     ConversionTarget target(*ctx);
     target.addIllegalDialect<polygeist::PolygeistDialect>();
-    target.addLegalDialect<arith::ArithmeticDialect, mlir::StandardOpsDialect,
-                           memref::MemRefDialect>();
+    target.addLegalDialect<arith::ArithmeticDialect, memref::MemRefDialect>();
 
     if (failed(applyPartialConversion(op, target, std::move(patterns))))
       return signalPassFailure();