Update to match upstream API change (NFC).

jpienaar · Google-ML-Automation · commit dd006b86935f · 2025-01-13T20:09:36.000-08:00
This method was renamed but staging function kept, switch to renamed variant.

PiperOrigin-RevId: 715208433
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();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -240,8 +240,8 @@ class ConvertFloatNvidiaPass`
`240`	`240`	`void runOnOperation() override {`
`241`	`241`	`mlir::RewritePatternSet patterns(&getContext());`
`242`	`242`	`patterns.add<RewriteTruncFPattern, RewriteExtFPattern>(&getContext());`
`243`		`- if (mlir::failed(mlir::applyPatternsAndFoldGreedily(getOperation(),`
`244`		`- std::move(patterns)))) {`
	`243`	`+ if (mlir::failed(`
	`244`	`+ mlir::applyPatternsGreedily(getOperation(), std::move(patterns)))) {`
`245`	`245`	`signalPassFailure();`
`246`	`246`	`}`
`247`	`247`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,8 @@ class ConvertPureCallOpsPass`
`44`	`44`	`auto* ctx = &getContext();`
`45`	`45`	`mlir::RewritePatternSet patterns(ctx);`
`46`	`46`	`patterns.add<RewriteCall>(ctx);`
`47`		`- if (mlir::failed(mlir::applyPatternsAndFoldGreedily(getOperation(),`
`48`		`- std::move(patterns)))) {`
	`47`	`+ if (mlir::failed(`
	`48`	`+ mlir::applyPatternsGreedily(getOperation(), std::move(patterns)))) {`
`49`	`49`	`signalPassFailure();`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -648,8 +648,8 @@ class ExpandFloatOpsPass`
`648`	`648`	`RewriteFpToIPattern<ma::FPToUIOp>>(&getContext());`
`649`	`649`	`mlir::populatePolynomialApproximateTanhPattern(patterns);`
`650`	`650`	`patterns.add<RewriteErf32Pattern>(&getContext());`
`651`		`- if (mlir::failed(mlir::applyPatternsAndFoldGreedily(getOperation(),`
`652`		`- std::move(patterns)))) {`
	`651`	`+ if (mlir::failed(`
	`652`	`+ mlir::applyPatternsGreedily(getOperation(), std::move(patterns)))) {`
`653`	`653`	`signalPassFailure();`
`654`	`654`	`}`
`655`	`655`	`}`
Original file line number	Diff line number	Diff line change
`@@ -700,7 +700,7 @@ class FlattenTensorsPass`
`700`	`700`	`// clang-format on`
`701`	`701`	`ApplyIndexingOp::getCanonicalizationPatterns(patterns, mlir_context);`
`702`	`702`	`if (mlir::failed(`
`703`		`- mlir::applyPatternsAndFoldGreedily(module, std::move(patterns)))) {`
	`703`	`+ mlir::applyPatternsGreedily(module, std::move(patterns)))) {`
`704`	`704`	`signalPassFailure();`
`705`	`705`	`return;`
`706`	`706`	`}`
Original file line number	Diff line number	Diff line change
`@@ -388,8 +388,8 @@ class LowerXlaGpuToScfPass`
`388`	`388`	`patterns.add<RewritePredicatedInsert, RewritePredicatedExtract,`
`389`	`389`	`RewriteShuffleReduce, RewriteMaterialize, RewriteInsert>(`
`390`	`390`	`ctx, options_);`
`391`		`- if (mlir::failed(mlir::applyPatternsAndFoldGreedily(getOperation(),`
`392`		`- std::move(patterns)))) {`
	`391`	`+ if (mlir::failed(`
	`392`	`+ mlir::applyPatternsGreedily(getOperation(), std::move(patterns)))) {`
`393`	`393`	`signalPassFailure();`
`394`	`394`	`}`
`395`	`395`	`}`
`@@ -405,8 +405,8 @@ class LowerXlaGpuLoopsToScfPass`
`405`	`405`	`auto* ctx = &getContext();`
`406`	`406`	`mlir::RewritePatternSet patterns(ctx);`
`407`	`407`	`patterns.add<RewriteXlaGpuLoop>(ctx);`
`408`		`- if (mlir::failed(mlir::applyPatternsAndFoldGreedily(getOperation(),`
`409`		`- std::move(patterns)))) {`
	`408`	`+ if (mlir::failed(`
	`409`	`+ mlir::applyPatternsGreedily(getOperation(), std::move(patterns)))) {`
`410`	`410`	`signalPassFailure();`
`411`	`411`	`}`
`412`	`412`	`}`
Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ struct SimplifyAffinePass`
`305`	`305`	`mlir::GreedyRewriteConfig config;`
`306`	`306`	`// There's no point simplifying more than once.`
`307`	`307`	`config.strictMode = mlir::GreedyRewriteStrictness::ExistingOps;`
`308`		`- if (mlir::failed(mlir::applyPatternsAndFoldGreedily(`
	`308`	`+ if (mlir::failed(mlir::applyPatternsGreedily(`
`309`	`309`	`getOperation(), std::move(patterns), config))) {`
`310`	`310`	`signalPassFailure();`
`311`	`311`	`}`
Original file line number	Diff line number	Diff line change
`@@ -363,16 +363,15 @@ class SimplifyArithPass`
`363`	`363`	`RewriteTruncExtShuffle`
`364`	`364`	`>(ctx);`
`365`	`365`	`// clang-format on`
`366`		`- if (mlir::failed(`
`367`		`- mlir::applyPatternsAndFoldGreedily(func, std::move(patterns)))) {`
	`366`	`+ if (mlir::failed(mlir::applyPatternsGreedily(func, std::move(patterns)))) {`
`368`	`367`	`signalPassFailure();`
`369`	`368`	`}`
`370`	`369`
`371`	`370`	`mlir::RewritePatternSet scf_patterns(ctx);`
`372`	`371`	`mlir::scf::ForOp::getCanonicalizationPatterns(scf_patterns, ctx);`
`373`	`372`	`mlir::scf::IfOp::getCanonicalizationPatterns(scf_patterns, ctx);`
`374`		`- if (mlir::failed(mlir::applyPatternsAndFoldGreedily(`
`375`		`- func, std::move(scf_patterns)))) {`
	`373`	`+ if (mlir::failed(`
	`374`	`+ mlir::applyPatternsGreedily(func, std::move(scf_patterns)))) {`
`376`	`375`	`signalPassFailure();`
`377`	`376`	`}`
`378`	`377`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,8 +89,8 @@ void UnswitchLoopsPass::runOnOperation() {`
`89`	`89`	`patterns.add<UnswitchLoop>(&getContext());`
`90`	`90`	`mlir::scf::ForOp::getCanonicalizationPatterns(patterns, &getContext());`
`91`	`91`	`mlir::scf::IfOp::getCanonicalizationPatterns(patterns, &getContext());`
`92`		`- if (mlir::failed(mlir::applyPatternsAndFoldGreedily(getOperation(),`
`93`		`- std::move(patterns)))) {`
	`92`	`+ if (mlir::failed(`
	`93`	`+ mlir::applyPatternsGreedily(getOperation(), std::move(patterns)))) {`
`94`	`94`	`signalPassFailure();`
`95`	`95`	`}`
`96`	`96`	`}`