diff --git a/src/plugins/intel_cpu/src/transformations/transformation_pipeline.cpp b/src/plugins/intel_cpu/src/transformations/transformation_pipeline.cpp index da61917a146db0..cd5ec8eff15ff2 100644 --- a/src/plugins/intel_cpu/src/transformations/transformation_pipeline.cpp +++ b/src/plugins/intel_cpu/src/transformations/transformation_pipeline.cpp @@ -1100,17 +1100,18 @@ void Transformations::MainSnippets(void) { ov::is_type(n) || ov::is_type(n) || ov::is_type(n) || ov::is_type(n) || ov::is_type(n) || ov::is_type(n) || - ov::is_type(n) || ov::is_type(n) || - ov::is_type(n) || ov::is_type(n) || - ov::is_type(n) || ov::is_type(n) || - ov::is_type(n) || ov::is_type(n) || - ov::is_type(n) || ov::is_type(n) || - ov::is_type(n) || ov::is_type(n) || - ov::is_type(n) || ov::is_type(n) || - ov::is_type(n) || ov::is_type(n) || - ov::is_type(n) || ov::is_type(n) || - ov::is_type(n) || ov::is_type(n) || - ov::is_type(n) || ov::is_type(n)); + ov::is_type(n) || ov::is_type(n) || + ov::is_type(n) || ov::is_type(n) || + ov::is_type(n) || ov::is_type(n) || + ov::is_type(n) || ov::is_type(n) || + ov::is_type(n) || ov::is_type(n) || + ov::is_type(n) || ov::is_type(n) || + ov::is_type(n) || ov::is_type(n) || + ov::is_type(n) || ov::is_type(n) || + ov::is_type(n) || ov::is_type(n) || + ov::is_type(n) || ov::is_type(n) || + ov::is_type(n) || ov::is_type(n) || + ov::is_type(n)); #else // CPU Plugin support Swish in Subgraph via conversion to SwichCPU which assumes second input to be constant, // and CPU Plugin does not support Mish for x64 diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp index 4eb4fa819e3224..9f807e49668374 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp @@ -460,7 +460,7 @@ std::vector disabledTestPatterns() { retVector.emplace_back(R"(smoke_Snippets.*\[.*\?.*\].*)"); retVector.emplace_back(R"(smoke_Snippets_Eltwise.*\[1.1..10.1..8.1..4\].*)"); // smoke_Snippets test cases are not supported on arm64 platforms, except for smoke_Snippets_Eltwise - retVector.emplace_back(R"(smoke_Snippets(?!_Eltwise|_Convert).*)"); + retVector.emplace_back(R"(smoke_Snippets(?!_Eltwise|_Convert|_FQDecomposition_).*)"); // arm snippets doesn't support sve_128 that required by dnnl injector jit_uni_eltwise_injector_f32 yet retVector.emplace_back(R"(smoke_Snippets_Eltwise_TwoResults.*)"); retVector.emplace_back(R"(smoke_Snippets_Eltwise/TwoInputsAndOutputs.*)"); diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/snippets/fake_quantize_decomposition_test.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/snippets/fake_quantize_decomposition_test.cpp index 4e2cba4cebc6b8..8c3dbc0f7ed108 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/snippets/fake_quantize_decomposition_test.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/snippets/fake_quantize_decomposition_test.cpp @@ -73,8 +73,7 @@ INSTANTIATE_TEST_SUITE_P( ::testing::Combine( ::testing::ValuesIn(testValuesDecompositionScalars), ::testing::ValuesIn(operations), - // reorder (nChw[16|8]c) + MaxPool + Subgraph + reorder(nchw) - ::testing::Values(std::pair{4, 1}), + ::testing::Values(std::pair{1, 1}), ::testing::Values(ov::test::utils::DEVICE_CPU)), FakeQuantizeDecompositionTest::getTestCaseName); @@ -84,8 +83,7 @@ INSTANTIATE_TEST_SUITE_P( ::testing::Combine( ::testing::ValuesIn(testValuesDecompositionPerChannel), ::testing::ValuesIn(operations), - // reorder (nChw[16|8]c) + MaxPool + reorder(nChw[16|8]c) x6 + Subgraph + reorder(nchw) - ::testing::Values(std::pair{10, 1}), + ::testing::Values(std::pair{1, 1}), ::testing::Values(ov::test::utils::DEVICE_CPU)), FakeQuantizeDecompositionTest::getTestCaseName); @@ -95,13 +93,12 @@ INSTANTIATE_TEST_SUITE_P( ::testing::Combine( ::testing::ValuesIn(testValuesDecompositionPerChannelInput), ::testing::ValuesIn(operations), - // reorder (nChw[16|8]c) + MaxPool + reorder(nChw[16|8]c) x4 + Subgraph + reorder(nchw) - ::testing::Values(std::pair{8, 1}), + ::testing::Values(std::pair{1, 1}), ::testing::Values(ov::test::utils::DEVICE_CPU)), FakeQuantizeDecompositionTest::getTestCaseName); } // namespace decompositionInSubgraph - +#ifdef OPENVINO_ARCH_X86_64 namespace legacyFuse { const std::vector testValuesLegacyFuse = { { @@ -144,11 +141,11 @@ INSTANTIATE_TEST_SUITE_P( ::testing::Combine( ::testing::ValuesIn(testValuesLegacyFuse), ::testing::ValuesIn(operations), - // reorder (nChw[16|8]c) + MaxPool + reorder(nhwc) + Convolution(with internal weight reordering) + reorder(nchw) - ::testing::Values(std::pair{5, 0}), + // reorder (nChw[16|8]c) + Convolution(with internal weight reordering) + reorder(nchw) + ::testing::Values(std::pair{3, 0}), ::testing::Values(ov::test::utils::DEVICE_CPU)), FakeQuantizeDecompositionTest::getTestCaseName); - } // namespace legacyFuse +#endif } // namespace diff --git a/src/tests/functional/plugin/shared/src/snippets/fake_quantize_decomposition_test.cpp b/src/tests/functional/plugin/shared/src/snippets/fake_quantize_decomposition_test.cpp index 6d738751767405..43668ee49cdae5 100644 --- a/src/tests/functional/plugin/shared/src/snippets/fake_quantize_decomposition_test.cpp +++ b/src/tests/functional/plugin/shared/src/snippets/fake_quantize_decomposition_test.cpp @@ -61,7 +61,7 @@ void FakeQuantizeDecompositionTest::SetUp() { values.inputType, values.fakeQuantizeShapes, values.zeroPoint, - ov::test::snippets::FunctionHelper::makePrerequisitesOriginal(), + {}, op); }