[PIR][DynamicShape] Remove unused codes (#60762)

lanxianghit · web-flow · commit f378e96cc5a0 · 2024-01-15T16:05:49.000+08:00
* remove unused codes
diff --git a/paddle/cinn/hlir/dialect/operator/transforms/pd_to_cinn_pass.cc b/paddle/cinn/hlir/dialect/operator/transforms/pd_to_cinn_pass.cc
@@ -665,15 +665,6 @@ bool PdOpToCinnOpPass::CanApplyOn(pir::Operation *op) const {
   return op->isa<pir::ModuleOp>() && op->num_regions() > 0;
 }
 
-void PdOp2CinnOpConverter(::pir::Program *program) {
-  pir::IrContext *ctx = pir::IrContext::Instance();
-
-  pir::PassManager pm(ctx);
-  pm.AddPass(std::make_unique<PdOpToCinnOpPass>());
-
-  pm.Run(program);
-}
-
 std::unique_ptr<pir::Pass> CreatePdOpToCinnOpPass() {
   return std::make_unique<PdOpToCinnOpPass>();
 }
diff --git a/paddle/cinn/hlir/dialect/operator/transforms/pd_to_cinn_pass.h b/paddle/cinn/hlir/dialect/operator/transforms/pd_to_cinn_pass.h
@@ -31,10 +31,6 @@ class PdOpToCinnOpPass : public pir::PatternRewritePass {
   bool CanApplyOn(pir::Operation *op) const override;
 };
 
-// TODO(lanxianghit): delete this and use CreatePdOpToCinnOpPass() in
-// corresponding unit tests.
-void PdOp2CinnOpConverter(::pir::Program *program);
-
 IR_API std::unique_ptr<pir::Pass> CreatePdOpToCinnOpPass();
 
 }  // namespace ir
diff --git a/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape.cc b/paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape.cc
@@ -279,6 +279,52 @@ bool FullIntArrayOpInferSymbolicShape(
 bool SliceOpInferSymbolicShape(pir::Operation *op,
                                pir::ShapeConstraintIRAnalysis *shape_analysis) {
   // TODO(zhangbopd): Not implemented yet.
+  auto operand_source = op->operand_source(0);
+  auto operand_source_1 = op->operand_source(1);
+  auto operand_source_2 = op->operand_source(2);
+
+  pir::OpResult res = op->result(0);
+
+  std::vector<int64_t> dims =
+      common::vectorize(res.type().dyn_cast<pir::DenseTensorType>().dims());
+
+  // TODO(zhangbopd): check whether it's right for other cases
+  std::vector<symbol::DimExpr> shapes;
+  for (int64_t dim : dims) {
+    symbol::DimExpr dim_expr;
+    if (dim == -1) {
+      symbol::DimExpr res_dim_expr(shape_analysis->GetNextSymName());
+      dim_expr = res_dim_expr;
+    } else {
+      symbol::DimExpr res_dim_expr(dim);
+      dim_expr = res_dim_expr;
+    }
+    shapes.push_back(dim_expr);
+  }
+
+  auto starts_array =
+      shape_analysis->GetShapeOrDataForValue(operand_source_1).data();
+  auto start = starts_array->at(0).Get<int64_t>();
+
+  auto ends_array =
+      shape_analysis->GetShapeOrDataForValue(operand_source_2).data();
+  auto end = ends_array->at(0).Get<int64_t>();
+
+  std::vector<symbol::DimExpr> data;
+  auto source_data =
+      shape_analysis->GetShapeOrDataForValue(operand_source).data();
+  if (source_data != std::nullopt) {
+    for (int i = start; i < end; i++) {
+      data.emplace_back(source_data->at(i));
+    }
+  }
+
+  symbol::ShapeOrDataDimExprs shape_data{shapes, data};
+  op->set_attribute(
+      "symbolic_shape",
+      pir::shape::SymbolAttribute::get(pir::IrContext::Instance(), shape_data));
+  shape_analysis->SetShapeOrDataForValue(res, shape_data);
+
   return true;
 }
 
diff --git a/paddle/fluid/pir/transforms/shape_optimization_pass.cc b/paddle/fluid/pir/transforms/shape_optimization_pass.cc
@@ -96,6 +96,9 @@ void InferSymExprForAllValues(ModuleOp module_op) {
                              &shape_analysis),
                          "InferSymbolicShape for %s failed.",
                          op.name());
