From de8f34c8f061769afab8105d9d3faa72a561d591 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Thu, 13 Apr 2023 22:35:21 +0400 Subject: [PATCH] Fixed plugin name in tests for ARM CPU (#16932) --- src/plugins/intel_cpu/src/plugin.cpp | 10 ++++++++++ .../behavior/ov_plugin/core_integration.cpp | 5 ++++- .../behavior/plugin/core_integration.cpp | 5 ++++- .../behavior/plugin/hetero_synthetic.cpp | 7 +++++-- .../behavior/plugin/plugin_name.cpp | 15 +++++++++++++++ 5 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/plugin_name.cpp diff --git a/src/plugins/intel_cpu/src/plugin.cpp b/src/plugins/intel_cpu/src/plugin.cpp index 7c8ac9603f9..a58615fc4e9 100644 --- a/src/plugins/intel_cpu/src/plugin.cpp +++ b/src/plugins/intel_cpu/src/plugin.cpp @@ -838,5 +838,15 @@ InferenceEngine::IExecutableNetworkInternal::Ptr Engine::ImportNetwork(std::istr } // namespace ov using namespace ov::intel_cpu; + +#if defined(OPENVINO_ARCH_ARM) || defined(OPENVINO_ARCH_ARM64) +static const Version version = {{2, 1}, CI_BUILD_NUMBER, "openvino_arm_cpu_plugin"}; +#elif defined(OPENVINO_ARCH_X86) || defined(OPENVINO_ARCH_X86_64) static const Version version = {{2, 1}, CI_BUILD_NUMBER, "openvino_intel_cpu_plugin"}; +#elif defined(OPENVINO_ARCH_RISCV64) +static const Version version = {{2, 1}, CI_BUILD_NUMBER, "openvino_riscv_cpu_plugin"}; +#else +#error "Undefined system processor" +#endif + IE_DEFINE_PLUGIN_CREATE_FUNCTION(Engine, version) diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp index 46058cebf92..1f9e60fd81a 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp @@ -11,6 +11,9 @@ using namespace ov::test::behavior; using namespace InferenceEngine::PluginConfigParams; +// defined in plugin_name.cpp +extern const char * cpu_plugin_file_name; + namespace { // // IE Class Common tests with @@ -18,7 +21,7 @@ namespace { INSTANTIATE_TEST_SUITE_P( smoke_OVClassCommon, OVClassBasicTestP, - ::testing::Values(std::make_pair("openvino_intel_cpu_plugin", "CPU"))); + ::testing::Values(std::make_pair(cpu_plugin_file_name, "CPU"))); INSTANTIATE_TEST_SUITE_P( smoke_OVClassNetworkTestP, OVClassNetworkTestP, diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/core_integration.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/core_integration.cpp index 59a209cdf0b..7d8f93b2144 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/core_integration.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/core_integration.cpp @@ -8,6 +8,9 @@ using namespace BehaviorTestsDefinitions; using namespace InferenceEngine::PluginConfigParams; +// defined in plugin_name.cpp +extern const char * cpu_plugin_file_name; + namespace { // // IE Class Common tests with @@ -15,7 +18,7 @@ namespace { INSTANTIATE_TEST_SUITE_P( smoke_IEClassCommon, IEClassBasicTestP, - ::testing::Values(std::make_pair("openvino_intel_cpu_plugin", "CPU"))); + ::testing::Values(std::make_pair(cpu_plugin_file_name, "CPU"))); INSTANTIATE_TEST_SUITE_P( smoke_IEClassNetworkTestP, IEClassNetworkTestP, diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/hetero_synthetic.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/hetero_synthetic.cpp index 08c43a66e9e..cada399989e 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/hetero_synthetic.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/hetero_synthetic.cpp @@ -8,6 +8,9 @@ #include "ngraph_functions/builders.hpp" #include "ngraph_functions/subgraph_builders.hpp" +// defined in plugin_name.cpp +extern const char * cpu_plugin_file_name; + namespace { using namespace HeteroTests; @@ -16,13 +19,13 @@ using namespace HeteroTests; INSTANTIATE_TEST_SUITE_P(smoke_SingleMajorNode, HeteroSyntheticTest, ::testing::Combine( - ::testing::Values(std::vector{{"CPU0", "openvino_intel_cpu_plugin"}, {"CPU1", "openvino_intel_cpu_plugin"}}), + ::testing::Values(std::vector{{"CPU0", cpu_plugin_file_name}, {"CPU1", cpu_plugin_file_name}}), ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::_singleMajorNodeFunctions)), HeteroSyntheticTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(nightly_RandomMajorNodes, HeteroSyntheticTest, ::testing::Combine( - ::testing::Values(std::vector{{"CPU0", "openvino_intel_cpu_plugin"}, {"CPU1", "openvino_intel_cpu_plugin"}}), + ::testing::Values(std::vector{{"CPU0", cpu_plugin_file_name}, {"CPU1", cpu_plugin_file_name}}), ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::_randomMajorNodeFunctions)), HeteroSyntheticTest::getTestCaseName); diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/plugin_name.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/plugin_name.cpp new file mode 100644 index 00000000000..a86575fdcff --- /dev/null +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/plugin_name.cpp @@ -0,0 +1,15 @@ +// Copyright (C) 2018-2023 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "openvino/core/visibility.hpp" + +#if defined(OPENVINO_ARCH_ARM) || defined(OPENVINO_ARCH_ARM64) +const char * cpu_plugin_file_name = "openvino_arm_cpu_plugin"; +#elif defined(OPENVINO_ARCH_X86) || defined(OPENVINO_ARCH_X86_64) +const char * cpu_plugin_file_name = "openvino_intel_cpu_plugin"; +#elif defined(OPENVINO_ARCH_RISCV64) +const char * cpu_plugin_file_name = "openvino_riscv_cpu_plugin"; +#else +#error "Undefined system processor" +#endif