[ARM CPU] Fix smoke_if tests (openvinotoolkit#17095)

* fix smoke if * fix smoke if - arm32 * review fix
syaifulnizamiphone7 · Apr 21, 2023 · 6ad8057 · 6ad8057
1 parent 6b44902
commit 6ad8057
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/plugins/intel_cpu/src/nodes/executors/acl/acl_eltwise.cpp b/src/plugins/intel_cpu/src/nodes/executors/acl/acl_eltwise.cpp
@@ -61,9 +61,9 @@ bool AclEltwiseExecutor::init(const EltwiseAttrs &eltwiseAttrs, const std::vecto
         srcDescs[0]->getShape().getDims() != srcDescs[1]->getShape().getDims()) {
         auto dim_size = srcDescs[0]->getShape().getDims().size();
         auto mover = [&dim_size](TensorShape &_shape) {
-            if (dim_size == 5) { std::swap(_shape[2], _shape[3]); }
-            std::swap(_shape[1], _shape[2]);
-            std::swap(_shape[0], _shape[1]);
+            if (dim_size > 4) { std::swap(_shape[2], _shape[3]); }
+            if (dim_size > 3) { std::swap(_shape[1], _shape[2]); }
+            if (dim_size > 2) { std::swap(_shape[0], _shape[1]); }
         };
         if (dim_size < 5) {
             srcDataLayout[0] = srcDataLayout[1] = dstDataLayout[0] = DataLayout::NCHW;

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
@@ -203,10 +203,6 @@ std::vector<std::string> disabledTestPatterns() {
     retVector.emplace_back(R"(smoke_Snippets.*)");
 #endif
 
-#if defined(OPENVINO_ARCH_ARM)
-    retVector.emplace_back(R"(smoke_If/SimpleIfNotConstConditionAndDimsIncreaseTest.*)");
-#endif
-
 #if defined(OPENVINO_ARCH_ARM64) || defined(OPENVINO_ARCH_ARM)
     retVector.emplace_back(R"(ONNXQuantizedModels/QuantizedModelsTests.*)");
     {
@@ -227,8 +223,6 @@ std::vector<std::string> disabledTestPatterns() {
     retVector.emplace_back(R"(smoke_AvgPool_ExplicitPad_CeilRounding/PoolingLayerTest.CompareWithRefs.*)");
     retVector.emplace_back(R"(smoke_TestsDFT_(1|2|3|4)d/DFTLayerTest.CompareWithRefs.*)");
     retVector.emplace_back(R"(MultipleLSTMCellTest/MultipleLSTMCellTest.CompareWithRefs.*)");
-    retVector.emplace_back(R"(smoke_If/SimpleIfTest.CompareWithRefs.*)");
-    retVector.emplace_back(R"(smoke_If/SimpleIfNotConstConditionTest.CompareWithRefs.*)");
     // invalid test: checks u8 precision for runtime graph, while it should be f32
     retVector.emplace_back(R"(smoke_NegativeQuantizedMatMulMultiplyFusion.*)");
     // int8 / code-generation specific