【Error Message No. 4】 paddle/fluid/pir/transforms/* fix errors (#62840)

enkilee · web-flow · commit 00f12db0e475 · 2024-03-25T14:59:08.000+08:00
* fix

* fix

* fix
diff --git a/paddle/fluid/pir/transforms/gpu/conv2d_add_act_fuse_pass.cc b/paddle/fluid/pir/transforms/gpu/conv2d_add_act_fuse_pass.cc
@@ -44,8 +44,8 @@ class Conv2dAddActFusePattern
 
     pir::Value add_input = op.x();
     PADDLE_ENFORCE_EQ(
-        add_input && conv2d_out,
-        true,
+        add_input,
+        conv2d_out,
         phi::errors::PreconditionNotMet("The type of add input should be the "
                                         "same as the type of conv2d's out."));
 
diff --git a/paddle/fluid/pir/transforms/shape_optimization_pass.cc b/paddle/fluid/pir/transforms/shape_optimization_pass.cc
@@ -245,10 +245,10 @@ class ShapeOptimizationPass : public pir::Pass {
         << "===================== ShapeOptimizationPass Run start... "
            "=====================";
     auto module_op = op->dyn_cast<pir::ModuleOp>();
-    PADDLE_ENFORCE_EQ(module_op.name(),
-                      "builtin.module",
-                      phi::errors::InvalidArgument(
-                          "ShapeOptimizationPass should run on module op."));
+    PADDLE_ENFORCE_NOT_NULL(
+        module_op,
+        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_extract_pass.cc b/paddle/fluid/pir/transforms/sub_graph_extract_pass.cc
@@ -46,10 +46,10 @@ class SubGraphExtractPass : public pir::Pass {
 
   void Run(pir::Operation* op) override {
     auto module_op = op->dyn_cast<pir::ModuleOp>();
-    PADDLE_ENFORCE_EQ(module_op.name(),
-                      "builtin.module",
-                      phi::errors::InvalidArgument(
-                          "sub_graph_extract_pass should run on module op."));
+    PADDLE_ENFORCE_NOT_NULL(
+        module_op,
+        phi::errors::InvalidArgument(
+            "sub_graph_extract_pass should run on module op."));
     auto& block = module_op.block();
 
     std::vector<GroupOpsVec> groups =