+        } else {
+          VLOG(3) << op.name()
+                  << " DOES NOT have InferSymbolicShapeInterface!!!!";
         }
         DebugPrintOpInfo(&op, &shape_analysis);
       }
@@ -119,9 +122,10 @@ class ShapeOptimizationPass : public pir::Pass {
     PassPipelineRunner runner = [this](pir::PassManager& pm, pir::ModuleOp m) {
       return pm.Run(m.program());
     };
+    PrintProgram(module_op, "After ShapeOptimizationPass Program");
+
     VLOG(3) << "===================== ShapeOptimizationPass Run End. "
                "=============================";
-    PrintProgram(module_op, "ShapeOptimizationPass Program");
   }
 
   bool CanApplyOn(pir::Operation* op) const override {
diff --git a/paddle/fluid/pybind/pir.cc b/paddle/fluid/pybind/pir.cc
@@ -70,6 +70,7 @@
 #include "paddle/pir/core/type.h"
 #include "paddle/pir/core/value.h"
 #include "paddle/pir/dialect/control_flow/ir/cf_dialect.h"
+#include "paddle/pir/dialect/shape/ir/shape_attribute.h"
 #include "paddle/pir/dialect/shape/ir/shape_dialect.h"
 #include "paddle/pir/pass/pass.h"
 #include "paddle/pir/pass/pass_manager.h"
@@ -128,7 +129,6 @@ USE_PIR_PASS(conv2d_add_act_fuse_pass);
 USE_PIR_PASS(fused_dot_product_attention_pass);
 
 PHI_DECLARE_bool(print_ir);
-PHI_DECLARE_bool(pir_apply_shape_optimization_pass);
 
 namespace paddle {
 namespace pybind {
@@ -459,6 +459,8 @@ void BindOperation(py::module *m) {
            [](Operation &self) -> py::dict {
              py::dict attrs_dict;
              for (auto &pair : self.attributes()) {
+               // SymbolAttribute is only used in PIR, no need to pass to Python
+               if (pair.second.isa<pir::shape::SymbolAttribute>()) continue;
                attrs_dict[pair.first.c_str()] =
                    paddle::dialect::GetAttributeData(pair.second);
              }
@@ -1581,11 +1583,9 @@ void AddCinnPass(std::shared_ptr<PassManager> &pass_manager,  // NOLINT
 
 void InferSymbolicShapePass(
     std::shared_ptr<PassManager> &pass_manager) {  // NOLINT
-  if (FLAGS_pir_apply_shape_optimization_pass) {
-    pir::IrContext *ctx = pir::IrContext::Instance();
-    ctx->GetOrRegisterDialect<pir::shape::ShapeDialect>();
-    pass_manager->AddPass(pir::CreateShapeOptimizationPass());
-  }
+  pir::IrContext *ctx = pir::IrContext::Instance();
+  ctx->GetOrRegisterDialect<pir::shape::ShapeDialect>();
+  pass_manager->AddPass(pir::CreateShapeOptimizationPass());
 }
 
 void BindIrPass(pybind11::module *m) {
diff --git a/paddle/fluid/sub_graph/sub_graph_checker.cc b/paddle/fluid/sub_graph/sub_graph_checker.cc
@@ -165,9 +165,8 @@ std::vector<phi::DenseTensor> SubGraphChecker::RunCinnResult() {
   ctx->GetOrRegisterDialect<paddle::dialect::OperatorDialect>();
   ctx->GetOrRegisterDialect<cinn::dialect::OperatorDialect>();
 
-  cinn::dialect::ir::PdOp2CinnOpConverter(prim_program_.get());
-
   pir::PassManager pm(ctx);
+  pm.AddPass(cinn::dialect::ir::CreatePdOpToCinnOpPass());
   pm.AddPass(
       std::make_unique<cinn::dialect::ir::AddBroadcastToElementwisePass>());
   pm.AddPass(pir::CreateBuildCinnPass());
@@ -263,9 +262,8 @@ double SubGraphChecker::RunCinnSpeed() {
   ctx->GetOrRegisterDialect<paddle::dialect::OperatorDialect>();
   ctx->GetOrRegisterDialect<cinn::dialect::OperatorDialect>();
 
-  cinn::dialect::ir::PdOp2CinnOpConverter(prim_program_.get());
-
   pir::PassManager pm(ctx);
+  pm.AddPass(cinn::dialect::ir::CreatePdOpToCinnOpPass());
   pm.AddPass(
       std::make_unique<cinn::dialect::ir::AddBroadcastToElementwisePass>());
   pm.AddPass(pir::CreateBuildCinnPass());
diff --git a/paddle/phi/core/flags.cc b/paddle/phi/core/flags.cc
@@ -1413,19 +1413,6 @@ PHI_DEFINE_EXPORTED_bool(pir_apply_inplace_pass,
                          "Whether to apply inplace pass on lowering "
                          "::pir::Program to Kernel Dialect");
 
-/**
- * Apply shape optimization pass to new IR FLAG
- * Name: pir_apply_shape_optimization_pass
- * Since Version: 3.0.0
- * Value Range: bool, default=false
- * Example:
- * Note: If Ture, will apply shape_optimization pass to new IR.
- */
-PHI_DEFINE_EXPORTED_bool(pir_apply_shape_optimization_pass,
-                         false,
-                         "Whether to apply shape_optimization pass "
-                         "to infer symbolic shape");
-
 PHI_DEFINE_EXPORTED_string(
     ir_inplace_kernel_blacklist,
     "",
diff --git a/paddle/pir/dialect/shape/utils/shape_utils.cc b/paddle/pir/dialect/shape/utils/shape_utils.cc
@@ -150,7 +150,8 @@ ShapeConstraintIRAnalysis& ShapeAnalysisManager::Get(pir::Program* program) {
 
 const symbol::ShapeOrDataDimExprs&
 ShapeConstraintIRAnalysis::GetShapeOrDataForValue(Value val) {
-  CHECK(value_to_shape_or_data_.find(val) != value_to_shape_or_data_.end());
+  // TODO(lanxianghit): check this when all the Ops support InferSymbolicShape
+  // CHECK(value_to_shape_or_data_.find(val) != value_to_shape_or_data_.end());
   return value_to_shape_or_data_[val];
 }
 
diff --git a/test/cpp/pir/cinn/dialect_convert_test.cc b/test/cpp/pir/cinn/dialect_convert_test.cc
@@ -65,7 +65,9 @@ TEST(DrrTest, reduce_sum) {
   pir::Builder builder = pir::Builder(ctx, program.block());
   BuildProgram(builder);
 
-  cinn::dialect::ir::PdOp2CinnOpConverter(&program);
+  pir::PassManager pm(ctx);
+  pm.AddPass(cinn::dialect::ir::CreatePdOpToCinnOpPass());
+  pm.Run(&program);
 
   auto it = program.block()->begin();
 
@@ -87,7 +89,9 @@ TEST(DrrTest, reduce_max) {
   pir::Builder builder = pir::Builder(ctx, program.block());
   BuildProgramMax(builder);
 
-  cinn::dialect::ir::PdOp2CinnOpConverter(&program);
+  pir::PassManager pm(ctx);
+  pm.AddPass(cinn::dialect::ir::CreatePdOpToCinnOpPass());
+  pm.Run(&program);
 
   auto it = program.block()->begin();
 
diff --git a/test/cpp/pir/cinn/pir_all_path_test.cc b/test/cpp/pir/cinn/pir_all_path_test.cc
@@ -58,9 +58,8 @@ static void RunAndCheckResult(::pir::Program* program,
   ctx->GetOrRegisterDialect<paddle::dialect::OperatorDialect>();
   ctx->GetOrRegisterDialect<cinn::dialect::OperatorDialect>();
 
-  cinn::dialect::ir::PdOp2CinnOpConverter(program);
-
   pir::PassManager pm(ctx);
+  pm.AddPass(cinn::dialect::ir::CreatePdOpToCinnOpPass());
   pm.AddPass(
       std::make_unique<cinn::dialect::ir::AddBroadcastToElementwisePass>());
 

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,8 @@ ShapeConstraintIRAnalysis& ShapeAnalysisManager::Get(pir::Program* program) {`
`150`	`150`
`151`	`151`	`const symbol::ShapeOrDataDimExprs&`
`152`	`152`	`ShapeConstraintIRAnalysis::GetShapeOrDataForValue(Value val) {`
`153`		`- CHECK(value_to_shape_or_data_.find(val) != value_to_shape_or_data_.end());`
	`153`	`+ // TODO(lanxianghit): check this when all the Ops support InferSymbolicShape`
	`154`	`+ // CHECK(value_to_shape_or_data_.find(val) != value_to_shape_or_data_.end());`
`154`	`155`	`return value_to_shape_or_data_[val];`
`155`	`156`	`}`
`156`	`157`