Convert to Opaque ptr fix

llvm · Sep 21, 2023 · 508f1d8 · 508f1d8
1 parent df5addc
commit 508f1d8
Showing 1 changed file with 12 additions and 26 deletions.
diff --git a/lib/polygeist/Passes/ConvertToOpaquePtr.cpp b/lib/polygeist/Passes/ConvertToOpaquePtr.cpp
@@ -53,31 +53,19 @@ static LogicalResult convertPtrsToOpaque(Operation *op, Operation *&rewritten,
   return success();
 }
 
-struct Pointer2MemrefConversion : public OpConversionPattern<Pointer2MemrefOp> {
-  using OpConversionPattern<Pointer2MemrefOp>::OpConversionPattern;
-  LogicalResult
-  matchAndRewrite(Pointer2MemrefOp op, OpAdaptor adaptor,
-                  ConversionPatternRewriter &rewriter) const final {
-    Operation *rewritten;
-    TypeAttr elty = nullptr;
-    if (convertPtrsToOpaque(op, rewritten, elty, adaptor.getOperands(),
-                            rewriter, getTypeConverter())
-            .failed())
-      return failure();
-    rewriter.replaceOp(op, rewritten->getResults());
-    return success();
-  }
-};
+struct OpConversion : public ConversionPattern {
+  const TypeConverter *typeConverter;
+  OpConversion(const TypeConverter &converter, MLIRContext *ctx)
+      : ConversionPattern(converter, Pattern::MatchAnyOpTypeTag(), 1, ctx),
+        typeConverter(&converter) {}
 
-struct Memref2PointerConversion : public OpConversionPattern<Memref2PointerOp> {
-  using OpConversionPattern<Memref2PointerOp>::OpConversionPattern;
   LogicalResult
-  matchAndRewrite(Memref2PointerOp op, OpAdaptor adaptor,
+  matchAndRewrite(Operation *op, ArrayRef<Value> operands,
                   ConversionPatternRewriter &rewriter) const final {
     Operation *rewritten;
     TypeAttr elty = nullptr;
-    if (convertPtrsToOpaque(op, rewritten, elty, adaptor.getOperands(),
-                            rewriter, getTypeConverter())
+    if (convertPtrsToOpaque(op, rewritten, elty, operands, rewriter,
+                            typeConverter)
             .failed())
       return failure();
     rewriter.replaceOp(op, rewritten->getResults());
@@ -139,10 +127,8 @@ struct ConvertToOpaquePtrPass
             return false;
       return true;
     };
-    target.addDynamicallyLegalOp<LLVM::GEPOp>(
-        [&](LLVM::GEPOp op) { return ptrsAreOpaque(op); });
-    target.addDynamicallyLegalOp<LLVM::AllocaOp>(
-        [&](LLVM::AllocaOp op) { return ptrsAreOpaque(op); });
+    target.addDynamicallyLegalDialect<LLVM::LLVMDialect>(
+        [&](Operation *op) { return ptrsAreOpaque(op); });
     target.addDynamicallyLegalOp<Memref2PointerOp>(
         [&](Memref2PointerOp op) { return ptrsAreOpaque(op); });
     target.addDynamicallyLegalOp<Pointer2MemrefOp>(
@@ -155,8 +141,8 @@ struct ConvertToOpaquePtrPass
     converter.addConversion([&](MemRefType ty) { return ty; });
 
     RewritePatternSet patterns(&getContext());
-    patterns.add<GEPConversion, AllocaConversion, Memref2PointerConversion,
-                 Pointer2MemrefConversion>(converter, &getContext());
+    patterns.add<GEPConversion, AllocaConversion, OpConversion>(converter,
+                                                                &getContext());
     if (failed(applyPartialConversion(getOperation(), target,
                                       std::move(patterns))))
       signalPassFailure();