From 6ad80576b7026c6e807f016f8a00ac98b5175ec8 Mon Sep 17 00:00:00 2001 From: Nesterov Alexander Date: Fri, 21 Apr 2023 12:45:22 +0200 Subject: [PATCH] [ARM CPU] Fix smoke_if tests (#17095) * fix smoke if * fix smoke if - arm32 * review fix --- .../intel_cpu/src/nodes/executors/acl/acl_eltwise.cpp | 6 +++--- .../functional/shared_tests_instances/skip_tests_config.cpp | 6 ------ 2 files changed, 3 insertions(+), 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 index 25ac0010e0a..f0dafd75523 100644 --- 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 index 2502fa9ec49..f6f39503e97 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 @@ -203,10 +203,6 @@ std::vector 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 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