diff --git a/mlir/include/mlir-c/PatternMatch.h b/mlir/include/mlir-c/PatternMatch.h --- a/mlir/include/mlir-c/PatternMatch.h +++ b/mlir/include/mlir-c/PatternMatch.h @@ -43,16 +43,9 @@ DEFINE_C_API_STRUCT(MlirPDLPatternModule, void); DEFINE_C_API_STRUCT(MlirRewritePatternSet, void); -DEFINE_C_API_STRUCT(MlirGreedyRewriteConfig, void); #undef DEFINE_C_API_STRUCT -enum MlirGreedyRewriteStrictness { - MlirGreedyRewriteStrictnessAnyOp, - MlirGreedyRewriteStrictnessExistingAndNewOps, - MlirGreedyRewriteStrictnessExistingOps -}; - /// Creates a PDLPatternModule from the given Module. MLIR_CAPI_EXPORTED MlirPDLPatternModule mlirPDLPatternGet(MlirModule module); @@ -66,11 +59,11 @@ /// Takes a pattern set owned by the caller and greedily applies it on the given region. MLIR_CAPI_EXPORTED MlirLogicalResult mlirApplyOwnedPatternsGreedilyOnRegion( - MlirRegion region, MlirRewritePatternSet patterns, MlirGreedyRewriteConfig config); + MlirRegion region, MlirRewritePatternSet patterns); /// Takes a pattern set owned by the caller and greedily applies it on the given operation. MLIR_CAPI_EXPORTED MlirLogicalResult mlirApplyOwnedPatternsGreedilyOnOperation( - MlirOperation op, MlirRewritePatternSet patterns, MlirGreedyRewriteConfig config); + MlirOperation op, MlirRewritePatternSet patterns); #ifdef __cplusplus } diff --git a/mlir/lib/CAPI/IR/PatternMatch.cpp b/mlir/lib/CAPI/IR/PatternMatch.cpp --- a/mlir/lib/CAPI/IR/PatternMatch.cpp +++ b/mlir/lib/CAPI/IR/PatternMatch.cpp @@ -20,7 +20,6 @@ DEFINE_C_API_PTR_METHODS(MlirPDLPatternModule, PDLPatternModule) DEFINE_C_API_PTR_METHODS(MlirRewritePatternSet, RewritePatternSet) -DEFINE_C_API_PTR_METHODS(MlirGreedyRewriteConfig, GreedyRewriteConfig) MlirPDLPatternModule mlirPDLPatternGet(MlirModule module) { return wrap(new PDLPatternModule(unwrap(module))); @@ -36,42 +35,16 @@ return wrap(&unwrap(patterns)->add(std::move(*(unwrap(pdlPattern))))); } -MlirGreedyRewriteConfig mlirGreedyRewriteConfigGet( - bool useTopDownTraversal, bool enableRegionSimplification, - int64_t maxIterations, int64_t maxNumRewrites, MlirRegion scope, - MlirGreedyRewriteStrictness strictMode) { - auto *config = new GreedyRewriteConfig(); - config->useTopDownTraversal = useTopDownTraversal; - config->enableRegionSimplification = enableRegionSimplification; - config->maxIterations = maxIterations; - config->maxNumRewrites = maxNumRewrites; - config->scope = unwrap(scope); - switch (strictMode) { - case MlirGreedyRewriteStrictnessAnyOp: - config->strictMode = GreedyRewriteStrictness::AnyOp; - break; - case MlirGreedyRewriteStrictnessExistingOps: - config->strictMode = GreedyRewriteStrictness::ExistingOps; - break; - case MlirGreedyRewriteStrictnessExistingAndNewOps: - config->strictMode = GreedyRewriteStrictness::ExistingAndNewOps; - break; - } - return wrap(config); -} - MlirLogicalResult mlirApplyOwnedPatternsGreedilyOnRegion(MlirRegion region, - MlirRewritePatternSet patterns, - MlirGreedyRewriteConfig config) { - return wrap(applyPatternsAndFoldGreedily( - *unwrap(region), std::move(*unwrap(patterns)), *unwrap(config))); + MlirRewritePatternSet patterns) { + return wrap(applyPatternsAndFoldGreedily(*unwrap(region), + std::move(*unwrap(patterns)))); } MlirLogicalResult mlirApplyOwnedPatternsGreedilyOnOperation(MlirOperation op, - MlirRewritePatternSet patterns, - MlirGreedyRewriteConfig config) { - return wrap(applyPatternsAndFoldGreedily( - unwrap(op), std::move(*unwrap(patterns)), *unwrap(config))); + MlirRewritePatternSet patterns) { + return wrap( + applyPatternsAndFoldGreedily(unwrap(op), std::move(*unwrap(patterns)))); }