fix (#62814)

enkilee · web-flow · commit 7986f426679e · 2024-03-19T10:57:21.000+08:00
diff --git a/paddle/fluid/pir/transforms/auto_mixed_precision_pass.cc b/paddle/fluid/pir/transforms/auto_mixed_precision_pass.cc
@@ -60,15 +60,21 @@ class AutoMixedPrecisionPass : public pir::Pass {
         precision_mode_(phi::DataType::FLOAT16) {}
 
   bool Initialize(pir::IrContext* context) override {
-    IR_ENFORCE(Has(pir::kPlaceAttr),
-               "Pass initialize failed."
-               "When using AutoMixedPrecisionPass, place attribute is required!"
-               "Use Set method to set the place attribute.");
-    IR_ENFORCE(Has("__mixed_precision_mode__"),
-               "Pass initialize failed."
-               "When using AutoMixedPrecisionPass, precision_mode attribute is "
-               "required!"
-               "Use Set method to set the scope attribute.");
+    PADDLE_ENFORCE_EQ(
+        Has(pir::kPlaceAttr),
+        true,
+        phi::errors::InvalidArgument(
+            "Pass initialize failed."
+            "When using AutoMixedPrecisionPass, place attribute is required!"
+            "Use Set method to set the place attribute."));
+    PADDLE_ENFORCE_EQ(
+        Has("__mixed_precision_mode__"),
+        true,
+        phi::errors::InvalidArgument(
+            "Pass initialize failed."
+            "When using AutoMixedPrecisionPass, precision_mode attribute is "
+            "required!"
+            "Use Set method to set the scope attribute."));
 
     place_ = Get<phi::Place>(pir::kPlaceAttr);
     precision_mode_ = Get<phi::DataType>("__mixed_precision_mode__");
diff --git a/paddle/fluid/pir/transforms/constant_folding_pass.cc b/paddle/fluid/pir/transforms/constant_folding_pass.cc
@@ -468,14 +468,20 @@ class ConstantFoldingPass : public pir::Pass {
 
  private:
   bool Initialize(pir::IrContext* context) override {
-    IR_ENFORCE(Has(pir::kPlaceAttr),
-               "Pass initialize failed."
-               "When using ConstantFoldingPass, place attribute is required!"
-               "Use Set method to set the place attribute.");
-    IR_ENFORCE(Has(pir::kParamScopeAttr),
-               "Pass initialize failed."
-               "When using ConstantFoldingPass, scope attribute is required!"
-               "Use Set method to set the scope attribute.");
+    PADDLE_ENFORCE_EQ(
+        Has(pir::kPlaceAttr),
+        true,
+        phi::errors::InvalidArgument(
+            "Pass initialize failed."
+            "When using ConstantFoldingPass, place attribute is required!"
+            "Use Set method to set the place attribute."));
+    PADDLE_ENFORCE_EQ(
+        Has(pir::kParamScopeAttr),
+        true,
+        phi::errors::InvalidArgument(
+            "Pass initialize failed."
+            "When using ConstantFoldingPass, scope attribute is required!"
+            "Use Set method to set the scope attribute."));
 
     place_ = Get<phi::Place>(pir::kPlaceAttr);
     scope_ = &Get<paddle::framework::Scope>(pir::kParamScopeAttr);
diff --git a/paddle/fluid/pir/transforms/fusion/conv2d_add_act_fuse_pass.cc b/paddle/fluid/pir/transforms/fusion/conv2d_add_act_fuse_pass.cc
@@ -43,7 +43,11 @@ class Conv2dAddActFusePattern
     if (!conv2d_out.HasOneUse()) return false;
 
     pir::Value add_input = op.x();
-    IR_ENFORCE(add_input == conv2d_out);
+    PADDLE_ENFORCE_EQ(
+        add_input && conv2d_out,
+        true,
+        phi::errors::PreconditionNotMet("The type of add input should be the "
+                                        "same as the type of conv2d's out."));
 
     if (!pir::ValueIsPersistable(op.y())) return false;
 
diff --git a/paddle/fluid/pir/transforms/inplace_pass.cc b/paddle/fluid/pir/transforms/inplace_pass.cc
@@ -203,8 +203,11 @@ std::unordered_set<pir::Value> GetSkipDeletionValues(const pir::Block& block) {
         0) {
       continue;
     }
-    IR_ENFORCE(op.attributes().count("op_name") > 0,
-               "kernel_dialect op should own an 'op_name' attribute.");
+    PADDLE_ENFORCE_GT(
+        op.attributes().count("op_name"),
+        0UL,
+        phi::errors::InvalidArgument(
+            "kernel_dialect op should own an 'op_name' attribute."));
     auto upper_op_name =
         op.attributes().at("op_name").dyn_cast<pir::StrAttribute>().AsString();
 
@@ -234,8 +237,11 @@ void GetEagerDelValueOfOp(
     std::string upper_op_name = op.name();
     if (op.dialect()->name().compare(paddle::dialect::KernelDialect::name()) ==
         0) {
-      IR_ENFORCE(op.attributes().count("op_name") > 0,
-                 "kernel_dialect op should own an 'op_name' attribute.");
+      PADDLE_ENFORCE_GT(
+          op.attributes().count("op_name"),
+          0UL,
+          phi::errors::InvalidArgument(
+              "kernel_dialect op should own an 'op_name' attribute."));
       upper_op_name = op.attributes()
                           .at("op_name")
                           .dyn_cast<pir::StrAttribute>()
@@ -479,9 +485,11 @@ class InplacePass : public pir::Pass {
                          .AsString();
           pir::Block::Iterator insert_pos =
               std::find(block.begin(), block.end(), *kv.first);
-          IR_ENFORCE(insert_pos != block.end(),
-                     "Operator %s not found in block.",
-                     kv.first->name());
+          PADDLE_ENFORCE_NE(
+              insert_pos,
+              block.end(),
+              phi::errors::InvalidArgument("Operator %s not found in block.",
+                                           kv.first->name()));
 
           kv.first->set_attribute(
               "op_name",
diff --git a/paddle/fluid/pir/transforms/params_sync_among_devices_pass.cc b/paddle/fluid/pir/transforms/params_sync_among_devices_pass.cc
@@ -37,14 +37,20 @@ class ParamsSyncAmongDevicesPass : public pir::Pass {
       : pir::Pass("params_sync_among_devices_pass", 0) {}
 
   bool Initialize(pir::IrContext* context) override {
-    IR_ENFORCE(Has(pir::kPlaceAttr),
-               "Pass initialize failed."
-               "When using ConstantFoldingPass, place attribute is required!"
-               "Use Set method to set the place attribute.");
-    IR_ENFORCE(Has(pir::kParamScopeAttr),
-               "Pass initialize failed."
-               "When using ConstantFoldingPass, scope attribute is required!"
-               "Use Set method to set the scope attribute.");
+    PADDLE_ENFORCE_EQ(
+        Has(pir::kPlaceAttr),
+        true,
+        phi::errors::InvalidArgument(
+            "Pass initialize failed."
+            "When using ConstantFoldingPass, place attribute is required!"
+            "Use Set method to set the place attribute."));
+    PADDLE_ENFORCE_EQ(
+        Has(pir::kParamScopeAttr),
+        true,
+        phi::errors::InvalidArgument(
+            "Pass initialize failed."
+            "When using ConstantFoldingPass, scope attribute is required!"
+            "Use Set method to set the scope attribute."));
 
     place_ = Get<phi::Place>(pir::kPlaceAttr);
     scope_ = &Get<paddle::framework::Scope>(pir::kParamScopeAttr);
diff --git a/paddle/fluid/pir/transforms/shape_optimization_pass.cc b/paddle/fluid/pir/transforms/shape_optimization_pass.cc
@@ -245,7 +245,10 @@ class ShapeOptimizationPass : public pir::Pass {
         << "===================== ShapeOptimizationPass Run start... "
            "=====================";
     auto module_op = op->dyn_cast<pir::ModuleOp>();
-    IR_ENFORCE(module_op, "ShapeOptimizationPass should run on module op.");
+    PADDLE_ENFORCE_EQ(module_op.name(),
+                      "builtin.module",
+                      phi::errors::InvalidArgument(
+                          "ShapeOptimizationPass should run on module op."));
     PrintProgram(module_op, "Origin Program");
 
     InferSymExprForAllValues(module_op);
diff --git a/paddle/fluid/pir/transforms/sub_graph_detector.cc b/paddle/fluid/pir/transforms/sub_graph_detector.cc
@@ -91,11 +91,13 @@ std::vector<pir::Operation*> InverselyTopologicalSort(pir::Block* block) {
     }
   }
 
-  IR_ENFORCE(
-      block->size() == sort_ops.size(),
-      "sort_ops.size() must be equal to block.size(), but received %d != %d",
+  PADDLE_ENFORCE_EQ(
       block->size(),
-      sort_ops.size());
+      sort_ops.size(),
+      phi::errors::InvalidArgument("sort_ops.size() must be equal to "
+                                   "block.size(), but received %d != %d",
+                                   block->size(),
+                                   sort_ops.size()));
 
   return sort_ops;
 }
diff --git a/paddle/fluid/pir/transforms/sub_graph_extract_pass.cc b/paddle/fluid/pir/transforms/sub_graph_extract_pass.cc
@@ -46,7 +46,10 @@ class SubGraphExtractPass : public pir::Pass {
 
   void Run(pir::Operation* op) override {
     auto module_op = op->dyn_cast<pir::ModuleOp>();
-    IR_ENFORCE(module_op, "sub_graph_extract_pass should run on module op.");
+    PADDLE_ENFORCE_EQ(module_op.name(),
+                      "builtin.module",
+                      phi::errors::InvalidArgument(
+                          "sub_graph_extract_pass should run on module op."));
     auto& block = module_op.block();
 
     std::vector<GroupOpsVec> groups =

Original file line number	Diff line number	Diff line change
`@@ -91,11 +91,13 @@ std::vector<pir::Operation> InverselyTopologicalSort(pir::Block block) {`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`		`- IR_ENFORCE(`
`95`		`- block->size() == sort_ops.size(),`
`96`		`- "sort_ops.size() must be equal to block.size(), but received %d != %d",`
	`94`	`+ PADDLE_ENFORCE_EQ(`
`97`	`95`	`block->size(),`
`98`		`- sort_ops.size());`
	`96`	`+ sort_ops.size(),`
	`97`	`+ phi::errors::InvalidArgument("sort_ops.size() must be equal to "`
	`98`	`+ "block.size(), but received %d != %d",`
	`99`	`+ block->size(),`
	`100`	`+ sort_ops.size()));`
`99`	`101`
`100`	`102`	`return sort_ops;`
`101`	`103`	`}`