PaddlePaddle
diff --git a/‎paddle/fluid/pir/transforms/onednn/conv_activation_onednn_fuse_pass.cc
Copy file name to clipboard
+23-6Lines changed: 23 additions & 6 deletions b/‎paddle/fluid/pir/transforms/onednn/conv_activation_onednn_fuse_pass.cc
Copy file name to clipboard
+23-6Lines changed: 23 additions & 6 deletions
diff --git a/‎paddle/fluid/pir/transforms/onednn/fc_activation_fuse_pass.cc
Copy file name to clipboard
+38-18Lines changed: 38 additions & 18 deletions b/‎paddle/fluid/pir/transforms/onednn/fc_activation_fuse_pass.cc
Copy file name to clipboard
+38-18Lines changed: 38 additions & 18 deletions
@@ -31,7 +31,7 @@ class ConvActivationFusePattern : public paddle::drr::DrrPatternBase {
   const size_t activation_count_;
   std::string activation_name_;
   /*
-   * fused_level_ = 0 : conv2d + activation
+    fused_level_ = 0 : conv2d + activation
     fused_level_ > 0 : conv2d + bias + activation
                      : conv2d + residual + activation
                      : conv2d + + bias + residual + activation
@@ -102,7 +102,8 @@ class ConvActivationFusePattern : public paddle::drr::DrrPatternBase {
     if (activation_name_op == paddle::dialect::HardsigmoidOp::name()) {
       act_attrs.emplace("slope", pat.Attr("slope"));
       act_attrs.emplace("offset", pat.Attr("offset"));
-    } else if (activation_name_op == paddle::dialect::LeakyReluOp::name()) {
+    } else if (activation_name_op == paddle::dialect::LeakyRelu_Op::name() ||
+               activation_name_op == paddle::dialect::LeakyReluOp::name()) {
       act_attrs.emplace("negative_slope", pat.Attr("negative_slope"));
     } else if (activation_name_op == paddle::dialect::GeluOp::name()) {
       act_attrs.emplace("approximate", pat.Attr("approximate"));
@@ -132,7 +133,8 @@ class ConvActivationFusePattern : public paddle::drr::DrrPatternBase {
     }
 
     pat.AddConstraint([&](const paddle::drr::MatchContext &match_ctx) {
-      if (activation_name_ == "leaky_relu") {
+      if (activation_name_ == "leaky_relu_" ||
+          activation_name_ == "leaky_relu") {
         float negative_slope = match_ctx.Attr<float>("negative_slope");
         // leaky relu alpha is a positive number
         if (negative_slope <= 0.0) {
@@ -155,13 +157,18 @@ class ConvActivationFusePattern : public paddle::drr::DrrPatternBase {
       fuse_alpha = res.Float32Attr(1.f / 6.f);
     } else if (activation_name_ == "swish") {
       fuse_alpha = res.Float32Attr(1.0f);
-    } else if (activation_name_ == "leaky_relu") {
+    } else if (activation_name_ == "leaky_relu_" ||
+               activation_name_ == "leaky_relu") {
       fuse_alpha = pat.Attr("negative_slope");
     } else if (activation_name_ == "hard_sigmoid") {
       fuse_alpha = pat.Attr("slope");
       fuse_beta = pat.Attr("offset");
     }
 
+    std::string new_act_name = activation_name_;
+    if (activation_name_.back() == '_') {
+      new_act_name = activation_name_.substr(0, activation_name_.size() - 1);
+    }
     const auto &fused_conv =
         fused_level_ == 0
             ? res.Op(paddle::onednn::dialect::FusedConv2dOp::name(),
@@ -173,7 +180,7 @@ class ConvActivationFusePattern : public paddle::drr::DrrPatternBase {
                          {"groups", pat.Attr("groups")},
                          {"data_format", pat.Attr("data_format")},
                          {"mkldnn_data_type", res.StrAttr("float32")},
-                         {"fuse_activation", res.StrAttr(activation_name_)},
+                         {"fuse_activation", res.StrAttr(new_act_name)},
                          {"fuse_residual_connection", res.BoolAttr(false)},
                          {"force_fp32_output", res.BoolAttr(false)},
                          {"fuse_alpha", fuse_alpha},
@@ -192,7 +199,7 @@ class ConvActivationFusePattern : public paddle::drr::DrrPatternBase {
                          {"groups", pat.Attr("groups")},
                          {"data_format", pat.Attr("data_format")},
                          {"mkldnn_data_type", pat.Attr("mkldnn_data_type")},
-                         {"fuse_activation", res.StrAttr(activation_name_)},
+                         {"fuse_activation", res.StrAttr(new_act_name)},
                          {"fuse_residual_connection",
                           pat.Attr("fuse_residual_connection")},
                          {"force_fp32_output", pat.Attr("force_fp32_output")},
@@ -524,15 +531,21 @@ class ConvActFusePass : public pir::PatternRewritePass {
 
     // This eleven activations have no extra attribute, can use the same pattern
     std::vector<std::string> supported_activations_name = {"abs",
+                                                           "abs_",
                                                            "sqrt",
+                                                           "sqrt_",
                                                            "mish",
                                                            "relu",
+                                                           "relu_",
                                                            "sigmoid",
+                                                           "sigmoid_",
                                                            "tanh",
+                                                           "tanh_",
                                                            "relu6",
                                                            "hard_swish",
                                                            "swish",
                                                            "leaky_relu",
+                                                           "leaky_relu_",
                                                            "hard_sigmoid"};
 
     size_t pattern_num = 1;
@@ -560,6 +573,10 @@ class ConvActFusePass : public pir::PatternRewritePass {
         context, paddle::dialect::ClipOp::name(), 0));
     ps.Add(paddle::drr::Create<ConvClipFusePattern>(
         context, paddle::dialect::ClipOp::name(), 1));
+    ps.Add(paddle::drr::Create<ConvClipFusePattern>(
+        context, paddle::dialect::Clip_Op::name(), 0));
+    ps.Add(paddle::drr::Create<ConvClipFusePattern>(
+        context, paddle::dialect::Clip_Op::name(), 1));
     return ps;
   }
 };
 
@@ -23,32 +23,44 @@
 #include "paddle/pir/include/pass/pass_registry.h"
 
 namespace {
-std::set<std::string> act_ops = {{paddle::dialect::AbsOp::name()},
-                                 {paddle::dialect::GeluOp::name()},
-                                 {paddle::dialect::HardsigmoidOp::name()},
-                                 {paddle::dialect::HardswishOp::name()},
-                                 {paddle::dialect::LeakyReluOp::name()},
-                                 {paddle::dialect::MishOp::name()},
-                                 {paddle::dialect::ReluOp::name()},
-                                 {paddle::dialect::Relu6Op::name()},
-                                 {paddle::dialect::SigmoidOp::name()},
-                                 {paddle::dialect::SqrtOp::name()},
-                                 {paddle::dialect::SwishOp::name()},
-                                 {paddle::dialect::TanhOp::name()}};
+std::set<std::string> act_ops = {paddle::dialect::AbsOp::name(),          //
+                                 paddle::dialect::Abs_Op::name(),         //
+                                 paddle::dialect::GeluOp::name(),         //
+                                 paddle::dialect::HardsigmoidOp::name(),  //
+                                 paddle::dialect::HardswishOp::name(),    //
+                                 paddle::dialect::LeakyReluOp::name(),    //
+                                 paddle::dialect::LeakyRelu_Op::name(),   //
+                                 paddle::dialect::MishOp::name(),         //
+                                 paddle::dialect::ReluOp::name(),         //
+                                 paddle::dialect::Relu_Op::name(),        //
+                                 paddle::dialect::Relu6Op::name(),        //
+                                 paddle::dialect::SigmoidOp::name(),      //
+                                 paddle::dialect::Sigmoid_Op::name(),     //
+                                 paddle::dialect::SqrtOp::name(),         //
+                                 paddle::dialect::Sqrt_Op::name(),        //
+                                 paddle::dialect::SwishOp::name(),        //
+                                 paddle::dialect::TanhOp::name(),         //
+                                 paddle::dialect::Tanh_Op::name()};
 
 std::unordered_map<std::string, std::string> activation_type = {
     {paddle::dialect::AbsOp::name(), "abs"},
+    {paddle::dialect::Abs_Op::name(), "abs"},
     {paddle::dialect::GeluOp::name(), "gelu"},
     {paddle::dialect::HardsigmoidOp::name(), "hard_sigmoid"},
     {paddle::dialect::HardswishOp::name(), "hard_swish"},
     {paddle::dialect::LeakyReluOp::name(), "leaky_relu"},
+    {paddle::dialect::LeakyRelu_Op::name(), "leaky_relu"},
     {paddle::dialect::MishOp::name(), "mish"},
     {paddle::dialect::ReluOp::name(), "relu"},
+    {paddle::dialect::Relu_Op::name(), "relu"},
     {paddle::dialect::Relu6Op::name(), "relu6"},
     {paddle::dialect::SigmoidOp::name(), "sigmoid"},
+    {paddle::dialect::Sigmoid_Op::name(), "sigmoid"},
     {paddle::dialect::SqrtOp::name(), "sqrt"},
+    {paddle::dialect::Sqrt_Op::name(), "sqrt"},
     {paddle::dialect::SwishOp::name(), "swish"},
-    {paddle::dialect::TanhOp::name(), "tanh"}};
+    {paddle::dialect::TanhOp::name(), "tanh"},
+    {paddle::dialect::Tanh_Op::name(), "tanh"}};
 
 class FusedFcActivationFusePattern : public paddle::drr::DrrPatternBase {
  private:
@@ -84,7 +96,8 @@ class FusedFcActivationFusePattern : public paddle::drr::DrrPatternBase {
     if (act_type_ == paddle::dialect::HardsigmoidOp::name()) {
       act_attrs.emplace("slope", pat.Attr("fuse_alpha"));
       act_attrs.emplace("offset", pat.Attr("fuse_beta"));
-    } else if (act_type_ == paddle::dialect::LeakyReluOp::name()) {
+    } else if (act_type_ == paddle::dialect::LeakyRelu_Op::name() ||
+               act_type_ == paddle::dialect::LeakyReluOp::name()) {
       act_attrs.emplace("negative_slope", pat.Attr("fuse_alpha"));
     } else if (act_type_ == paddle::dialect::GeluOp::name()) {
       act_attrs.emplace("approximate", pat.Attr("approximate"));
@@ -131,7 +144,8 @@ class FusedFcActivationFusePattern : public paddle::drr::DrrPatternBase {
     } else if (act_type_ == paddle::dialect::HardsigmoidOp::name()) {
       fused_attrs.emplace("fuse_alpha", pat.Attr("fuse_alpha"));
       fused_attrs.emplace("fuse_beta", pat.Attr("fuse_beta"));
-    } else if (act_type_ == paddle::dialect::LeakyReluOp::name()) {
+    } else if (act_type_ == paddle::dialect::LeakyRelu_Op::name() ||
+               act_type_ == paddle::dialect::LeakyReluOp::name()) {
       fused_attrs.emplace("fuse_alpha", pat.Attr("fuse_alpha"));
     } else if (act_type_ == paddle::dialect::SwishOp::name()) {
       fused_attrs.emplace("fuse_alpha", res.Float32Attr(1.0f));
@@ -228,9 +242,11 @@ class FusedFcGeluTanhFusePattern : public paddle::drr::DrrPatternBase {
 class FusedFcClipFusePattern : public paddle::drr::DrrPatternBase {
  private:
   uint32_t benefit_;
+  bool inplace_;
 
  public:
-  explicit FusedFcClipFusePattern(uint32_t benefit) : benefit_(benefit) {}
+  FusedFcClipFusePattern(uint32_t benefit, bool inplace)
+      : benefit_(benefit), inplace_(inplace) {}
 
   std::string name() const override { return "FusedFcActivationFusePattern"; }
 
@@ -262,7 +278,8 @@ class FusedFcClipFusePattern : public paddle::drr::DrrPatternBase {
     pat.Tensor("min") = full1();
     pat.Tensor("max") = full2();
 
-    const auto &act = pat.Op(paddle::dialect::ClipOp::name());
+    const auto &act = inplace_ ? pat.Op(paddle::dialect::Clip_Op::name())
+                               : pat.Op(paddle::dialect::ClipOp::name());
     fc({&pat.Tensor("input"), &pat.Tensor("weight"), &pat.Tensor("bias")},
        {&pat.Tensor("Out")});
 
@@ -325,7 +342,10 @@ class FcActivationFusePass : public pir::PatternRewritePass {
     }
     ps.Add(paddle::drr::Create<FusedFcGeluTanhFusePattern>(context,
                                                            benefit_idx++));
-    ps.Add(paddle::drr::Create<FusedFcClipFusePattern>(context, benefit_idx++));
+    ps.Add(
+        paddle::drr::Create<FusedFcClipFusePattern>(context, benefit_idx++, 0));
+    ps.Add(
+        paddle::drr::Create<FusedFcClipFusePattern>(context, benefit_idx++, 1));
     return ps;
   }
 };