Update to match upstream API change (NFC).

This method was renamed but staging function kept, switch to renamed variant. PiperOrigin-RevId: 715208433
Intel-tensorflow · Jan 14, 2025 · dd006b8 · dd006b8
1 parent 2eea949
commit dd006b8
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 24 deletions.
diff --git a/xla/backends/gpu/codegen/transforms/convert_float_nvidia.cc b/xla/backends/gpu/codegen/transforms/convert_float_nvidia.cc
@@ -240,8 +240,8 @@ class ConvertFloatNvidiaPass
   void runOnOperation() override {
     mlir::RewritePatternSet patterns(&getContext());
     patterns.add<RewriteTruncFPattern, RewriteExtFPattern>(&getContext());
-    if (mlir::failed(mlir::applyPatternsAndFoldGreedily(getOperation(),
-                                                        std::move(patterns)))) {
+    if (mlir::failed(
+            mlir::applyPatternsGreedily(getOperation(), std::move(patterns)))) {
       signalPassFailure();
     }
   }

diff --git a/xla/backends/gpu/codegen/transforms/convert_xla_gpu_pure_call_ops.cc b/xla/backends/gpu/codegen/transforms/convert_xla_gpu_pure_call_ops.cc
@@ -44,8 +44,8 @@ class ConvertPureCallOpsPass
     auto* ctx = &getContext();
     mlir::RewritePatternSet patterns(ctx);
     patterns.add<RewriteCall>(ctx);
-    if (mlir::failed(mlir::applyPatternsAndFoldGreedily(getOperation(),
-                                                        std::move(patterns)))) {
+    if (mlir::failed(
+            mlir::applyPatternsGreedily(getOperation(), std::move(patterns)))) {
       signalPassFailure();
     }
   }

diff --git a/xla/backends/gpu/codegen/transforms/expand_float_ops.cc b/xla/backends/gpu/codegen/transforms/expand_float_ops.cc
@@ -648,8 +648,8 @@ class ExpandFloatOpsPass
                  RewriteFpToIPattern<ma::FPToUIOp>>(&getContext());
     mlir::populatePolynomialApproximateTanhPattern(patterns);
     patterns.add<RewriteErf32Pattern>(&getContext());
-    if (mlir::failed(mlir::applyPatternsAndFoldGreedily(getOperation(),
-                                                        std::move(patterns)))) {
+    if (mlir::failed(
+            mlir::applyPatternsGreedily(getOperation(), std::move(patterns)))) {
       signalPassFailure();
     }
   }

diff --git a/xla/backends/gpu/codegen/transforms/flatten_tensors.cc b/xla/backends/gpu/codegen/transforms/flatten_tensors.cc
@@ -700,7 +700,7 @@ class FlattenTensorsPass
     // clang-format on
     ApplyIndexingOp::getCanonicalizationPatterns(patterns, mlir_context);
     if (mlir::failed(
-            mlir::applyPatternsAndFoldGreedily(module, std::move(patterns)))) {
+            mlir::applyPatternsGreedily(module, std::move(patterns)))) {
       signalPassFailure();
       return;
     }

diff --git a/xla/backends/gpu/codegen/transforms/lower_xla_gpu_to_scf.cc b/xla/backends/gpu/codegen/transforms/lower_xla_gpu_to_scf.cc
@@ -388,8 +388,8 @@ class LowerXlaGpuToScfPass
     patterns.add<RewritePredicatedInsert, RewritePredicatedExtract,
                  RewriteShuffleReduce, RewriteMaterialize, RewriteInsert>(
         ctx, options_);
-    if (mlir::failed(mlir::applyPatternsAndFoldGreedily(getOperation(),
-                                                        std::move(patterns)))) {
+    if (mlir::failed(
+            mlir::applyPatternsGreedily(getOperation(), std::move(patterns)))) {
       signalPassFailure();
     }
   }
@@ -405,8 +405,8 @@ class LowerXlaGpuLoopsToScfPass
     auto* ctx = &getContext();
     mlir::RewritePatternSet patterns(ctx);
     patterns.add<RewriteXlaGpuLoop>(ctx);
-    if (mlir::failed(mlir::applyPatternsAndFoldGreedily(getOperation(),
-                                                        std::move(patterns)))) {
+    if (mlir::failed(
+            mlir::applyPatternsGreedily(getOperation(), std::move(patterns)))) {
       signalPassFailure();
     }
   }

