-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[CPU]The shape of the memory descriptor is considered in selectPrefer…
…PrimitiveDescriptor of Subgraph (#23971) ### Details: - *selectPreferPrimitiveDescriptor take into account shapes of the memory descriptors, because scalar shape node's reorder has less computation* - *New logic only work for Subgraph* ### Tickets: - *137307* - *139904* --------- Signed-off-by: xipingya <[email protected]> Signed-off-by: Yan <[email protected]>
- Loading branch information
Showing
4 changed files
with
244 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
120 changes: 120 additions & 0 deletions
120
src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/subgraph_select_pd.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| // Copyright (C) 2024 Intel Corporation | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
|
|
||
| #include "common_test_utils/node_builders/constant.hpp" | ||
| #include "openvino/opsets/opset8.hpp" | ||
| #include "shared_test_classes/base/ov_subgraph.hpp" | ||
| #include "utils/cpu_test_utils.hpp" | ||
|
|
||
| namespace ov { | ||
| namespace test { | ||
|
|
||
| /* | ||
| input1(f32_abcd_{1,64,32,32}) input2(f16_abcd_{1,128,1,1}) | ||
| | | | ||
| Reorder(f32_acdb_{1,64,32,32}) const Convert(f32_abcd_{1,128,1,1}) | ||
| | / | | ||
| | / | | ||
| Convolution(f32_acdb_{1,1,30,30}) Range_1520 VariadicSplit(f32_abcd_{1,64,1,1}, f32_abcd_{1,64,1,1}) | ||
| | / \ / | ||
| | / \ / | ||
| | / \ / | ||
| | / \ / | ||
| MVN(f32_acdb_{1,1,30,30}) Reorder1(f32_acdb_{1,64,1,1}) Reorder2(f32_acdb_{1,64,1,1}) | ||
| \ / / | ||
| \ / / | ||
| \ / / | ||
| \ / / | ||
| Subgraph(f32_acdb_{1,64,30,30}) | ||
| | | ||
| | | ||
| Convolution(f32_acdb_{1,1,28,28}) | ||
| | | ||
| Result | ||
| The Subgraph node have 3 inputs: they don't have same layout. | ||
| Expected: Reorder is inserted after VariadicSplit[0] and VariadicSplit[1], not inserted after MVN. | ||
| Because VariadicSplit's output layout is scalar shape([1,64,1,1]), its reorder has less computation. | ||
| */ | ||
|
|
||
| class SubgraphSelectPD : virtual public SubgraphBaseStaticTest { | ||
| protected: | ||
| void SetUp() override { | ||
| targetDevice = ov::test::utils::DEVICE_CPU; | ||
| abs_threshold = 2e-2; | ||
|
|
||
| auto type = element::f32; | ||
| constexpr int const1 = 32; | ||
| auto input1 = std::make_shared<ov::opset8::Parameter>(type, Shape{1, const1 / 2, 8, 8}); | ||
| input1->set_friendly_name("input1"); | ||
| auto input2 = std::make_shared<ov::opset8::Parameter>(type, Shape{1, const1, 1, 1}); | ||
| input2->set_friendly_name("input2"); | ||
|
|
||
| auto variadicSplit = std::make_shared<ov::op::v1::VariadicSplit>( | ||
| input2, | ||
| ov::opset8::Constant::create(element::i64, Shape{1}, {1}), | ||
| ov::opset8::Constant::create(element::i64, Shape{2}, {const1 / 2, const1 / 2})); | ||
| variadicSplit->set_friendly_name("variadicSplit"); | ||
|
|
||
| auto add1 = std::make_shared<ov::opset8::Add>(variadicSplit->output(0), | ||
| ov::opset8::Constant::create(type, Shape{1}, {0})); | ||
| add1->set_friendly_name("add1"); | ||
| auto shapeof = std::make_shared<ov::opset8::ShapeOf>(input1); | ||
| auto rankof = std::make_shared<ov::opset8::ShapeOf>(shapeof); | ||
| auto squeeze = | ||
| std::make_shared<ov::opset8::Squeeze>(rankof, ov::opset8::Constant::create(element::i64, Shape{1}, {0})); | ||
|
|
||
| auto range = std::make_shared<ov::opset8::Range>(ov::opset8::Constant::create(element::i64, Shape{}, {2}), | ||
| squeeze, | ||
| ov::opset8::Constant::create(element::i64, Shape{}, {1}), | ||
| ov::element::i64); | ||
| auto create_conv = [&](const std::shared_ptr<ov::Node>& input_node) { | ||
| ov::test::utils::InputGenerateData in_gen_data(0, 1); | ||
| auto conv = std::make_shared<ov::opset8::Convolution>( | ||
| input_node, | ||
| ov::test::utils::make_constant(type, Shape{1, const1 / 2u, 3, 3}, ov::test::utils::InputGenerateData(0, 1)), | ||
| Strides{1, 1}, | ||
| CoordinateDiff{1, 1}, | ||
| CoordinateDiff{1, 1}, | ||
| Strides{1, 1}); | ||
| conv->get_rt_info() = | ||
| CPUTestUtils::CPUTestsBase::makeCPUInfo({CPUTestUtils::nhwc}, {CPUTestUtils::nhwc}, {}); | ||
| return conv; | ||
| }; | ||
| auto create_relu = [&](const std::shared_ptr<ov::Node>& input_node) { | ||
| return std::make_shared<ov::opset8::PRelu>(input_node, | ||
| ov::opset8::Constant::create(element::f32, Shape{1}, {1})); | ||
| }; | ||
| auto conv1 = create_conv(input1); | ||
| auto mvn = | ||
| std::make_shared<ov::opset8::MVN>(create_relu(conv1), range, false, 0.1, op::MVNEpsMode::INSIDE_SQRT); | ||
| auto mul = std::make_shared<ov::opset8::Multiply>(create_relu(add1), mvn); | ||
| auto add2 = std::make_shared<ov::opset8::Add>(variadicSplit->output(1), mul); | ||
| auto conv2 = create_conv(create_relu(add2)); | ||
| conv2->set_friendly_name("conv2"); | ||
|
|
||
| function = std::make_shared<ov::Model>(conv2, ParameterVector{input1, input2}); | ||
| } | ||
|
|
||
| void TearDown() override { | ||
| auto runtime_function = compiledModel.get_runtime_model(); | ||
| int nodes_found = 0; | ||
| for (const auto& n : runtime_function->get_ordered_ops()) { | ||
| auto layer_type = n->get_rt_info().at(ov::exec_model_info::LAYER_TYPE).as<std::string>(); | ||
| if (layer_type == "Subgraph") { | ||
| nodes_found++; | ||
| auto output_layout = n->get_rt_info().at(ov::exec_model_info::OUTPUT_LAYOUTS).as<std::string>(); | ||
| // The optimal choose should be: 'nhwc'. | ||
| ASSERT_EQ(output_layout, "acdb"); | ||
| } | ||
| } | ||
| ASSERT_GT(nodes_found, 0); | ||
| } | ||
| }; | ||
|
|
||
| TEST_F(SubgraphSelectPD, smoke_CompareWithRefs) { | ||
| run(); | ||
| } | ||
|
|
||
| } // namespace test | ||
| } // namespace ov |