Skip to content

Update llvm and replace deprecated applyPatternsAndFoldGreedily with applyPatternsGreedily #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: feature/fused-ops
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Conversion/TosaToXTenNN.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ class TosaToXTenNNPass
context);

FrozenRewritePatternSet frozenSetOfPatterns(std::move(patterns));
if (failed(applyPatternsAndFoldGreedily(module, frozenSetOfPatterns))) {
if (failed(applyPatternsGreedily(module, frozenSetOfPatterns))) {
emitError(module->getLoc())
<< "failed to convert TOSA to XTenNN Quantization "
"Operations.";
Expand Down
2 changes: 1 addition & 1 deletion lib/Conversion/XTenNNToTosa.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ class XTenNNToTosaPass
tosa::ClampOp::getCanonicalizationPatterns(patterns, context);

FrozenRewritePatternSet frozenSetOfPatterns(std::move(patterns));
if (failed(applyPatternsAndFoldGreedily(module, frozenSetOfPatterns))) {
if (failed(applyPatternsGreedily(module, frozenSetOfPatterns))) {
emitError(module->getLoc())
<< "failed to convert XTenNN quantization operations to TOSA.";
signalPassFailure();
Expand Down
3 changes: 1 addition & 2 deletions lib/Dialect/XTenNN/Transforms/CanonicalizePass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ struct CanonicalizePass
if (allowDestructivePatterns)
populateDestructiveCanonicalizePatterns(patterns);

if (applyPatternsAndFoldGreedily(getOperation(), std::move(patterns))
.failed())
if (applyPatternsGreedily(getOperation(), std::move(patterns)).failed())
signalPassFailure();
}
};
Expand Down
3 changes: 1 addition & 2 deletions lib/Dialect/XTenNN/Transforms/Simplify.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include "mlir/IR/PatternMatch.h"
#include "mlir/Interfaces/SideEffectInterfaces.h"
#include "mlir/Transforms/GreedyPatternRewriteDriver.h"
#include "mlir/Interfaces/SideEffectInterfaces.h"

#include "llvm/ADT/SmallVector.h"
#include "llvm/Support/Debug.h"
Expand Down Expand Up @@ -131,7 +130,7 @@ class SimplifyPass

populateSimplifyPatterns(patterns);

std::ignore = applyPatternsAndFoldGreedily(
std::ignore = applyPatternsGreedily(
getOperation(), FrozenRewritePatternSet(std::move(patterns)));
}
};
Expand Down
2 changes: 1 addition & 1 deletion llvm-project
Submodule llvm-project updated 15680 files