diff --git a/xla/backends/gpu/codegen/transforms/optimize_loops.cc b/xla/backends/gpu/codegen/transforms/optimize_loops.cc
@@ -312,8 +312,8 @@ class OptimizeLoopsPass
     // First unroll loops. If unrolling is possible, we prefer it.
     mlir::RewritePatternSet unroll_patterns(&getContext());
     unroll_patterns.add<UnrollLoops>(&getContext());
-    if (mlir::failed(mlir::applyPatternsAndFoldGreedily(
-            getOperation(), std::move(unroll_patterns)))) {
+    if (mlir::failed(mlir::applyPatternsGreedily(getOperation(),
+                                                 std::move(unroll_patterns)))) {
       signalPassFailure();
       return;
     }
@@ -322,8 +322,8 @@ class OptimizeLoopsPass
     mlir::RewritePatternSet patterns(&getContext());
     patterns.add<PipelineLoad<mlir::vector::TransferReadOp>,
                  PipelineLoad<mlir::tensor::ExtractOp>>(&getContext());
-    if (mlir::failed(mlir::applyPatternsAndFoldGreedily(getOperation(),
-                                                        std::move(patterns)))) {
+    if (mlir::failed(
+            mlir::applyPatternsGreedily(getOperation(), std::move(patterns)))) {
       signalPassFailure();
     }
   }

diff --git a/xla/backends/gpu/codegen/transforms/peel_loops.cc b/xla/backends/gpu/codegen/transforms/peel_loops.cc
@@ -133,8 +133,7 @@ struct PeelLoopsPass : public impl::PeelLoopsPassBase<PeelLoopsPass> {
     mlir::MLIRContext* mlir_context = &getContext();
     mlir::RewritePatternSet patterns(mlir_context);
     patterns.add<PeelLoop>(mlir_context);
-    if (mlir::failed(
-            mlir::applyPatternsAndFoldGreedily(func, std::move(patterns)))) {
+    if (mlir::failed(mlir::applyPatternsGreedily(func, std::move(patterns)))) {
       signalPassFailure();
       return;
     }

diff --git a/xla/backends/gpu/codegen/transforms/simplify_affine.cc b/xla/backends/gpu/codegen/transforms/simplify_affine.cc
@@ -305,7 +305,7 @@ struct SimplifyAffinePass
     mlir::GreedyRewriteConfig config;
     // There's no point simplifying more than once.
     config.strictMode = mlir::GreedyRewriteStrictness::ExistingOps;
-    if (mlir::failed(mlir::applyPatternsAndFoldGreedily(
+    if (mlir::failed(mlir::applyPatternsGreedily(
             getOperation(), std::move(patterns), config))) {
       signalPassFailure();
     }

diff --git a/xla/backends/gpu/codegen/transforms/simplify_arith.cc b/xla/backends/gpu/codegen/transforms/simplify_arith.cc
@@ -363,16 +363,15 @@ class SimplifyArithPass
       RewriteTruncExtShuffle
     >(ctx);
     // clang-format on
-    if (mlir::failed(
-            mlir::applyPatternsAndFoldGreedily(func, std::move(patterns)))) {
+    if (mlir::failed(mlir::applyPatternsGreedily(func, std::move(patterns)))) {
       signalPassFailure();
     }
 
     mlir::RewritePatternSet scf_patterns(ctx);
     mlir::scf::ForOp::getCanonicalizationPatterns(scf_patterns, ctx);
     mlir::scf::IfOp::getCanonicalizationPatterns(scf_patterns, ctx);
-    if (mlir::failed(mlir::applyPatternsAndFoldGreedily(
-            func, std::move(scf_patterns)))) {
+    if (mlir::failed(
+            mlir::applyPatternsGreedily(func, std::move(scf_patterns)))) {
       signalPassFailure();
     }
   }

diff --git a/xla/backends/gpu/codegen/transforms/unswitch_loops.cc b/xla/backends/gpu/codegen/transforms/unswitch_loops.cc
@@ -89,8 +89,8 @@ void UnswitchLoopsPass::runOnOperation() {
   patterns.add<UnswitchLoop>(&getContext());
   mlir::scf::ForOp::getCanonicalizationPatterns(patterns, &getContext());
   mlir::scf::IfOp::getCanonicalizationPatterns(patterns, &getContext());
-  if (mlir::failed(mlir::applyPatternsAndFoldGreedily(getOperation(),
-                                                      std::move(patterns)))) {
+  if (mlir::failed(
+          mlir::applyPatternsGreedily(getOperation(), std::move(patterns)))) {
     signalPassFailure();
   }
 }