Skip to content

[CPU][ARM] Enable subgraph tests #25399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmitry-gorokhov merged 30 commits into from
Jul 16, 2024
Merged

[CPU][ARM] Enable subgraph tests #25399

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
d572f47
init
alvoron Jul 5, 2024
caf69c8
Merge branch 'master' into alvoron_subgraph_tests2
alvoron Jul 5, 2024
d727e6a
added filter_cpu_info.hpp include
alvoron Jul 5, 2024
16397bd
fixed failed tests
alvoron Jul 5, 2024
3e06867
conv_concat fixed
alvoron Jul 5, 2024
eb904d0
use filterCPUSpecificParams in conv_concat
alvoron Jul 5, 2024
6d52a97
Merge branch 'master' into alvoron_subgraph_tests2
alvoron Jul 5, 2024
43b4714
add filter_cpu_info.hpp include
alvoron Jul 5, 2024
8490da2
fix arm 32 bit cases
alvoron Jul 7, 2024
9d65f77
fix CI issues
alvoron Jul 8, 2024
a0b6283
fix x64 filterCPUSpecificParams
alvoron Jul 8, 2024
d0305a4
move memory_sharing_test to x64 dir
alvoron Jul 8, 2024
37ab2c6
address comments
alvoron Jul 9, 2024
23263e5
Merge branch 'master' into alvoron_subgraph_tests2
alvoron Jul 10, 2024
a9dd0df
cherry-pick #24853
alvoron Jul 11, 2024
90b8d34
Merge branch 'master' into alvoron_subgraph_tests2
alvoron Jul 11, 2024
3448c18
refactor format filtering
alvoron Jul 11, 2024
2226adb
filter blocked layouts in slice SLT
alvoron Jul 11, 2024
9dfa3cc
fix 32-bit arm params
alvoron Jul 11, 2024
de0442d
revert x64 layout filtering mechanism
alvoron Jul 12, 2024
1e455c5
fix slice filtering
alvoron Jul 12, 2024
b5e3aea
fix conv_concat filtering
alvoron Jul 12, 2024
2964db8
fix conv_concat filtering
alvoron Jul 13, 2024
5c627e1
added missed include to conv_concat
alvoron Jul 13, 2024
89ec0a7
added missed include to conv_concat
alvoron Jul 13, 2024
bbe4d52
Merge branch 'alvoron_subgraph_tests2' of https://github.com/alvoron/…
alvoron Jul 13, 2024
1711104
Merge branch 'master' into alvoron_subgraph_tests2
alvoron Jul 13, 2024
bd4bf48
conv_concat fix
alvoron Jul 13, 2024
9dbe5d7
fixed conv_concat
alvoron Jul 13, 2024
831015e
fix skip
alvoron Jul 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/fake_quantize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "common_test_utils/node_builders/constant.hpp"
#include "shared_test_classes/base/ov_subgraph.hpp"
#include "utils/cpu_test_utils.hpp"
#include "utils/filter_cpu_info.hpp"

