Bump IREE to f27feffa3d44c834a184ed3ea4b704316fd1769e (#1001)

nod-ai · Jan 2, 2025 · d9b65af · d9b65af
1 parent 63a4ccb
commit d9b65af
Show file tree

Hide file tree

Showing 22 changed files with 25 additions and 24 deletions.
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -57,7 +57,7 @@ jobs:
       - name: Python deps
         run: |
           pip install -r third_party/iree/runtime/bindings/python/iree/runtime/build_requirements.txt
-          pip install pyyaml pybind11==2.13.6 nanobind==2.2.0
+          pip install pyyaml pybind11==2.13.6 nanobind==2.4.0
 
       - name: Enable cache
         uses: actions/cache/restore@v3

diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
@@ -78,7 +78,7 @@ jobs:
       - name: Python deps
         run: |
           pip install -r third_party/iree/runtime/bindings/python/iree/runtime/build_requirements.txt
-          pip install pytest pybind11==2.13.6 nanobind==2.2.0
+          pip install pytest pybind11==2.13.6 nanobind==2.4.0
 
       - name: Enable cache
         uses: actions/cache/restore@v3

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
@@ -81,7 +81,7 @@ jobs:
       - name: Python deps
         run: |
           pip install -r third_party\iree\runtime\bindings\python\iree\runtime\build_requirements.txt
-          pip install pyyaml pybind11==2.13.6 nanobind==2.2.0
+          pip install pyyaml pybind11==2.13.6 nanobind==2.4.0
 
       - name: Enable cache
         uses: actions/cache/restore@v3

diff --git a/compiler/plugins/target/AMD-AIE/aievec/ConvertVectorToAIEVec.cpp b/compiler/plugins/target/AMD-AIE/aievec/ConvertVectorToAIEVec.cpp
@@ -72,7 +72,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);
   }

diff --git a/compiler/plugins/target/AMD-AIE/aievec/VectorToVectorConversions.cpp b/compiler/plugins/target/AMD-AIE/aievec/VectorToVectorConversions.cpp
@@ -1042,14 +1042,14 @@ struct CanonicalizeVectorForAIEVecPass
       RewritePatternSet patterns(context);
       patterns.add<CanonicalizeTrivialReadAccessSubviewOpPattern,
                    CanonicalizeTrivialWriteAccessSubviewOpPattern>(context);
-      (void)applyPatternsAndFoldGreedily(op, std::move(patterns));
+      (void)applyPatternsGreedily(op, std::move(patterns));
     }
     {
       // These must run before 'populateVectorBroadcastLoweringPatterns'
       // so that broadcasts can be matched before conversion to insert.
       RewritePatternSet patterns(context);
       populateBubbleSignExtensionsLate(patterns);
-      (void)applyPatternsAndFoldGreedily(op, std::move(patterns));
+      (void)applyPatternsGreedily(op, std::move(patterns));
     }
 
     {
@@ -1067,7 +1067,7 @@ struct CanonicalizeVectorForAIEVecPass
       mlir::vector::populateShapeCastFoldingPatterns(patterns);
       mlir::vector::populateDropUnitDimWithShapeCastPatterns(patterns);
       mlir::vector::populateVectorBroadcastLoweringPatterns(patterns);
-      (void)applyPatternsAndFoldGreedily(op, std::move(patterns));
+      (void)applyPatternsGreedily(op, std::move(patterns));
     }
 
     {
@@ -1076,7 +1076,7 @@ struct CanonicalizeVectorForAIEVecPass
       // cycles.
       RewritePatternSet patterns(context);
       populateBubbleSignExtensionsLate(patterns);
-      (void)applyPatternsAndFoldGreedily(op, std::move(patterns));
+      (void)applyPatternsGreedily(op, std::move(patterns));
     }
   }
 };

diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Target/XCLBinGen.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Target/XCLBinGen.cpp
@@ -1021,6 +1021,7 @@ void addLowerToLLVMPasses(OpPassManager &pm) {
   ConvertFuncToLLVMPassOptions opts;
   opts.useBarePtrCallConv = true;
   pm.addPass(createConvertFuncToLLVMPass(opts));
+  pm.addPass(createArithToLLVMConversionPass());
   pm.addPass(createCanonicalizerPass());
   pm.addPass(createCSEPass());
   pm.addPass(createConvertControlFlowToLLVMPass());

diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEAssignTiles.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEAssignTiles.cpp
@@ -321,7 +321,7 @@ LogicalResult assignNonLocalTiles(RewriterBase &rewriter, Operation *op,
   // Find and fill the tile candidates.
   RewritePatternSet fillTilePatterns(context);
   fillTilePatterns.insert<FillTiles>(context, deviceModel);
-  if (failed(applyPatternsAndFoldGreedily(op, std::move(fillTilePatterns)))) {
+  if (failed(applyPatternsGreedily(op, std::move(fillTilePatterns)))) {
     return op->emitOpError()
            << "collection of tile candidates for logical objectFifos failed";
   }

diff --git a/...iler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIECanonicalizeDoublyStridedOp.cpp b/...iler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIECanonicalizeDoublyStridedOp.cpp
@@ -211,7 +211,7 @@ void AMDAIECanonicalizeDoublyStridedOpPass::runOnOperation() {
   }
   populateCanonicalizeDoublyStridedOpPatterns(patterns, foldSingleDims,
                                               deviceModel);
-  if (failed(applyPatternsAndFoldGreedily(parentOp, std::move(patterns)))) {
+  if (failed(applyPatternsGreedily(parentOp, std::move(patterns)))) {
     parentOp->emitOpError(
         "failed to canonicalize doubly strided DMA operations");
     return signalPassFailure();

diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIECombineStridedOps.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIECombineStridedOps.cpp
@@ -183,7 +183,7 @@ void AMDAIECombineStridedOpsPass::runOnOperation() {
   MLIRContext *context = &getContext();
   RewritePatternSet patterns(context);
   populateStridedOpCombinationPattern(patterns);
-  if (failed(applyPatternsAndFoldGreedily(parentOp, std::move(patterns)))) {
+  if (failed(applyPatternsGreedily(parentOp, std::move(patterns)))) {
     parentOp->emitOpError("failed to combine strided operations");
     return signalPassFailure();
   }

diff --git a/...er/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEDistributeCoresAndObjectFifos.cpp b/...er/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEDistributeCoresAndObjectFifos.cpp
@@ -478,7 +478,7 @@ void AMDAIEDistributeCoresAndObjectFifosPass::runOnOperation() {
   // possible.
   RewritePatternSet unrollLocalLoopsPatterns(context);
   unrollLocalLoopsPatterns.insert<AMDAIEUnrollLocalLoops>(context);
-  if (failed(applyPatternsAndFoldGreedily(
+  if (failed(applyPatternsGreedily(
           moduleOp, std::move(unrollLocalLoopsPatterns)))) {
     moduleOp.emitOpError()
         << "loop unrolling of loops selected for parallel execution failed";

diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEDmaComposition.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEDmaComposition.cpp
@@ -56,7 +56,7 @@ void AMDAIEDmaCompositionPass::runOnOperation() {
   populateStridedOpCombinationPattern(patterns);
   populateCanonicalizeDoublyStridedOpPatterns(patterns, false, deviceModel);
 
-  if (failed(applyPatternsAndFoldGreedily(parentOp, std::move(patterns)))) {
+  if (failed(applyPatternsGreedily(parentOp, std::move(patterns)))) {
     parentOp->emitOpError("failed to compose strided operations");
     return signalPassFailure();
   }

diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEDmaLoopSubsumption.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEDmaLoopSubsumption.cpp
@@ -649,7 +649,7 @@ void AMDAIEDmaLoopSubsumptionPass::runOnOperation() {
                                       onlyZeroStrideOnOuterDim);
   }
 
-  if (failed(applyPatternsAndFoldGreedily(parentOp, std::move(patterns)))) {
+  if (failed(applyPatternsGreedily(parentOp, std::move(patterns)))) {
     parentOp->emitOpError("failed to subsume some loops into DMA operations");
     return signalPassFailure();
   }

diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIELowerToUKernels.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIELowerToUKernels.cpp
@@ -277,7 +277,7 @@ void AMDAIELowerToUKernelsPass::runOnOperation() {
   patterns.insert<LowerToUKernelPattern<linalg::FillOp>>(context, allTargets,
                                                          pathToUkernels);
   if (failed(
-          applyPatternsAndFoldGreedily(getOperation(), std::move(patterns)))) {
+          applyPatternsGreedily(getOperation(), std::move(patterns)))) {
     return signalPassFailure();
   }
 }

diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEPropagateDataLayout.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEPropagateDataLayout.cpp
@@ -74,7 +74,7 @@ void AMDAIEPropagateDataLayoutPass::runOnOperation() {
       patterns, [](OpOperand *opOperand) { return true; });
   patterns.add<RemoveOutsDependency>(context);
 
-  if (failed(applyPatternsAndFoldGreedily(getOperation(), std::move(patterns))))
+  if (failed(applyPatternsGreedily(getOperation(), std::move(patterns))))
     return signalPassFailure();
 }
 

diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIESinkIntoCore.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIESinkIntoCore.cpp
@@ -89,7 +89,7 @@ class AMDAIESinkIntoCorePass
   void runOnOperation() override {
     RewritePatternSet patterns(&getContext());
     patterns.insert<SinkingPattern>(&getContext());
-    if (failed(applyPatternsAndFoldGreedily(getOperation(),
+    if (failed(applyPatternsGreedily(getOperation(),
                                             std::move(patterns)))) {
       signalPassFailure();
     }

diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIETile.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIETile.cpp
@@ -120,7 +120,7 @@ void AMDAIETilePass::runOnOperation() {
       op->emitOpError("failed to tile the operation");
       return signalPassFailure();
     }
-    rewriter.replaceOp(op, tiledResults->replacements);
+    rewriter.replaceOp(op, tiledResults->mergeResult.replacements);
   }
 }
 

diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEVectorization.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEVectorization.cpp
@@ -115,7 +115,7 @@ void AMDAIEVectorizationPass::runOnOperation() {
   vector::populateVectorTransferPermutationMapLoweringPatterns(
       vectorizationPatterns);
 
-  (void)applyPatternsAndFoldGreedily(funcOp, std::move(vectorizationPatterns));
+  (void)applyPatternsGreedily(funcOp, std::move(vectorizationPatterns));
 }
 }  // namespace
 

diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/BridgeToAIRPass.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/BridgeToAIRPass.cpp
@@ -103,7 +103,7 @@ void AMDAIEBridgeToAIRPass::runOnOperation() {
       .insert<LinalgCopyToMemRefCopy, SCFForAllToParallelOp, AffineApplyOnSym>(
           context);
   if (failed(
-          applyPatternsAndFoldGreedily(getOperation(), std::move(patterns)))) {
+          applyPatternsGreedily(getOperation(), std::move(patterns)))) {
     return signalPassFailure();
   }
 }

diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Cleanup.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Cleanup.cpp
@@ -75,7 +75,7 @@ void AMDAIECleanupPass::runOnOperation() {
 
   RewritePatternSet patterns(context);
   populateCleanupPatterns(patterns);
-  if (failed(applyPatternsAndFoldGreedily(funcOp, std::move(patterns)))) {
+  if (failed(applyPatternsGreedily(funcOp, std::move(patterns)))) {
     return signalPassFailure();
   }
   {

diff --git a/...iler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/DecomposeLinalgExtPackUnPackToAIR.cpp b/...iler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/DecomposeLinalgExtPackUnPackToAIR.cpp
@@ -317,7 +317,7 @@ void AMDAIEDecomposeLinalgExtPackUnPackToAIRPass::runOnOperation() {
   RewritePatternSet patterns(ctx);
   patterns.add<LowerPackPattern, LowerUnPackPattern>(ctx);
   if (failed(
-          applyPatternsAndFoldGreedily(getOperation(), std::move(patterns)))) {
+          applyPatternsGreedily(getOperation(), std::move(patterns)))) {
     return signalPassFailure();
   }
 }

diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/KernelDispatch.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/KernelDispatch.cpp
@@ -804,7 +804,7 @@ LogicalResult initAIELaunchConfig(FunctionOpInterface funcOp,
   // Resolve those away.
   RewritePatternSet patterns(funcOp.getContext());
   memref::populateResolveRankedShapedTypeResultDimsPatterns(patterns);
-  return applyPatternsAndFoldGreedily(funcOp, std::move(patterns));
+  return applyPatternsGreedily(funcOp, std::move(patterns));
 }
 
 }  // namespace mlir::iree_compiler::AMDAIE
diff --git a/third_party/iree b/third_party/iree