diff --git a/ge/graph/passes/merge_input_memcpy_pass.cc b/ge/graph/passes/merge_input_memcpy_pass.cc index e8bf0377..25882b2a 100644 --- a/ge/graph/passes/merge_input_memcpy_pass.cc +++ b/ge/graph/passes/merge_input_memcpy_pass.cc @@ -23,7 +23,9 @@ namespace ge { Status MergeInputMemcpyPass::Run(ComputeGraphPtr graph) { GELOGD("MergeInputMemcpyPass Enter"); for (const auto &node : graph->GetDirectNode()) { - if ((node->GetType() != MERGE) && (node->GetType() != REFMERGE)) { + std::string type; + GE_CHK_STATUS_RET(GetOriginalType(node, type), "Get node type failed."); + if ((type != MERGE) && (type != REFMERGE)) { continue; } GE_CHECK_NOTNULL(node->GetOpDesc()); @@ -95,4 +97,3 @@ NodePtr MergeInputMemcpyPass::CreateMemcpyAsyncNode(const ComputeGraphPtr &graph return graph->AddNode(op_desc); } } // namespace ge - diff --git a/ge/graph/passes/merge_to_stream_merge_pass.cc b/ge/graph/passes/merge_to_stream_merge_pass.cc index c1a57a61..44c5c069 100644 --- a/ge/graph/passes/merge_to_stream_merge_pass.cc +++ b/ge/graph/passes/merge_to_stream_merge_pass.cc @@ -25,7 +25,9 @@ Status MergeToStreamMergePass::Run(ComputeGraphPtr graph) { bypass_nodes_.clear(); for (const auto &node : graph->GetDirectNode()) { - if ((node->GetType() != MERGE) && (node->GetType() != REFMERGE)) { + std::string type; + GE_CHK_STATUS_RET(GetOriginalType(node, type), "Get node type failed."); + if ((type != MERGE) && (type != REFMERGE)) { continue; } diff --git a/ge/graph/passes/next_iteration_pass.cc b/ge/graph/passes/next_iteration_pass.cc index cf46f09d..f5baee06 100644 --- a/ge/graph/passes/next_iteration_pass.cc +++ b/ge/graph/passes/next_iteration_pass.cc @@ -101,7 +101,8 @@ Status NextIterationPass::FindWhileGroups() { const std::string &frame_name = loop_group_iter.first; for (const auto &enter_node : loop_group_iter.second->enter_nodes) { for (const auto &out_node : enter_node->GetOutAllNodes()) { - const string &type = out_node->GetType(); + std::string type; + GE_CHK_STATUS_RET(GetOriginalType(out_node, type), "Get node type failed."); if ((type != MERGE) && (type != REFMERGE)) { continue; } @@ -310,7 +311,8 @@ Status NextIterationPass::FindTargetNode(const NodePtr &node, const std::string } for (const auto &tmp_node : nodes) { - const std::string type = tmp_node->GetType(); + std::string type; + GE_CHK_STATUS_RET(GetOriginalType(tmp_node, type), "Get node type failed."); if ((target_type == LOOPCOND) && (type == target_type)) { target_node = tmp_node; break; diff --git a/tests/ut/ge/CMakeLists.txt b/tests/ut/ge/CMakeLists.txt index 63bcc5c5..c30c7170 100755 --- a/tests/ut/ge/CMakeLists.txt +++ b/tests/ut/ge/CMakeLists.txt @@ -665,8 +665,9 @@ set(PASS_TEST_FILES "graph/passes/addn_pass_unittest.cc" "graph/passes/save_pass_unittest.cc" "graph/passes/merge_pass_unittest.cc" - #"graph/passes/switch_pass_unittest.cc" "graph/passes/switch_logic_remove_pass_unittest.cc" + "graph/passes/cond_branch_v1_unittest.cc" + "graph/passes/loop_branch_v1_unittest.cc" "graph/passes/switch_dead_branch_elimination_unittest.cc" "graph/passes/assert_pass_unittest.cc" "graph/passes/dropout_pass_unittest.cc" diff --git a/tests/ut/ge/graph/passes/cond_branch_v1_unittest.cc b/tests/ut/ge/graph/passes/cond_branch_v1_unittest.cc new file mode 100644 index 00000000..0927aec4 --- /dev/null +++ b/tests/ut/ge/graph/passes/cond_branch_v1_unittest.cc @@ -0,0 +1,125 @@ +/** + * Copyright 2019-2020 Huawei Technologies Co., Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "graph/passes/merge_input_memcpy_pass.h" +#include "graph/passes/switch_to_stream_switch_pass.h" +#include "graph/passes/merge_to_stream_merge_pass.h" +#include "graph/passes/attach_stream_label_pass.h" + +#include +#include "graph_builder_utils.h" + +namespace ge { +class UtestCondBranchV1Pass : public testing::Test { + protected: + void SetUp() {} + void TearDown() {} +}; + +namespace { +/// +/// net_output +/// | +/// merge +/// / \ +/// square add +/// F| T/ T\ +/// switch1 switch2 +/// / \ / \ +/// var1 var2 var3 +/// +ComputeGraphPtr BuildGraph1() { + auto builder = ut::GraphBuilder("g1"); + auto var1 = builder.AddNode("var1", VARIABLEV2, 0, 1); + auto var2 = builder.AddNode("var2", VARIABLEV2, 0, 1, FORMAT_ND, DT_BOOL, {}); + auto var3 = builder.AddNode("var3", VARIABLEV2, 0, 1); + auto switch1 = builder.AddNode("switch1", REFSWITCH, 2, 2); + auto switch2 = builder.AddNode("switch2", SWITCH, 2, 2); + auto add = builder.AddNode("add", ADD, 2, 1); + auto square = builder.AddNode("square", SQUARE, 1, 1); + auto merge = builder.AddNode("merge", MERGE, 2, 2); + auto net_output = builder.AddNode("net_output", NETOUTPUT, 1, 0); + + builder.AddDataEdge(var1, 0, switch1, 0); + builder.AddDataEdge(var2, 0, switch1, 1); + builder.AddDataEdge(var3, 0, switch2, 0); + builder.AddDataEdge(var2, 0, switch2, 1); + builder.AddDataEdge(switch1, 0, square, 0); + builder.AddDataEdge(switch1, 1, add, 0); + builder.AddDataEdge(switch2, 1, add, 1); + builder.AddDataEdge(square, 0, merge, 0); + builder.AddDataEdge(add, 0, merge, 1); + builder.AddDataEdge(merge, 0, net_output, 0); + return builder.GetGraph(); +} +} // namespace + +TEST_F(UtestCondBranchV1Pass, common_cond_branch_v1) { + auto graph = BuildGraph1(); + MergeInputMemcpyPass memcpy_pass; + SwitchToStreamSwitchPass switch_pass; + MergeToStreamMergePass merge_pass; + AttachStreamLabelPass label_pass; + EXPECT_EQ(memcpy_pass.Run(graph), SUCCESS); + EXPECT_EQ(switch_pass.Run(graph), SUCCESS); + EXPECT_EQ(merge_pass.Run(graph), SUCCESS); + EXPECT_EQ(label_pass.Run(graph), SUCCESS); + + uint32_t switch_num = 0; + uint32_t merge_num = 0; + uint32_t cast_num = 0; + uint32_t stream_switch_num = 0; + uint32_t memcpy_num = 0; + uint32_t active_num = 0; + uint32_t stream_merge_num = 0; + + for (const auto &node : graph->GetAllNodes()) { + const auto &op_desc = node->GetOpDesc(); + std::string type = op_desc->GetType(); + if (type == SWITCH || type == REFSWITCH) { + switch_num++; + } else if (type == MERGE) { + merge_num++; + } else if (type == CAST) { + cast_num++; + } else if (type == STREAMSWITCH) { + stream_switch_num++; + EXPECT_TRUE(op_desc->HasAttr(ATTR_NAME_STREAM_LABEL)); + EXPECT_TRUE(op_desc->HasAttr(ATTR_NAME_ACTIVE_LABEL_LIST)); + EXPECT_TRUE(op_desc->HasAttr(ATTR_NAME_SWITCH_DATA_TYPE)); + EXPECT_TRUE(op_desc->HasAttr(ATTR_NAME_SWITCH_TRUE_BRANCH_FLAG)); + } else if (type == STREAMMERGE) { + stream_merge_num++; + EXPECT_TRUE(op_desc->HasAttr(ATTR_NAME_STREAM_LABEL)); + } else if ((type == MEMCPYASYNC) || (type == MEMCPYADDRASYNC)) { + EXPECT_TRUE(op_desc->HasAttr(ATTR_NAME_STREAM_LABEL)); + memcpy_num++; + } else if (type == STREAMACTIVE) { + active_num++; + EXPECT_TRUE(op_desc->HasAttr(ATTR_NAME_ACTIVE_LABEL_LIST)); + } + } + + EXPECT_EQ(switch_num, 0); + EXPECT_EQ(merge_num, 0); + EXPECT_EQ(cast_num, 1); + EXPECT_EQ(stream_switch_num, 2); + EXPECT_EQ(memcpy_num, 2); + EXPECT_EQ(active_num, 3); + EXPECT_EQ(stream_merge_num, 1); +} + +} // namespace ge diff --git a/tests/ut/ge/graph/passes/loop_branch_v1_unittest.cc b/tests/ut/ge/graph/passes/loop_branch_v1_unittest.cc new file mode 100644 index 00000000..0663ac54 --- /dev/null +++ b/tests/ut/ge/graph/passes/loop_branch_v1_unittest.cc @@ -0,0 +1,149 @@ +/** + * Copyright 2019-2020 Huawei Technologies Co., Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "graph/passes/merge_input_memcpy_pass.h" +#include "graph/passes/next_iteration_pass.h" +#include "graph/passes/switch_to_stream_switch_pass.h" +#include "graph/passes/merge_to_stream_merge_pass.h" +#include "graph/passes/attach_stream_label_pass.h" + +#include +#include "graph_builder_utils.h" + +namespace ge { +class UtestLoopBranchV1Pass : public testing::Test { + protected: + void SetUp() {} + void TearDown() {} +}; + +namespace { +/// +/// net_output +/// | +/// exit next_iteration +/// \ | | +/// \ add | +/// F\ T/ \ | +/// switch1 enter1 | +/// / | | | +/// loop_cond | const1 | +/// | | | +/// less | | +/// / \ | | +/// enter2 merge ---------| +/// | | +/// const2 enter3 +/// | +/// var +/// +ComputeGraphPtr BuildGraph1() { + auto builder = ut::GraphBuilder("g1"); + auto const1 = builder.AddNode("const1", CONSTANTOP, 0, 1); + auto enter1 = builder.AddNode("enter1", ENTER, 1, 1); + AttrUtils::SetStr(enter1->GetOpDesc(), ENTER_ATTR_FRAME_NAME, "frame_name"); + auto const2 = builder.AddNode("const2", CONSTANTOP, 0, 1); + auto enter2 = builder.AddNode("enter2", ENTER, 1, 1); + AttrUtils::SetStr(enter2->GetOpDesc(), ENTER_ATTR_FRAME_NAME, "frame_name"); + auto var = builder.AddNode("var", VARIABLEV2, 0, 1); + auto enter3 = builder.AddNode("enter3", ENTER, 1, 1); + AttrUtils::SetStr(enter3->GetOpDesc(), ENTER_ATTR_FRAME_NAME, "frame_name"); + auto merge = builder.AddNode("merge", MERGE, 2, 2); + auto less = builder.AddNode("less", LESS, 2, 1); + auto loop_cond = builder.AddNode("loop_cond", LOOPCOND, 1, 1, FORMAT_ND, DT_BOOL, {}); + auto switch1 = builder.AddNode("switch1", SWITCH, 2, 2); + auto add = builder.AddNode("add", ADD, 2, 1); + auto next_iteration = builder.AddNode("next_iteration", NEXTITERATION, 1, 1); + auto exit = builder.AddNode("exit", EXIT, 1, 1); + auto net_output = builder.AddNode("net_output", NETOUTPUT, 1, 0); + + builder.AddDataEdge(const1, 0, enter1, 0); + builder.AddDataEdge(const2, 0, enter2, 0); + builder.AddDataEdge(var, 0, enter3, 0); + builder.AddDataEdge(enter3, 0, merge, 0); + builder.AddDataEdge(enter2, 0, less, 0); + builder.AddDataEdge(merge, 0, less, 1); + builder.AddDataEdge(merge, 0, switch1, 0); + builder.AddDataEdge(less, 0, loop_cond, 0); + builder.AddDataEdge(loop_cond, 0, switch1, 1); + builder.AddDataEdge(switch1, 1, add, 0); + builder.AddDataEdge(enter1, 0, add, 1); + builder.AddDataEdge(add, 0, next_iteration, 0); + builder.AddDataEdge(next_iteration, 0, merge, 1); + builder.AddDataEdge(switch1, 0, exit, 0); + builder.AddDataEdge(exit, 0, net_output, 0); + return builder.GetGraph(); +} +} // namespace + +TEST_F(UtestLoopBranchV1Pass, common_loop_branch_v1) { + auto graph = BuildGraph1(); + MergeInputMemcpyPass memcpy_pass; + NextIterationPass loop_pass; + SwitchToStreamSwitchPass switch_pass; + MergeToStreamMergePass merge_pass; + AttachStreamLabelPass label_pass; + EXPECT_EQ(memcpy_pass.Run(graph), SUCCESS); + EXPECT_EQ(loop_pass.Run(graph), SUCCESS); + EXPECT_EQ(switch_pass.Run(graph), SUCCESS); + EXPECT_EQ(merge_pass.Run(graph), SUCCESS); + EXPECT_EQ(label_pass.Run(graph), SUCCESS); + + uint32_t switch_num = 0; + uint32_t merge_num = 0; + uint32_t cast_num = 0; + uint32_t stream_switch_num = 0; + uint32_t active_num = 0; + uint32_t stream_merge_num = 0; + uint32_t memcpy_num = 0; + + for (const auto &node : graph->GetAllNodes()) { + const auto &op_desc = node->GetOpDesc(); + std::string type = op_desc->GetType(); + if (type == SWITCH || type == REFSWITCH) { + switch_num++; + } else if (type == MERGE) { + merge_num++; + } else if (type == CAST) { + EXPECT_TRUE(op_desc->HasAttr(ATTR_NAME_STREAM_LABEL)); + cast_num++; + } else if (type == STREAMSWITCH) { + stream_switch_num++; + EXPECT_TRUE(op_desc->HasAttr(ATTR_NAME_STREAM_LABEL)); + EXPECT_TRUE(op_desc->HasAttr(ATTR_NAME_ACTIVE_LABEL_LIST)); + EXPECT_TRUE(op_desc->HasAttr(ATTR_NAME_SWITCH_DATA_TYPE)); + EXPECT_TRUE(op_desc->HasAttr(ATTR_NAME_SWITCH_TRUE_BRANCH_FLAG)); + } else if (type == STREAMMERGE) { + stream_merge_num++; + EXPECT_TRUE(op_desc->HasAttr(ATTR_NAME_STREAM_LABEL)); + } else if (type == STREAMACTIVE) { + active_num++; + EXPECT_TRUE(op_desc->HasAttr(ATTR_NAME_ACTIVE_LABEL_LIST)); + } else if (type == MEMCPYASYNC) { + memcpy_num++; + } + } + + EXPECT_EQ(switch_num, 0); + EXPECT_EQ(merge_num, 0); + EXPECT_EQ(cast_num, 1); + EXPECT_EQ(stream_switch_num, 2); + EXPECT_EQ(active_num, 3); + EXPECT_EQ(stream_merge_num, 1); + EXPECT_EQ(memcpy_num, 0); +} + +} // namespace ge