[PIR] onednn support fc and depthwise_conv2d (#61651)

wanghuancoder · web-flow · commit 22ef147e3bf5 · 2024-02-07T12:41:06.000+08:00
* onednn support fc and depthwise_conv2d
diff --git a/paddle/fluid/pir/dialect/operator/ir/ops_onednn_extra.yaml b/paddle/fluid/pir/dialect/operator/ir/ops_onednn_extra.yaml
@@ -56,9 +56,11 @@
   extra_args : bool is_test=false
   data_format_tensors : input, out_grad
 
-# - op : depthwise_conv2d
+- op : depthwise_conv2d
+  extra_args : bool is_test=false, bool fuse_relu_before_depthwise_conv=false, bool use_quantizer=false, str mkldnn_data_type="float32", bool fuse_relu=false, str fuse_activation="", float fuse_alpha=0.0, float fuse_beta=0.0, bool use_addto=false, bool fuse_residual_connection=false, float scale_in=1.0, float scale_out=1.0, float scale_in_eltwise=1.0, float[] scale_weights={1.0f}, bool force_fp32_output=false
 
-# - op : depthwise_conv2d_grad
+- op : depthwise_conv2d_grad
+  extra_args : bool is_test=false, bool fuse_relu_before_depthwise_conv=false, bool use_quantizer=false, str mkldnn_data_type="float32", bool fuse_relu=false, str fuse_activation="", float fuse_alpha=0.0, float fuse_beta=0.0, bool use_addto=false, bool fuse_residual_connection=false, float scale_in=1.0, float scale_out=1.0, float scale_in_eltwise=1.0, float[] scale_weights={1.0f}, bool force_fp32_output=false
 
 - op : divide
 
@@ -76,7 +78,8 @@
 
 # - op : expand_grad
 
-# - op : fc
+- op : fc
+  extra_args : bool ALL_KERNELS_MUST_COMPUTE_RUNTIME_SHAPE=true, bool use_quantizer=false, str mkldnn_data_type="float32", float scale_in=1.0, float[] scale_weights={1.0f}, float scale_out=1.0, bool force_fp32_output=false
 
 # - op : flatten
 
diff --git a/paddle/phi/api/yaml/op_compat.yaml b/paddle/phi/api/yaml/op_compat.yaml
@@ -733,6 +733,8 @@
     {input : Input, filter : Filter}
   outputs :
     out : Output
+  attrs :
+    {scale_in : Scale_in, scale_out : Scale_out, scale_in_eltwise : Scale_in_eltwise, scale_weights : Scale_weights}
   extra :
     attrs : [bool is_test = false, bool use_cudnn = false, bool fuse_relu_before_depthwise_conv = false, bool use_mkldnn = false,
              bool use_quantizer = false, str mkldnn_data_type = "float32", bool fuse_relu = false,
@@ -1070,6 +1072,8 @@
     bias : Bias
   outputs :
     out : Out
+  attrs :
+    {scale_in : Scale_in, scale_out : Scale_out, scale_weights : Scale_weights}
   extra :
     attrs : [bool ALL_KERNELS_MUST_COMPUTE_RUNTIME_SHAPE = true, bool use_mkldnn = false, bool use_quantizer = false, str mkldnn_data_type = "float32", float Scale_in = 1.0f, "float[] Scale_weights = {1.0f}", float Scale_out = 1.0f, bool force_fp32_output = false]
 
diff --git a/test/mkldnn/test_fc_bf16_mkldnn_op.py b/test/mkldnn/test_fc_bf16_mkldnn_op.py
@@ -67,7 +67,7 @@ def setUp(self):
         self.outputs = {'Out': self.output}
 
     def test_check_output(self):
-        self.check_output_with_place(core.CPUPlace())
+        self.check_output_with_place(core.CPUPlace(), check_pir_onednn=True)
 
     def test_check_grad_normal(self):
         pass
diff --git a/test/mkldnn/test_fc_int8_mkldnn_op.py b/test/mkldnn/test_fc_int8_mkldnn_op.py
@@ -94,7 +94,7 @@ def generate_data(self):
 
     def test_check_output(self):
         int_atol = 2
-        self.check_output(int_atol)
+        self.check_output(int_atol, check_pir_onednn=True, check_dygraph=False)
 
 
 class TestFCINT8NoBiasOneDNNOp(TestFCINT8OneDNNOp):
diff --git a/test/mkldnn/test_fc_mkldnn_op.py b/test/mkldnn/test_fc_mkldnn_op.py
@@ -55,7 +55,7 @@ def setUp(self):
 
     def test_check_output(self):
         # TODO(wangzhongpu): support mkldnn op in dygraph mode
-        self.check_output(check_dygraph=False)
+        self.check_output(check_dygraph=False, check_pir_onednn=True)
 
     def test_check_grad_normal(self):
         pass
