Bump llvm to f926bcf9068c808b643a56322b7ef6910eb36599 (#2012)

Author: erwei-xilinx

CMakeLists.txt

@@ -188,7 +188,7 @@ cmake_dependent_option(AIE_ENABLE_AIRBIN
 # If we need runtime libs, then statically link them.
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
-add_flag_if_supported("-Werror=sign-compare" WERROR_SIGN_COMPARE)
+# add_flag_if_supported("-Werror=sign-compare" WERROR_SIGN_COMPARE)
 add_flag_if_supported("-Werror=unused" WERROR_USED)
 
 # What happens when you have a non-void function with no return?

lib/Dialect/AIEVec/Transforms/ConvertVectorToAIEVec.cpp

@@ -88,7 +88,7 @@ struct RedundantLoadStoreOptimizationPass
     patterns.add<SetInboundsToReadOp, SetInboundsToWriteOp>(
         patterns.getContext());
 
-    (void)applyPatternsAndFoldGreedily(op, std::move(patterns));
+    (void)applyPatternsGreedily(op, std::move(patterns));
     IRRewriter rewriter(&getContext());
     vector::transferOpflowOpt(rewriter, op);
   }

lib/Dialect/AIEVec/Transforms/DynamicSizeNoImplicitBroadcast.cpp

@@ -113,7 +113,7 @@ struct DynamicSizeNoImplicitBroadcastPass
 
     patterns.add<DynamicSizeNoImplicitBroadcastPattern>(patterns.getContext());
 
-    (void)applyPatternsAndFoldGreedily(op, std::move(patterns));
+    (void)applyPatternsGreedily(op, std::move(patterns));
   }
 };
 

lib/Dialect/AIEVec/Transforms/VectorToVectorConversions.cpp

@@ -758,7 +758,7 @@ struct VectorBroadcastLoweringPass
     patterns.add<ConvertLeadingUnitDimInsertToReshapePattern>(
         patterns.getContext());
 
-    (void)applyPatternsAndFoldGreedily(op, std::move(patterns));
+    (void)applyPatternsGreedily(op, std::move(patterns));
   }
 };
 
@@ -872,7 +872,7 @@ struct HoistCastOpToDataSourcePass
 
     patterns.add<HoistCastOpToDataSourcePattern>(patterns.getContext());
 
-    (void)applyPatternsAndFoldGreedily(op, std::move(patterns));
+    (void)applyPatternsGreedily(op, std::move(patterns));
   }
 };
 
@@ -899,7 +899,7 @@ struct ReorderOperationsPass
                                  extInElemTy);
         });
 
-    (void)applyPatternsAndFoldGreedily(op, std::move(patterns));
+    (void)applyPatternsGreedily(op, std::move(patterns));
   }
 };
 

lib/Dialect/AIEX/Transforms/AIEMaterializeBDChains.cpp

@@ -125,8 +125,8 @@ struct AIEMaterializeBDChainsPass
     RewritePatternSet patterns_0(ctx);
     patterns_0.insert<DMAStartBdChainForOpPattern>(ctx);
     DMAConfigureTaskOp::getCanonicalizationPatterns(patterns_0, ctx);
-    if (failed(applyPatternsAndFoldGreedily(device, std::move(patterns_0),
-                                            rewriter_config))) {
+    if (failed(applyPatternsGreedily(device, std::move(patterns_0),
+                                     rewriter_config))) {
       signalPassFailure();
     }
 
@@ -135,8 +135,8 @@ struct AIEMaterializeBDChainsPass
     rewriter_config.enableRegionSimplification =
         GreedySimplifyRegionLevel::Disabled;
     DMAConfigureTaskOp::getCanonicalizationPatterns(patterns_1, ctx);
-    if (failed(applyPatternsAndFoldGreedily(device, std::move(patterns_1),
-                                            rewriter_config))) {
+    if (failed(applyPatternsGreedily(device, std::move(patterns_1),
+                                     rewriter_config))) {
       signalPassFailure();
     }
   }

lib/Dialect/AIEX/Transforms/AIESubstituteShimDMAAllocations.cpp

@@ -67,7 +67,7 @@ struct AIESubstituteShimDMAAllocationsPass
     RewritePatternSet patterns(&getContext());
     patterns.insert<DMAConfigureTaskForOpPattern>(&getContext());
 
-    (void)applyPatternsAndFoldGreedily(device, std::move(patterns));
+    (void)applyPatternsGreedily(device, std::move(patterns));
   }
 };
 

lib/Targets/AIERT.cpp

@@ -439,7 +439,7 @@ LogicalResult AIERTControl::initBuffers(DeviceOp &targetOp) {
             bytes.begin());
         byteVec.insert(byteVec.end(), bytes.begin(), bytes.end());
       }
-    } else if (denseInit.getElementType().isa<FloatType>()) {
+    } else if (isa<FloatType>(denseInit.getElementType())) {
       for (auto floatVal : denseInit.getValues<APFloat>()) {
         APInt floatInt = floatVal.bitcastToAPInt();
         // Get the size in bytes

python/dialects/aie.py

@@ -257,7 +257,8 @@ def __init__(self, tile, link_with=None, dynamic_objfifo_lowering=None):
 # Create an aie buffer of (shape x datatype) on given tile.
 # shape examples: [256], [256, 256], [256, 256,]
 # This class hides the BufferOp and instead pretends to be a MemRef
-class buffer(BufferOp, ShapedValue):
+@ShapedValue
+class buffer(BufferOp):
     def __init__(self):
         raise ValueError("Should never be called")
 

python/iron/kernel.py

@@ -44,7 +44,7 @@ def resolve(
         loc: ir.Location | None = None,
         ip: ir.InsertionPoint | None = None,
     ) -> None:
-        if self._op == None:
+        if not self._op:
             self._op = external_func(self._name, inputs=self._arg_types)
 
     def __call__(self, *args, **kwargs):

python/requirements_extras.txt

@@ -1,3 +1,3 @@
  # This can't go in the normal requirements file because the way the wheels build parses requirements.txt
  # does not support github packages
-git+https://github.com/makslevental/mlir-python-extras@b2b8d72
+git+https://github.com/makslevental/mlir-python-extras@8aba4e7

test/npu-xrt/sync_task_complete_token_bd_chaining/aie2.py

@@ -123,7 +123,7 @@ def sequence(input, output):
                         row=0,
                         direction=1,
                         channel=0,
-                        issue_token=1,
+                        issue_token=True,
                         repeat_count=0,
                     )
                     # Wait for the task completion token of the previously set off chain of BDs

test/python/execution_engine.py

@@ -35,7 +35,7 @@ def run(f):
 
 def lowerToLLVM(module):
     pm = PassManager.parse(
-        "builtin.module(convert-complex-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)"
+        "builtin.module(convert-complex-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,convert-arith-to-llvm,convert-cf-to-llvm,reconcile-unrealized-casts)"
     )
     pm.run(module.operation)
     return module

utils/clone-llvm.sh

@@ -13,8 +13,8 @@
 ##===----------------------------------------------------------------------===##
 
 # The LLVM commit to use.
-LLVM_PROJECT_COMMIT=f334db92be168876b618db72dc93078ce23ffa89
-DATETIME=2024121901
+LLVM_PROJECT_COMMIT=f926bcf9068c808b643a56322b7ef6910eb36599
+DATETIME=2025011002
 WHEEL_VERSION=20.0.0.$DATETIME+${LLVM_PROJECT_COMMIT:0:8}
 
 ############################################################################################