From ad09060139f890ab096bb0b2b9e2eda4d034f7f9 Mon Sep 17 00:00:00 2001 From: Jeff Fifield Date: Wed, 3 Jul 2024 11:57:14 -0600 Subject: [PATCH] Bump llvm (#646) * update llvm and mlir-aie * Update CMakeLists.txt --- mlir/lib/Conversion/AIRLoweringPass.cpp | 10 ---------- mlir/lib/Transform/AIRLinalgCodegen.cpp | 16 ++++++++-------- python/CMakeLists.txt | 1 - utils/clone-llvm.sh | 2 +- utils/clone-mlir-aie.sh | 2 +- 5 files changed, 10 insertions(+), 21 deletions(-) diff --git a/mlir/lib/Conversion/AIRLoweringPass.cpp b/mlir/lib/Conversion/AIRLoweringPass.cpp index ff4a1b3b8..57c9140ef 100644 --- a/mlir/lib/Conversion/AIRLoweringPass.cpp +++ b/mlir/lib/Conversion/AIRLoweringPass.cpp @@ -1076,16 +1076,6 @@ class AIRLoweringPass : public air::impl::AIRLoweringBase { signalPassFailure(); } - RewritePatternSet cast_patterns(context); - populateReconcileUnrealizedCastsPatterns(cast_patterns); - ConversionTarget cast_target(getContext()); - cast_target.addIllegalOp(); - if (failed(applyPartialConversion(module, cast_target, - std::move(cast_patterns)))) { - emitError(UnknownLoc::get(context), "error lowering air dialect\n"); - signalPassFailure(); - } - // If scf parallel loops containing memcpy ops exist in the same scope as // herd load, then attempt to serialize the asynchronous control programs. module.walk([&](func::FuncOp f) { diff --git a/mlir/lib/Transform/AIRLinalgCodegen.cpp b/mlir/lib/Transform/AIRLinalgCodegen.cpp index 425e54f79..5c07521f7 100644 --- a/mlir/lib/Transform/AIRLinalgCodegen.cpp +++ b/mlir/lib/Transform/AIRLinalgCodegen.cpp @@ -1991,9 +1991,9 @@ void transform::LinalgTileOp::print(OpAsmPrinter &p) { void transform::LinalgTileOp::getEffects( SmallVectorImpl &effects) { - consumesHandle(getTarget(), effects); - onlyReadsHandle(getDynamicSizes(), effects); - producesHandle(getTiledLinalgOp(), effects); + consumesHandle(getTargetMutable(), effects); + onlyReadsHandle(getDynamicSizesMutable(), effects); + producesHandle(getOperation()->getOpResults(), effects); producesHandle(getLoops(), effects); modifiesPayload(effects); } @@ -2113,8 +2113,8 @@ transform::LinalgPromoteOp::apply(transform::TransformRewriter &rewriter, void transform::LinalgPromoteOp::getEffects( SmallVectorImpl &effects) { - onlyReadsHandle(getTarget(), effects); - producesHandle(getResult(), effects); + onlyReadsHandle(getTargetMutable(), effects); + producesHandle(getOperation()->getOpResults(), effects); modifiesPayload(effects); } @@ -2132,9 +2132,9 @@ void transform::FuseIntoContainingMemrefOp::build(OpBuilder &builder, void transform::FuseIntoContainingMemrefOp::getEffects( SmallVectorImpl &effects) { - consumesHandle(getProducerOp(), effects); - onlyReadsHandle(getContainingOp(), effects); - producesHandle(getFusedOp(), effects); + consumesHandle(getProducerOpMutable(), effects); + onlyReadsHandle(getContainingOpMutable(), effects); + producesHandle(getOperation()->getOpResults(), effects); modifiesPayload(effects); } diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index bbe493f48..ac5781f26 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -105,7 +105,6 @@ add_mlir_python_modules(AirMLIRPythonModules AirPythonExtensions COMMON_CAPI_LINK_LIBS AirAggregateCAPI - AIRCAPI ) add_mlir_python_modules(AirPythonModules diff --git a/utils/clone-llvm.sh b/utils/clone-llvm.sh index 05c7ce4d8..09116a1bf 100755 --- a/utils/clone-llvm.sh +++ b/utils/clone-llvm.sh @@ -14,7 +14,7 @@ # ##===----------------------------------------------------------------------===## -export commithash=a50bcc03cbaecf6473c6bf41f4497758a7876f3d +export commithash=ae570d82e8c021f45209830db8c9c7bb79bed394 target_dir=llvm # clone llvm if it is not there already diff --git a/utils/clone-mlir-aie.sh b/utils/clone-mlir-aie.sh index 5adc2e91b..5bcd70511 100755 --- a/utils/clone-mlir-aie.sh +++ b/utils/clone-mlir-aie.sh @@ -14,7 +14,7 @@ # ##===----------------------------------------------------------------------===## -export HASH=cd33847b76a7c3b9f08ea303421778af8291787a +export HASH=76460fed78cc74cd59ac56e665e0ee0b4524d0ef target_dir=mlir-aie if [[ ! -d $target_dir ]]; then