using namespace CPUTestUtils;
namespace ov {
Expand Down
1 change: 1 addition & 0 deletions src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/gather_elements.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "common_test_utils/ov_tensor_utils.hpp"
#include "shared_test_classes/base/ov_subgraph.hpp"
#include "utils/cpu_test_utils.hpp"
#include "utils/filter_cpu_info.hpp"

using namespace CPUTestUtils;

Expand Down
1 change: 1 addition & 0 deletions src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/instances/arm/eltwise.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "custom/single_layer_tests/classes/eltwise.hpp"
#include "utils/cpu_test_utils.hpp"
#include "utils/fusing_test_utils.hpp"
#include "utils/filter_cpu_info.hpp"

using namespace CPUTestUtils;

Expand Down
1 change: 1 addition & 0 deletions src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/instances/arm/reduce.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "custom/single_layer_tests/classes/reduce.hpp"
#include "utils/cpu_test_utils.hpp"
#include "utils/filter_cpu_info.hpp"
#include "utils/fusing_test_utils.hpp"
#include "ov_lpt_models/common/builders.hpp"
#include "common_test_utils/node_builders/fake_quantize.hpp"
Expand Down
1 change: 1 addition & 0 deletions ...gins/intel_cpu/tests/functional/custom/single_layer_tests/instances/common/activation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "custom/single_layer_tests/classes/activation.hpp"
#include "utils/cpu_test_utils.hpp"
#include "utils/filter_cpu_info.hpp"

using namespace CPUTestUtils;

Expand Down
1 change: 1 addition & 0 deletions ...plugins/intel_cpu/tests/functional/custom/single_layer_tests/instances/common/eltwise.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "custom/single_layer_tests/classes/eltwise.hpp"
#include "utils/cpu_test_utils.hpp"
#include "utils/fusing_test_utils.hpp"
#include "utils/filter_cpu_info.hpp"

using namespace CPUTestUtils;

Expand Down
1 change: 1 addition & 0 deletions ...lugins/intel_cpu/tests/functional/custom/single_layer_tests/instances/common/extremum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "custom/single_layer_tests/classes/extremum.hpp"
#include "utils/cpu_test_utils.hpp"
#include "utils/filter_cpu_info.hpp"

using namespace CPUTestUtils;

Expand Down
1 change: 1 addition & 0 deletions src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/instances/common/mvn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "custom/single_layer_tests/classes/mvn.hpp"
#include "utils/cpu_test_utils.hpp"
#include "utils/fusing_test_utils.hpp"
#include "utils/filter_cpu_info.hpp"

using namespace CPUTestUtils;

Expand Down
1 change: 1 addition & 0 deletions src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/instances/common/reduce.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "custom/single_layer_tests/classes/reduce.hpp"
#include "utils/cpu_test_utils.hpp"
#include "utils/fusing_test_utils.hpp"
#include "utils/filter_cpu_info.hpp"

using namespace CPUTestUtils;

Expand Down
1 change: 1 addition & 0 deletions ...plugins/intel_cpu/tests/functional/custom/single_layer_tests/instances/x64/activation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "custom/single_layer_tests/classes/activation.hpp"
#include "utils/cpu_test_utils.hpp"
#include "utils/filter_cpu_info.hpp"
#include "common_test_utils/test_enums.hpp"

using namespace CPUTestUtils;
Expand Down
1 change: 1 addition & 0 deletions ...plugins/intel_cpu/tests/functional/custom/single_layer_tests/instances/x64/conversion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "custom/single_layer_tests/classes/conversion.hpp"
#include "utils/cpu_test_utils.hpp"
#include "utils/filter_cpu_info.hpp"

using namespace CPUTestUtils;

Expand Down
1 change: 1 addition & 0 deletions src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/instances/x64/eltwise.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "custom/single_layer_tests/classes/eltwise.hpp"
#include "utils/cpu_test_utils.hpp"
#include "utils/fusing_test_utils.hpp"
#include "utils/filter_cpu_info.hpp"

using namespace CPUTestUtils;

Expand Down
1 change: 1 addition & 0 deletions src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/instances/x64/mvn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "custom/single_layer_tests/classes/mvn.hpp"
#include "utils/cpu_test_utils.hpp"
#include "utils/fusing_test_utils.hpp"
#include "utils/filter_cpu_info.hpp"
#include "common_test_utils/ov_tensor_utils.hpp"

using namespace CPUTestUtils;
Expand Down
1 change: 1 addition & 0 deletions src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/instances/x64/reduce.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "custom/single_layer_tests/classes/reduce.hpp"
#include "utils/cpu_test_utils.hpp"
#include "utils/fusing_test_utils.hpp"
#include "utils/filter_cpu_info.hpp"
#include "ov_lpt_models/common/builders.hpp"
#include "common_test_utils/node_builders/fake_quantize.hpp"

Expand Down
1 change: 1 addition & 0 deletions src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/psroi_pooling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "common_test_utils/node_builders/constant.hpp"
#include "shared_test_classes/base/ov_subgraph.hpp"
#include "utils/cpu_test_utils.hpp"
#include "utils/filter_cpu_info.hpp"

using namespace CPUTestUtils;

Expand Down
17 changes: 9 additions & 8 deletions src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/slice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include "shared_test_classes/base/ov_subgraph.hpp"
#include "utils/cpu_test_utils.hpp"
#include "utils/filter_cpu_info.hpp"
#include "common_test_utils/test_enums.hpp"

using namespace CPUTestUtils;
Expand Down Expand Up @@ -351,7 +352,7 @@ INSTANTIATE_TEST_SUITE_P(
::testing::ValuesIn(testCasesBlocked4DSubset1),
::testing::Values(ov::test::utils::InputLayerType::CONSTANT),
::testing::ValuesIn(inputPrecisions),
::testing::ValuesIn(CPUParamsBlocked4D)),
::testing::ValuesIn(filterCPUSpecificParams(CPUParamsBlocked4D))),
Slice8LayerCPUTest::getTestCaseName);

INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Common_Dynamic_4D_Subset1,
Expand All @@ -360,7 +361,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Common_Dynamic_4D_Subset1,
::testing::ValuesIn(testCasesBlocked4DSubset1),
::testing::Values(ov::test::utils::InputLayerType::CONSTANT),
::testing::ValuesIn(inputPrecisions),
::testing::ValuesIn(CPUParamsBlocked4D)),
::testing::ValuesIn(filterCPUSpecificParams(CPUParamsBlocked4D))),
Slice8LayerCPUTest::getTestCaseName);

INSTANTIATE_TEST_SUITE_P(
Expand All @@ -370,7 +371,7 @@ INSTANTIATE_TEST_SUITE_P(
::testing::ValuesIn(testCasesBlocked4DSubset2),
::testing::Values(ov::test::utils::InputLayerType::CONSTANT),
::testing::ValuesIn(inputPrecisions),
::testing::ValuesIn(CPUParamsBlocked4D)),
::testing::ValuesIn(filterCPUSpecificParams(CPUParamsBlocked4D))),
Slice8LayerCPUTest::getTestCaseName);

INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Common_Dynamic_4D_Subset2,
Expand All @@ -379,7 +380,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Common_Dynamic_4D_Subset2,
::testing::ValuesIn(testCasesBlocked4DSubset2),
::testing::Values(ov::test::utils::InputLayerType::CONSTANT),
::testing::ValuesIn(inputPrecisions),
::testing::ValuesIn(CPUParamsBlocked4D)),
::testing::ValuesIn(filterCPUSpecificParams(CPUParamsBlocked4D))),
Slice8LayerCPUTest::getTestCaseName);

const std::vector<Slice8SpecificParams> testCasesCommon5D = {
Expand Down Expand Up @@ -512,7 +513,7 @@ INSTANTIATE_TEST_SUITE_P(
::testing::ValuesIn(testCasesBlocked5DSubset1),
::testing::Values(ov::test::utils::InputLayerType::CONSTANT),
::testing::ValuesIn(inputPrecisions),
::testing::ValuesIn(CPUParamsBlocked5D)),
::testing::ValuesIn(filterCPUSpecificParams(CPUParamsBlocked5D))),
Slice8LayerCPUTest::getTestCaseName);

INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Common_Dynamic_5D_Subset1,
Expand All @@ -521,7 +522,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Common_Dynamic_5D_Subset1,
::testing::ValuesIn(testCasesBlocked5DSubset1),
::testing::Values(ov::test::utils::InputLayerType::CONSTANT),
::testing::ValuesIn(inputPrecisions),
::testing::ValuesIn(CPUParamsBlocked5D)),
::testing::ValuesIn(filterCPUSpecificParams(CPUParamsBlocked5D))),
Slice8LayerCPUTest::getTestCaseName);

INSTANTIATE_TEST_SUITE_P(
Expand All @@ -540,7 +541,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Common_Dynamic_5D_Subset2,
::testing::ValuesIn(testCasesBlocked5DSubset2),
::testing::Values(ov::test::utils::InputLayerType::CONSTANT),
::testing::ValuesIn(inputPrecisions),
::testing::ValuesIn(CPUParamsBlocked5D)),
::testing::ValuesIn(filterCPUSpecificParams(CPUParamsBlocked5D))),
Slice8LayerCPUTest::getTestCaseName);

/* Descriptors check */
Expand Down Expand Up @@ -576,7 +577,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Slice8LayerDescriptorCPUTest,
::testing::ValuesIn(testCasesDescriptors),
::testing::Values(ov::test::utils::InputLayerType::CONSTANT),
::testing::Values(ElementType::f32),
::testing::Values(cpuParams_nChw8c)),
::testing::ValuesIn(filterCPUSpecificParams({cpuParams_nChw8c}))),
Slice8LayerDescriptorCPUTest::getTestCaseName);

} // namespace
1 change: 1 addition & 0 deletions src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/topk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "common_test_utils/ov_tensor_utils.hpp"
#include "shared_test_classes/base/ov_subgraph.hpp"
#include "utils/cpu_test_utils.hpp"
#include "utils/filter_cpu_info.hpp"

using namespace CPUTestUtils;
using namespace ov::test;
Expand Down
Loading