diff --git a/compiler/plugins/target/AMD-AIE/aievec/ConvertVectorToAIEVec.cpp b/compiler/plugins/target/AMD-AIE/aievec/ConvertVectorToAIEVec.cpp index e9e407921..317862b7d 100644 --- 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( 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 index 85169aa73..4f2ee3d0b 100644 --- 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(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/Transforms/AMDAIEAssignTiles.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEAssignTiles.cpp index 8b2efc49f..7c29a565c 100644 --- 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(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/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIECanonicalizeDoublyStridedOp.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIECanonicalizeDoublyStridedOp.cpp index b139551ff..894c3e14f 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIECanonicalizeDoublyStridedOp.cpp +++ b/compiler/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 index 2c0c97a31..9281d77ec 100644 --- 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/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEDistributeCoresAndObjectFifos.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEDistributeCoresAndObjectFifos.cpp index 9d59aaa51..16cc9d0d0 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEDistributeCoresAndObjectFifos.cpp +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEDistributeCoresAndObjectFifos.cpp @@ -478,7 +478,7 @@ void AMDAIEDistributeCoresAndObjectFifosPass::runOnOperation() { // possible. RewritePatternSet unrollLocalLoopsPatterns(context); unrollLocalLoopsPatterns.insert(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 index beec230f9..543bcf7da 100644 --- 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 index a0167245f..d03112fca 100644 --- 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 index 9a7bd5ae4..30b78d107 100644 --- 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>(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 index d71d8027d..dfd2e534c 100644 --- 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(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 index f6116a144..fea7cdcd6 100644 --- 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(&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/AMDAIEVectorization.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEVectorization.cpp index c0ba285e0..be3c47e42 100644 --- 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 index a8b3e0c81..824070eb9 100644 --- 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( 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 index da66885ef..27f948342 100644 --- 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/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/DecomposeLinalgExtPackUnPackToAIR.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/DecomposeLinalgExtPackUnPackToAIR.cpp index 4d92fb59c..edff2a7ea 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/DecomposeLinalgExtPackUnPackToAIR.cpp +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/DecomposeLinalgExtPackUnPackToAIR.cpp @@ -317,7 +317,7 @@ void AMDAIEDecomposeLinalgExtPackUnPackToAIRPass::runOnOperation() { RewritePatternSet patterns(ctx); patterns.add(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 index adca6844a..31791b299 100644 --- 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 index a43d893b4..f27feffa3 160000 --- a/third_party/iree +++ b/third_party/iree @@ -1 +1 @@ -Subproject commit a43d893b4d1946fabd7a6c7eb74c63ba7d42cdd5 +Subproject commit f27feffa3d44c834a184ed3ea4b704316fd1769e