PaddlePaddle
diff --git a/‎paddle/fluid/inference/api/paddle_pass_builder.cc
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎paddle/fluid/inference/api/paddle_pass_builder.cc
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎paddle/fluid/pir/transforms/onednn/matmul_activation_fuse_pass.cc
Copy file name to clipboard
+5-51Lines changed: 5 additions & 51 deletions b/‎paddle/fluid/pir/transforms/onednn/matmul_activation_fuse_pass.cc
Copy file name to clipboard
+5-51Lines changed: 5 additions & 51 deletions
diff --git a/‎paddle/fluid/pir/transforms/onednn/matmul_elementwise_add_fuse_pass.cc
Copy file name to clipboard
-20Lines changed: 0 additions & 20 deletions b/‎paddle/fluid/pir/transforms/onednn/matmul_elementwise_add_fuse_pass.cc
Copy file name to clipboard
-20Lines changed: 0 additions & 20 deletions
diff --git a/‎paddle/fluid/pir/transforms/onednn/matmul_transpose_reshape_fuse_pass.cc
Copy file name to clipboard
-11Lines changed: 0 additions & 11 deletions b/‎paddle/fluid/pir/transforms/onednn/matmul_transpose_reshape_fuse_pass.cc
Copy file name to clipboard
-11Lines changed: 0 additions & 11 deletions
diff --git a/‎paddle/fluid/pir/transforms/onednn/reshape_transpose_matmul_fuse_pass.cc
Copy file name to clipboard
-20Lines changed: 0 additions & 20 deletions b/‎paddle/fluid/pir/transforms/onednn/reshape_transpose_matmul_fuse_pass.cc
Copy file name to clipboard
-20Lines changed: 0 additions & 20 deletions
@@ -627,6 +627,7 @@ const std::vector<std::string> kPirMkldnnPasses{
     "conv2d_transpose_bias_fuse_pass",
     "conv3d_bias_fuse_pass",
     "batch_norm_act_fuse_pass",
+    "scale_matmul_fuse_pass",
     "reshape_transpose_matmul_fuse_pass",
     "matmul_transpose_reshape_fuse_pass",
     "matmul_elementwise_add_fuse_pass",
 
@@ -92,16 +92,6 @@ class MatmulActivationFusePattern : public paddle::drr::DrrPatternBase {
 
     pat.Tensor("act_out") = act(pat.Tensor("Out"));
 
-    pat.RequireNativeCall([&](const paddle::drr::MatchContext &match_ctx) {
-      std::set<bool> bool_sets = {true, false};
-      auto result_x = match_ctx.Attr<bool>("transpose_x");
-      auto result_y = match_ctx.Attr<bool>("transpose_y");
-      if (bool_sets.count(result_x) == 0 || bool_sets.count(result_y) == 0) {
-        return false;
-      }
-      return true;
-    });
-
     if (act_type_ == paddle::dialect::GeluOp::name()) {
       pat.RequireNativeCall([&](const paddle::drr::MatchContext &match_ctx) {
         auto result_gelu = match_ctx.Attr<bool>("approximate");
@@ -187,15 +177,6 @@ class MatmulGeluTanhFusePattern : public paddle::drr::DrrPatternBase {
 
     pat.Tensor("act_out") = act(pat.Tensor("Out"));
 
-    pat.RequireNativeCall([&](const paddle::drr::MatchContext &match_ctx) {
-      std::set<bool> bool_sets = {true, false};
-      auto result_x = match_ctx.Attr<bool>("transpose_x");
-      auto result_y = match_ctx.Attr<bool>("transpose_y");
-      if (bool_sets.count(result_x) == 0 || bool_sets.count(result_y) == 0) {
-        return false;
-      }
-      return true;
-    });
     pat.RequireNativeCall([&](const paddle::drr::MatchContext &match_ctx) {
       auto result_gelu = match_ctx.Attr<bool>("approximate");
       if (!result_gelu) return false;
@@ -272,16 +253,6 @@ class MatmulClipFusePattern : public paddle::drr::DrrPatternBase {
     pat.Tensor("act_out") =
         act(pat.Tensor("Out"), pat.Tensor("min"), pat.Tensor("max"));
 
-    pat.RequireNativeCall([&](const paddle::drr::MatchContext &match_ctx) {
-      std::set<bool> bool_sets = {true, false};
-      auto result_x = match_ctx.Attr<bool>("transpose_x");
-      auto result_y = match_ctx.Attr<bool>("transpose_y");
-      if (bool_sets.count(result_x) == 0 || bool_sets.count(result_y) == 0) {
-        return false;
-      }
-      return true;
-    });
-
     paddle::drr::ResultPattern res = pat.ResultPattern();
 
     std::unordered_map<std::string, paddle::drr::Attribute> fused_attrs{
@@ -375,16 +346,11 @@ class FusedMatmulActivationFusePattern : public paddle::drr::DrrPatternBase {
     pat.Tensor("act_out") = act(pat.Tensor("Out"));
 
     pat.RequireNativeCall([&](const paddle::drr::MatchContext &match_ctx) {
-      std::set<bool> bool_sets = {true, false};
-      auto result_x = match_ctx.Attr<bool>("transpose_x");
-      auto result_y = match_ctx.Attr<bool>("transpose_y");
       auto act_type = match_ctx.Attr<std::string>("fuse_activation");
-      if (bool_sets.count(result_x) == 0 || bool_sets.count(result_y) == 0 ||
-          act_type != "") {
-        return false;
-      }
+      if (act_type != "") return false;
       return true;
     });
+
     if (act_type_ == paddle::dialect::GeluOp::name()) {
       pat.RequireNativeCall([&](const paddle::drr::MatchContext &match_ctx) {
         auto result_gelu = match_ctx.Attr<bool>("approximate");
@@ -490,16 +456,11 @@ class FusedMatmulGeluTanhFusePattern : public paddle::drr::DrrPatternBase {
     pat.Tensor("act_out") = act(pat.Tensor("Out"));
 
     pat.RequireNativeCall([&](const paddle::drr::MatchContext &match_ctx) {
-      std::set<bool> bool_sets = {true, false};
-      auto result_x = match_ctx.Attr<bool>("transpose_x");
-      auto result_y = match_ctx.Attr<bool>("transpose_y");
       auto act_type = match_ctx.Attr<std::string>("fuse_activation");
-      if (bool_sets.count(result_x) == 0 || bool_sets.count(result_y) == 0 ||
-          act_type != "") {
-        return false;
-      }
+      if (act_type != "") return false;
       return true;
     });
+
     pat.RequireNativeCall([&](const paddle::drr::MatchContext &match_ctx) {
       auto result_gelu = match_ctx.Attr<bool>("approximate");
       if (!result_gelu) return false;
@@ -597,14 +558,8 @@ class FusedMatmulClipFusePattern : public paddle::drr::DrrPatternBase {
         act(pat.Tensor("Out"), pat.Tensor("min"), pat.Tensor("max"));
 
     pat.RequireNativeCall([&](const paddle::drr::MatchContext &match_ctx) {
-      std::set<bool> bool_sets = {true, false};
-      auto result_x = match_ctx.Attr<bool>("transpose_x");
-      auto result_y = match_ctx.Attr<bool>("transpose_y");
       auto act_type = match_ctx.Attr<std::string>("fuse_activation");
-      if (bool_sets.count(result_x) == 0 || bool_sets.count(result_y) == 0 ||
-          act_type != "") {
-        return false;
-      }
+      if (act_type != "") return false;
       return true;
     });
 
@@ -645,7 +600,6 @@ class MatmulActivationFusePass : public pir::PatternRewritePass {
 
   pir::RewritePatternSet InitializePatterns(pir::IrContext *context) override {
     pir::RewritePatternSet ps(context);
-    // std::vector<bool> bool_set = {false, true};
     int benefit_idx = 1;
     for (auto act_op : act_ops) {
       ps.Add(paddle::drr::Create<MatmulActivationFusePattern>(
 
@@ -59,16 +59,6 @@ class MatmulElementwiseAddFusePattern : public paddle::drr::DrrPatternBase {
         as_x_ ? add(pat.Tensor("Out"), pat.Tensor("residual"))
               : add(pat.Tensor("residual"), pat.Tensor("Out"));
 
-    pat.RequireNativeCall([&](const paddle::drr::MatchContext &match_ctx) {
-      std::set<bool> bool_sets = {true, false};
-      auto result_x = match_ctx.Attr<bool>("transpose_x");
-      auto result_y = match_ctx.Attr<bool>("transpose_y");
-      if (bool_sets.count(result_x) == 0 || bool_sets.count(result_y) == 0) {
-        return false;
-      }
-      return true;
-    });
-
     paddle::drr::ResultPattern res = pat.ResultPattern();
 
     const auto &fused_matmul =
@@ -157,16 +147,6 @@ class FusedMatmulElementwiseAddFusePattern
         as_x_ ? add(pat.Tensor("Out"), pat.Tensor("residual"))
               : add(pat.Tensor("residual"), pat.Tensor("Out"));
 
-    pat.RequireNativeCall([&](const paddle::drr::MatchContext &match_ctx) {
-      std::set<bool> bool_sets = {true, false};
-      auto result_x = match_ctx.Attr<bool>("transpose_x");
-      auto result_y = match_ctx.Attr<bool>("transpose_y");
-      if (bool_sets.count(result_x) == 0 || bool_sets.count(result_y) == 0) {
-        return false;
-      }
-      return true;
-    });
-
     pat.RequireNativeCall([&](const paddle::drr::MatchContext &match_ctx) {
       auto none_tensor = match_ctx.Tensor("none");
       if (none_tensor.impl() != nullptr) {
 
@@ -62,16 +62,6 @@ class MatmulTransposeReshapeFusePattern : public paddle::drr::DrrPatternBase {
     reshape({&pat.Tensor("transpose_out"), &pat.Tensor("shape")},
             {&pat.Tensor("reshape_out"), &pat.Tensor("Xshape")});
 
-    pat.RequireNativeCall([&](const paddle::drr::MatchContext &match_ctx) {
-      std::set<bool> bool_sets = {true, false};
-      auto result_x = match_ctx.Attr<bool>("transpose_x");
-      auto result_y = match_ctx.Attr<bool>("transpose_y");
-      if (bool_sets.count(result_x) == 0 || bool_sets.count(result_y) == 0) {
-        return false;
-      }
-      return true;
-    });
-
     pat.RequireNativeCall([&](const paddle::drr::MatchContext &match_ctx) {
       auto shape = match_ctx.Attr<std::vector<int64_t>>("int_array");
       auto perm = match_ctx.Attr<std::vector<int>>("perm");
@@ -249,7 +239,6 @@ class MatmulTransposeReshapeFusePass : public pir::PatternRewritePass {
 
   pir::RewritePatternSet InitializePatterns(pir::IrContext *context) override {
     pir::RewritePatternSet ps(context);
-    std::vector<bool> bool_set = {false, true};
     int benefit_idx = 1;
     ps.Add(paddle::drr::Create<MatmulTransposeReshapeFusePattern>(
         context,
 
@@ -71,16 +71,6 @@ class ReshapeTransposeMatmulFusePattern : public paddle::drr::DrrPatternBase {
              {&pat.Tensor("Out")});
     }
 
-    pat.RequireNativeCall([&](const paddle::drr::MatchContext &match_ctx) {
-      std::set<bool> bool_sets = {true, false};
-      auto result_x = match_ctx.Attr<bool>("transpose_x");
-      auto result_y = match_ctx.Attr<bool>("transpose_y");
-      if (bool_sets.count(result_x) == 0 || bool_sets.count(result_y) == 0) {
-        return false;
-      }
-      return true;
-    });
-
     pat.RequireNativeCall([&](const paddle::drr::MatchContext &match_ctx) {
       auto shape = match_ctx.Attr<std::vector<int64_t>>("int_array");
       auto perm = match_ctx.Attr<std::vector<int>>("perm");
@@ -219,16 +209,6 @@ class ReshapeTransposeFusedMatmulFusePattern
              {&pat.Tensor("Out")});
     }
 
-    pat.RequireNativeCall([&](const paddle::drr::MatchContext &match_ctx) {
-      std::set<bool> bool_sets = {true, false};
-      auto result_x = match_ctx.Attr<bool>("transpose_x");
-      auto result_y = match_ctx.Attr<bool>("transpose_y");
-      if (bool_sets.count(result_x) == 0 || bool_sets.count(result_y) == 0) {
-        return false;
-      }
-      return true;
-    });
-
     pat.RequireNativeCall([&](const paddle::drr::MatchContext &match_ctx) {
       auto shape = match_ctx.Attr<std::vector<int64_t>>("int_array");
       auto perm = match_ctx.Attr<std::vector<int>>("perm");