[CPU] [ARM] x64 tests extending

openvinotoolkit · Aug 15, 2024 · 5e66f3a · 5e66f3a
1 parent b7619b9
commit 5e66f3a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/src/plugins/intel_cpu/tests/functional/CMakeLists.txt b/src/plugins/intel_cpu/tests/functional/CMakeLists.txt
@@ -48,7 +48,7 @@ if(NOT (ARM OR AARCH64))
     list(APPEND EXCLUDED_SOURCE_PATHS
          ${CMAKE_CURRENT_SOURCE_DIR}/custom/single_layer_tests/instances/arm
          ${CMAKE_CURRENT_SOURCE_DIR}/custom/subgraph_tests/src/arm
-         ${CMAKE_CURRENT_SOURCE_DIR}/shared_tests_instances/low_precision_transformations/arm
+         ${CMAKE_CURRENT_SOURCE_DIR}/shared_tests_instances/low_precision_transformations/aarch64
          ${CMAKE_CURRENT_SOURCE_DIR}/utils/arm)
 else()
     list(APPEND EXCLUDED_SOURCE_PATHS

diff --git a/...ared_tests_instances/low_precision_transformations/x64/fully_connected_transformation.cpp b/...ared_tests_instances/low_precision_transformations/x64/fully_connected_transformation.cpp
@@ -14,7 +14,7 @@ const std::vector<ov::element::Type> netPrecisions = {
         ov::element::f32
 };
 
-const std::vector<MatMulShapes> shapes = {
+const std::vector<FullyConnectedShapes> shapes = {
     {
         ov::PartialShape{ 1, 16 },
         ov::PartialShape{ 16, 8 },
@@ -39,14 +39,35 @@ const std::vector<ov::pass::low_precision::LayerTransformation::Params> trasform
     LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParams()
 };
 
+const std::vector<FullyConnectedParams> activations = {
+    {
+        true,  // activation
+        false, // per-channel
+        true,  // FQ
+        "fullyconnected,relu_original,relu"
+    },
+    {
+        false, // activation
+        false, // per-channel
+        true,  // FQ
+        "fullyConnected_original,fullyConnected"
+    },
+    {
+        true,  // activation
+        true,  // per-channel
+        false, // FQ
+        "fullyconnected,relu_original,relu"
+    },
+};
+
 INSTANTIATE_TEST_SUITE_P(smoke_LPT, FullyConnectedTransformation,
     ::testing::Combine(
         ::testing::ValuesIn(netPrecisions),
         ::testing::ValuesIn(shapes),
         ::testing::Values(ov::test::utils::DEVICE_CPU),
         ::testing::ValuesIn(trasformationParamValues),
-        ::testing::ValuesIn({ov::element::i8, ov::element::u8}),
-        ::testing::ValuesIn({true, false}),
+        ::testing::ValuesIn({ov::element::i8/*, ov::element::u8*/}),
+        ::testing::ValuesIn(activations),
         ::testing::Values("")),
     FullyConnectedTransformation::getTestCaseName);
 }  // namespace
diff --git a/...tional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp b/...tional/plugin/shared/src/low_precision_transformations/fully_connected_transformation.cpp
@@ -78,8 +78,10 @@ TEST_P(FullyConnectedTransformation, CompareWithRefImpl) {
     EXPECT_EQ(actualPrecision, expectedPrecision.to_string());
 
     const auto& expectedPrimitiveType = std::get<6>(GetParam());
-    const std::string actualPrimitiveType = get_property_by_type("FullyConnected", "primitiveType");
-    EXPECT_EQ(expectedPrimitiveType, actualPrimitiveType);
+    if (!expectedPrimitiveType.empty()) {
+        const std::string actualPrimitiveType = get_property_by_type("FullyConnected", "primitiveType");
+        EXPECT_EQ(expectedPrimitiveType, actualPrimitiveType);
+    }
 };
 
 }  // namespace LayerTestsDefinitions