Bump llvm (#646)

* update llvm and mlir-aie * Update CMakeLists.txt
Xilinx · Jul 3, 2024 · ad09060 · ad09060
1 parent 0fb668c
commit ad09060
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 21 deletions.
diff --git a/mlir/lib/Conversion/AIRLoweringPass.cpp b/mlir/lib/Conversion/AIRLoweringPass.cpp
@@ -1076,16 +1076,6 @@ class AIRLoweringPass : public air::impl::AIRLoweringBase<AIRLoweringPass> {
       signalPassFailure();
     }
 
-    RewritePatternSet cast_patterns(context);
-    populateReconcileUnrealizedCastsPatterns(cast_patterns);
-    ConversionTarget cast_target(getContext());
-    cast_target.addIllegalOp<UnrealizedConversionCastOp>();
-    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
@@ -1991,9 +1991,9 @@ void transform::LinalgTileOp::print(OpAsmPrinter &p) {
 
 void transform::LinalgTileOp::getEffects(
     SmallVectorImpl<MemoryEffects::EffectInstance> &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<MemoryEffects::EffectInstance> &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<MemoryEffects::EffectInstance> &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
@@ -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
@@ -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
@@ -14,7 +14,7 @@
 #
 ##===----------------------------------------------------------------------===##
 
-export HASH=cd33847b76a7c3b9f08ea303421778af8291787a
+export HASH=76460fed78cc74cd59ac56e665e0ee0b4524d0ef
 target_dir=mlir-aie
 
 if [[ ! -d $target_dir ]]; then