[cherry-pick] ut: relax the checker to make it work for DNNL and GC backend (#1443)

Co-authored-by: Weizhuo Zhang <weizhuo.zhang@intel.com>

Author: chunyuan-w

tests/cpu/test_ao_jit_llga_quantization_fuser.py

@@ -466,25 +466,12 @@ def forward(self, x, y, z, a):
         m = M()
 
         # fp32 in int8 out softmax
-        int8_fp32_patterns = [
-            ["aten::dequantize", "aten::matmul", "aten::div", "aten::add", "aten::softmax", "aten::quantize_per_tensor"],
-            ["aten::dequantize", "aten::matmul"],
-        ]          
         graph = self.checkQuantizeTrace(m, [x, y, z, a], atol=2e-1, int8_bf16=False)
-        self.assertGraphContainsExactly(graph, LLGA_FUSION_GROUP, 2)
-        self.checkPatterns(graph, int8_fp32_patterns)        
+        self.assertFused(graph, ['aten::matmul', 'aten::div', 'aten::add', 'aten::softmax'])
 
         # bf16 in int8 out softmax
-        int8_bf16_patterns = [
-            ["aten::to", "aten::quantize_per_tensor"],
-            ["aten::to", "aten::quantize_per_tensor"],
-            ["aten::dequantize", "aten::to", "aten::matmul", "aten::div", "aten::add", "aten::softmax", "aten::to", "aten::quantize_per_tensor"],
-            ["aten::to", "aten::quantize_per_tensor"],
-            ["aten::dequantize", "aten::to", "aten::matmul"],
-        ]        
         graph = self.checkQuantizeTrace(m, [x, y, z, a], atol=2e-1, int8_bf16=True)
-        self.assertGraphContainsExactly(graph, LLGA_FUSION_GROUP, 5)
-        self.checkPatterns(graph, int8_bf16_patterns)
+        self.assertFused(graph, ['aten::matmul', 'aten::div', 'aten::add', 'aten::softmax'])
 
 class TestFusionPattern(JitLlgaTestCase):
     def test_conv2d_eltwise(self):

tests/cpu/test_jit_llga_fuser.py

@@ -670,7 +670,7 @@ def forward_test(x, y, z, a):
         a = torch.rand(128, 1, 1, 384)
 
         graph, _ = self.checkTrace(forward_test, [x, y, z, a])
-        self.assertGraphContainsExactly(graph, LLGA_FUSION_GROUP, 2)
+        self.assertFused(graph, ['aten::matmul', 'aten::div', 'aten::add', 'aten::softmax', 'aten::contiguous'])
 
     @llga_fp32_bf16_test_env
     def test_no_contiguous_no_op(self):