From b92e10ff6e41982dd624fada138cfd19c1c41471 Mon Sep 17 00:00:00 2001 From: Mateusz Tabaka Date: Wed, 4 May 2022 12:42:43 +0200 Subject: [PATCH] Fix setting default affinity property in cpuFuncTests (#11609) CPU plugin sets default affinity to HYBRID_AWARE if it's running on AlderLake, so we need to reflect that in cpuFuncTests. --- .../behavior/ov_executable_network/properties.cpp | 7 +++++-- .../behavior/ov_plugin/core_integration.cpp | 10 ++++++++-- .../behavior/plugin/configuration_tests.cpp | 5 ++++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/ov_executable_network/properties.cpp b/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/ov_executable_network/properties.cpp index 22705a5d63f..173ed266a36 100644 --- a/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/ov_executable_network/properties.cpp +++ b/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/ov_executable_network/properties.cpp @@ -66,7 +66,10 @@ INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVCompiledModelPropertie #if (defined(__APPLE__) || defined(_WIN32)) auto default_affinity = [] { auto numaNodes = InferenceEngine::getAvailableNUMANodes(); - if (numaNodes.size() > 1) { + auto coreTypes = InferenceEngine::getAvailableCoresTypes(); + if (coreTypes.size() > 1) { + return ov::Affinity::HYBRID_AWARE; + } else if (numaNodes.size() > 1) { return ov::Affinity::NUMA; } else { return ov::Affinity::NONE; @@ -136,4 +139,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVCompiledModelPropertie ::testing::Values(CommonTestUtils::DEVICE_BATCH), ::testing::ValuesIn(auto_batch_properties)), OVCompiledModelPropertiesTests::getTestCaseName); -} // namespace \ No newline at end of file +} // namespace diff --git a/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/ov_plugin/core_integration.cpp b/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/ov_plugin/core_integration.cpp index 45d1fa4b1e5..a3ebd08f6e2 100644 --- a/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/ov_plugin/core_integration.cpp +++ b/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/ov_plugin/core_integration.cpp @@ -144,14 +144,20 @@ TEST(OVClassBasicTest, smoke_SetConfigAffinity) { #if (defined(__APPLE__) || defined(_WIN32)) auto numaNodes = InferenceEngine::getAvailableNUMANodes(); - auto defaultBindThreadParameter = numaNodes.size() > 1 ? ov::Affinity::NUMA : ov::Affinity::NONE; + auto coreTypes = InferenceEngine::getAvailableCoresTypes(); + auto defaultBindThreadParameter = ov::Affinity::NONE; + if (coreTypes.size() > 1) { + defaultBindThreadParameter = ov::Affinity::HYBRID_AWARE; + } else if (numaNodes.size() > 1) { + defaultBindThreadParameter = ov::Affinity::NUMA; + } #else auto defaultBindThreadParameter = ov::Affinity::CORE; #endif OV_ASSERT_NO_THROW(value = ie.get_property("CPU", ov::affinity)); ASSERT_EQ(defaultBindThreadParameter, value); - const ov::Affinity affinity = ov::Affinity::HYBRID_AWARE; + const ov::Affinity affinity = defaultBindThreadParameter == ov::Affinity::HYBRID_AWARE ? ov::Affinity::NUMA : ov::Affinity::HYBRID_AWARE; OV_ASSERT_NO_THROW(ie.set_property("CPU", ov::affinity(affinity))); OV_ASSERT_NO_THROW(value = ie.get_property("CPU", ov::affinity)); ASSERT_EQ(affinity, value); diff --git a/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/plugin/configuration_tests.cpp b/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/plugin/configuration_tests.cpp index 9b7454dc5ed..5b786abba04 100644 --- a/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/plugin/configuration_tests.cpp +++ b/src/tests/functional/plugin/cpu/shared_tests_instances/behavior/plugin/configuration_tests.cpp @@ -12,7 +12,10 @@ namespace { #if (defined(__APPLE__) || defined(_WIN32)) auto defaultBindThreadParameter = InferenceEngine::Parameter{[] { auto numaNodes = InferenceEngine::getAvailableNUMANodes(); - if (numaNodes.size() > 1) { + auto coreTypes = InferenceEngine::getAvailableCoresTypes(); + if (coreTypes.size() > 1) { + return std::string{CONFIG_VALUE(HYBRID_AWARE)}; + } else if (numaNodes.size() > 1) { return std::string{CONFIG_VALUE(NUMA)}; } else { return std::string{CONFIG_VALUE(NO)};