unify pass

Author: gongshaotian

paddle/fluid/pybind/pir.cc

@@ -2585,9 +2585,7 @@ void InferSymbolicShapePass(
     pir::Program &program) {                          // NOLINT
   pir::IrContext *ctx = pir::IrContext::Instance();
   ctx->GetOrRegisterDialect<pir::shape::ShapeDialect>();
-  if (FLAGS_pir_apply_shape_optimization_pass) {
-    pass_manager->AddPass(pir::CreateShapeOptimizationPass());
-  }
+  pass_manager->AddPass(pir::CreateShapeOptimizationPass());
 }
 
 std::shared_ptr<Program> ApplyCommonSubexpressionEliminationPass(
@@ -2604,20 +2602,6 @@ std::shared_ptr<Program> ApplyCommonSubexpressionEliminationPass(
   return program;
 }
 
-void ApplyReduceAsToSumPass(
-    std::shared_ptr<pir::PassManager> &pass_manager,  // NOLINT
-    pir::Program &program) {                          // NOLINT
-#ifdef PADDLE_WITH_CINN
-  pass_manager->AddPass(cinn::dialect::ir::CreateReduceAsToSumPass());
-  pass_manager->AddPass(pir::CreateDeadCodeEliminationPass());
-#else
-  PADDLE_THROW(common::errors::Unimplemented(
-      "Currently we only support ReduceAsToSumPass Pass for Pir under "
-      "@to_static, please "
-      "compile PaddlePaddle with CINN"));
-#endif
-}
-
 std::shared_ptr<Program> ApplyFusedBnAddActPass(
     std::shared_ptr<Program> program) {
   pir::PassManager pm(pir::IrContext::Instance(), 3);
@@ -2636,7 +2620,6 @@ void BindIrPass(pybind11::module *m) {
   m->def("infer_symbolic_shape_pass", InferSymbolicShapePass);
   m->def("apply_cse_pass", ApplyCommonSubexpressionEliminationPass);
   m->def("apply_bn_add_act_pass", ApplyFusedBnAddActPass);
-  m->def("reduce_as_sum_pass", ApplyReduceAsToSumPass);
 
   py::class_<Pass, std::shared_ptr<Pass>> pass(*m,
                                                "Pass",

paddle/pir/include/dialect/control_flow/ir/cf_op.h

@@ -16,6 +16,7 @@
 
 #include <functional>
 
+#include "paddle/fluid/pir/dialect/operator/utils/shape_analysis_utils.h"
 #include "paddle/pir/include/core/builder.h"
 #include "paddle/pir/include/core/op_base.h"
 #include "paddle/pir/include/core/op_trait.h"

python/paddle/jit/dy2static/pir_partial_program.py

@@ -626,8 +626,9 @@ def apply(self, program):
             # NOTE(gongshaotian): execute infer_symbolic_shape_pass before reduce_as_sum_pass
             pm = paddle.base.libpaddle.pir.PassManager()
             pm.add_pass("delete_assert_op_pass", {})
-            paddle.base.libpaddle.pir.infer_symbolic_shape_pass(pm, program)
-            paddle.base.libpaddle.pir.reduce_as_sum_pass(pm, program)
+            pm.add_pass("shape_optimization_pass", {})
+            pm.add_pass("reduce_as_to_sum_pass", {})
+            pm.add_pass("dead_code_elimination_pass", {})
             pm.run(program)
         return program