bugfix for variable->broadcast addr

tests/ut/ge/graph/build/mem_assigner_unittest.cc

@@ -25,10 +25,12 @@
 #include "graph/utils/op_desc_utils.h"
 #include "graph/utils/tensor_utils.h"
 #include "omg/omg_inner_types.h"
+#include "../passes/graph_builder_utils.h"
 
 #define protected public
 #define private public
 #include "graph/build/memory/binary_block_mem_assigner.h"
+#include "graph/build/memory/graph_mem_assigner.h"
 #include "graph/build/memory/hybrid_mem_assigner.h"
 #include "graph/build/memory/max_block_mem_assigner.h"
 #undef protected
@@ -41,7 +43,7 @@ using domi::GetContext;
 
 class UtestMemoryAssignerTest : public testing::Test {
  public:
-  ge::OpDescPtr createOpWithWsSize(const string &name, int64_t wsByte, const string &type = "some") {
+  ge::OpDescPtr CreateOpWithWsSize(const string &name, int64_t wsByte, const string &type = "some") {
     ge::OpDescPtr op_def = make_shared<ge::OpDesc>(name, type);
     auto desc_temp_ptr = make_shared<ge::GeTensorDesc>();
     auto desc_temp = *desc_temp_ptr;
@@ -55,26 +57,46 @@ class UtestMemoryAssignerTest : public testing::Test {
     op_def->SetWorkspaceBytes(workspace_bytes);
     return op_def;
   }
-  void make_graph(ge::ComputeGraphPtr graph) {
-    ge::OpDescPtr op_def_a = createOpWithWsSize("A", 6000);
+  ge::OpDescPtr CreateRefOpWithWsSize(const string &name, int64_t wsByte, const string &type = "some") {
+    ge::OpDescPtr op_def = make_shared<ge::OpDesc>(name, type);
+    auto desc_temp_ptr = make_shared<ge::GeTensorDesc>();
+    auto desc_temp = *desc_temp_ptr;
+
+    TensorUtils::SetSize(desc_temp, 1024);
+    op_def->AddInputDesc(desc_temp);
+
+    auto desc_output_ptr = make_shared<ge::GeTensorDesc>();
+    auto desc_output = *desc_output_ptr;
+    TensorUtils::SetSize(desc_output, 6500);
+    ge::TensorUtils::SetReuseInput(desc_output, true);
+    ge::TensorUtils::SetReuseInputIndex(desc_output, 0);
+    op_def->AddOutputDesc(desc_output);
+
+    std::vector<int64_t> workspace_bytes;
+    workspace_bytes.push_back(wsByte);
+    op_def->SetWorkspaceBytes(workspace_bytes);
+    return op_def;
+  }
+  void MakeGraph(ge::ComputeGraphPtr &graph) {
+    ge::OpDescPtr op_def_a = CreateOpWithWsSize("A", 6000);
     op_def_a->SetStreamId(0);
-    ge::OpDescPtr op_def_b = createOpWithWsSize("B", 120000);
+    ge::OpDescPtr op_def_b = CreateOpWithWsSize("B", 120000);
     op_def_b->SetStreamId(0);
-    ge::OpDescPtr op_def_c = createOpWithWsSize("C", 16000);
+    ge::OpDescPtr op_def_c = CreateOpWithWsSize("C", 16000);
     op_def_c->SetStreamId(1);
-    ge::OpDescPtr op_def_d = createOpWithWsSize("D", 24000);
+    ge::OpDescPtr op_def_d = CreateOpWithWsSize("D", 24000);
     op_def_d->SetStreamId(2);
-    ge::OpDescPtr op_def_e = createOpWithWsSize("E", 24000);
+    ge::OpDescPtr op_def_e = CreateOpWithWsSize("E", 24000);
     op_def_e->SetStreamId(3);
-    ge::OpDescPtr op_def_f = createOpWithWsSize("F", 30000);
+    ge::OpDescPtr op_def_f = CreateOpWithWsSize("F", 30000);
     op_def_f->SetStreamId(2);
-    ge::OpDescPtr op_def_g = createOpWithWsSize("G", 32000);
+    ge::OpDescPtr op_def_g = CreateOpWithWsSize("G", 32000);
     op_def_g->SetStreamId(3);
-    ge::OpDescPtr op_def_h = createOpWithWsSize("H", 48000);
+    ge::OpDescPtr op_def_h = CreateOpWithWsSize("H", 48000);
     op_def_h->SetStreamId(2);
-    ge::OpDescPtr op_def_i = createOpWithWsSize("I", 60000);
+    ge::OpDescPtr op_def_i = CreateOpWithWsSize("I", 60000);
     op_def_i->SetStreamId(2);
-    ge::OpDescPtr op_def_j = createOpWithWsSize("J", 256000, NETOUTPUT);
+    ge::OpDescPtr op_def_j = CreateOpWithWsSize("J", 256000, NETOUTPUT);
     op_def_j->SetStreamId(3);
 
     // add node
@@ -108,24 +130,10 @@ class UtestMemoryAssignerTest : public testing::Test {
     graph->TopologicalSorting();
   }
 
-  void make_reuse_graph(ge::ComputeGraphPtr graph) {
-    ge::OpDescPtr op_def_a = createOpWithWsSize("A", 6000);
-    ge::OpDescPtr op_def_b = createOpWithWsSize("B", 120000);
-
-    ge::OpDescPtr op_def_c = make_shared<ge::OpDesc>("C", "Some");
-    auto desc_input_ptr = make_shared<ge::GeTensorDesc>();
-    auto desc_input = *desc_input_ptr;
-
-    TensorUtils::SetSize(desc_input, 1024);
-    op_def_c->AddInputDesc(desc_input);
-
-    auto desc_output_ptr = make_shared<ge::GeTensorDesc>();
-    auto desc_output = *desc_output_ptr;
-    TensorUtils::SetSize(desc_output, 6500);
-    ge::TensorUtils::SetReuseInput(desc_output, true);
-    ge::TensorUtils::SetReuseInputIndex(desc_output, 0);
-    op_def_c->AddOutputDesc(desc_output);
-
+  void MakeReuseGraph(ge::ComputeGraphPtr graph) {
+    ge::OpDescPtr op_def_a = CreateOpWithWsSize("A", 6000);
+    ge::OpDescPtr op_def_b = CreateOpWithWsSize("B", 120000);
+    ge::OpDescPtr op_def_c = CreateRefOpWithWsSize("C", 120000);
     ge::OpDescPtr op_def_d = make_shared<ge::OpDesc>("D", "CONSTANT");
 
     ge::NodePtr node_a = graph->AddNode(op_def_a);
@@ -141,6 +149,47 @@ class UtestMemoryAssignerTest : public testing::Test {
     graph->TopologicalSorting();
   }
 
+  ComputeGraphPtr MakeCascadeContinuousMemoryGraph() {
+    ge::ut::GraphBuilder builder("graph");
+    auto data = builder.AddNode("data", "Data", 1, 1);
+    auto addn1 = builder.AddNode("addn1", "AddN", 1, 1);
+    auto addn2 = builder.AddNode("addn2", "AddN", 1, 1);
+    auto addn3 = builder.AddNode("addn3", "AddN", 1, 1);
+    auto concat1 = builder.AddNode("concat1", "Concat", 2, 1);
+    auto concat2 = builder.AddNode("concat2", "Concat", 2, 1);
+    auto netoutput = builder.AddNode("netoutput", "NetOutput", 2, 0);
+
+    ge::AttrUtils::SetBool(concat1->GetOpDesc(), ATTR_NAME_NOPADDING_CONTINUOUS_INPUT, true);
+    ge::AttrUtils::SetBool(concat1->GetOpDesc(), ATTR_NAME_CONTINUOUS_INPUT_ALLOC, true);
+    ge::AttrUtils::SetBool(concat1->GetOpDesc(), ATTR_NAME_OUTPUT_REUSE_INPUT, true);
+
+    ge::AttrUtils::SetBool(concat2->GetOpDesc(), ATTR_NAME_NOPADDING_CONTINUOUS_INPUT, true);
+    ge::AttrUtils::SetBool(concat2->GetOpDesc(), ATTR_NAME_CONTINUOUS_INPUT_ALLOC, true);
+    ge::AttrUtils::SetBool(concat2->GetOpDesc(), ATTR_NAME_OUTPUT_REUSE_INPUT, true);
+
+    addn1->GetOpDesc()->SetOutputOffset({100});
+    addn2->GetOpDesc()->SetOutputOffset({200});
+    concat1->GetOpDesc()->SetOutputOffset({100});
+    addn3->GetOpDesc()->SetOutputOffset({700});
+    concat2->GetOpDesc()->SetOutputOffset({500});
+
+    ge::AttrUtils::SetListInt(addn1->GetOpDesc(), ATTR_NAME_OUTPUT_OFFSET_FOR_BUFFER_FUSION, {100});
+    ge::AttrUtils::SetListInt(addn2->GetOpDesc(), ATTR_NAME_OUTPUT_OFFSET_FOR_BUFFER_FUSION, {100});
+    ge::AttrUtils::SetListInt(addn3->GetOpDesc(), ATTR_NAME_OUTPUT_OFFSET_FOR_BUFFER_FUSION, {100});
+    ge::AttrUtils::SetListInt(concat1->GetOpDesc(), ATTR_NAME_OUTPUT_OFFSET_FOR_BUFFER_FUSION, {200});
+    ge::AttrUtils::SetListInt(concat2->GetOpDesc(), ATTR_NAME_OUTPUT_OFFSET_FOR_BUFFER_FUSION, {300});
+
+
+    builder.AddDataEdge(data, 0, addn1, 0);
+    builder.AddDataEdge(data, 0, addn2, 0);
+    builder.AddDataEdge(addn1, 0, concat1, 0);
+    builder.AddDataEdge(addn2, 0, concat1, 1);
+    builder.AddDataEdge(concat1, 0, concat2, 0);
+    builder.AddDataEdge(addn3, 0, concat2, 1);
+
+    return builder.GetGraph();
+  }
+
  protected:
   void SetUp() {}
 
@@ -150,7 +199,7 @@ class UtestMemoryAssignerTest : public testing::Test {
 /*
 TEST_F(UtestMemoryAssignerTest, MemoryBlock_Resize_RealSizeList_is_empty) {
   ge::ComputeGraphPtr graph = make_shared<ge::ComputeGraph>("");
-  ge::OpDescPtr op_def_a = createOpWithWsSize("A", 6000);
+  ge::OpDescPtr op_def_a = CreateOpWithWsSize("A", 6000);
   ge::NodePtr node_a = graph->AddNode(op_def_a);
   MemoryBlock* memory_block = new MemoryBlock(0);
   memory_block->Init(1, kOutput, node_a, 0, 1);
@@ -178,7 +227,7 @@ class MockBlockMemAssigner : public BlockMemAssigner {
 // when check GetMemoryRanges return fail, Assign return fail
 TEST_F(UtestMemoryAssignerTest, Mock_block_mem_assigner_failed) {
   ge::ComputeGraphPtr graph = make_shared<ge::ComputeGraph>("");
-  make_graph(graph);
+  MakeGraph(graph);
   std::map<std::string, std::string> anchor_to_symbol;
   std::map<std::string, std::list<NodeIndexIO>> symbol_to_anchors;
   EXPECT_EQ(GraphUtils::GetRefMapping(graph, symbol_to_anchors, anchor_to_symbol), GRAPH_SUCCESS);
@@ -186,3 +235,17 @@ TEST_F(UtestMemoryAssignerTest, Mock_block_mem_assigner_failed) {
   MockBlockMemAssigner mock_assigner(graph, anchor_to_symbol, symbol_to_anchors);
   EXPECT_EQ(mock_assigner.Assign(), FAILED);
 }
+
+TEST_F(UtestMemoryAssignerTest, graph_memory_assign_continuous_input) {
+  ge::ComputeGraphPtr graph = MakeCascadeContinuousMemoryGraph();
+  auto addn1 = graph->FindNode("addn1");
+  auto addn2 = graph->FindNode("addn2");
+  EXPECT_EQ(addn1->GetOpDesc()->GetOutputOffset()[0], 100);
+  EXPECT_EQ(addn2->GetOpDesc()->GetOutputOffset()[0], 200);
+  GraphMemoryAssigner memoryAssigner(graph);
+  MemoryOffset memory_offset(RT_MEMORY_HBM, 0);
+  memoryAssigner.memory_offset_.emplace(RT_MEMORY_HBM, memory_offset);
+  EXPECT_EQ(memoryAssigner.ReAssignContinuousMemory(false), GRAPH_SUCCESS);
+  EXPECT_EQ(addn1->GetOpDesc()->GetOutputOffset()[0], 500);
+  EXPECT_EQ(addn2->GetOpDesc()->GetOutputOffset()[0], 600);
+}