p60975123
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix atomicaddrclean bug

This commit is contained in:
gukecai 2020-10-20 17:18:24 +08:00
parent ade47f8968
commit b9b4a86e5f
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mindspore/ccsrc/runtime/device/ascend/ascend_stream_assign.cc
View File

@ -46,6 +46,7 @@ void AscendStreamAssign::AssignStream(const NotNull<KernelGraphPtr> &graph_ptr)
InsertEventForIndependentParallel(graph_ptr);
GetIndependentMaxTarget(graph_ptr);
InsertCtrlForIndependentParallel(graph_ptr);
AdjustAtomicAddrCleanOrder(graph_ptr);
GetNeedActiveStreams(graph_ptr);
CheckResourceAssign(graph_ptr);
@ -320,7 +321,7 @@ void AscendStreamAssign::UpdateAtomicAddrCleanStreamId(const NotNull<KernelGraph
for (size_t i = 0; i < cnode_ptr_list.size(); ++i) {
CNodePtr cur_cnode_ptr = cnode_ptr_list[i];
MS_EXCEPTION_IF_NULL(cur_cnode_ptr);
// update AtomicAddrClean stream same witch the next node
// update AtomicAddrClean stream same with the next node
if (i > 0 && AnfAlgo::GetCNodeName(cnode_ptr_list[i - 1]) == kAtomicAddrCleanOpName) {
AnfAlgo::SetStreamId(AnfAlgo::GetStreamId(cur_cnode_ptr), cnode_ptr_list[i - 1].get());
}
@ -1781,6 +1782,36 @@ void AscendStreamAssign::FindEventRelations(const NotNull<KernelGraphPtr> &graph
MS_LOG(INFO) << "Event_id:" << AnfAlgo::GetNodeAttr<uint32_t>(item.first, kAttrEventId);
}
}
// section12
void AscendStreamAssign::AdjustAtomicAddrCleanOrder(const NotNull<KernelGraphPtr> &graph_ptr) {
// Eg:[atomic, recv, memcpy] should be [recv, atomic, memcpy]
std::vector<CNodePtr> update_orders;
auto &exe_orders = graph_ptr->execution_order();
for (size_t i = 0; i < exe_orders.size(); i++) {
auto cur_cnode = exe_orders.at(i);
if (AnfAlgo::GetCNodeName(cur_cnode) != kAtomicAddrCleanOpName) {
update_orders.emplace_back(cur_cnode);
continue;
}
for (size_t j = i + 1; j < exe_orders.size(); j++) {
auto next_cnode = exe_orders[j];
auto next_cnode_name = AnfAlgo::GetCNodeName(next_cnode);
if (next_cnode_name == kSendOpName || next_cnode_name == kRecvOpName) {
update_orders.emplace_back(next_cnode);
} else {
update_orders.emplace_back(cur_cnode);
// attention:i will be executed later i++;
i = j - 1;
break;
}
}
}
graph_ptr->set_execution_order(update_orders);
}
} // namespace ascend
} // namespace device
} // namespace mindspore

2
mindspore/ccsrc/runtime/device/ascend/ascend_stream_assign.h
View File

@ -149,6 +149,8 @@ class AscendStreamAssign {
void InsertEventHcomDependHcom(const NotNull<KernelGraphPtr> &graph_ptr);
void InsertEventBetweenHcom(const NotNull<KernelGraphPtr> &graph_ptr, const map<uint32_t, vector<size_t>> &hcom_index,
uint32_t first_hcom_stream, uint32_t last_hcom_stream);
void AdjustAtomicAddrCleanOrder(const NotNull<KernelGraphPtr> &graph_ptr);
CNodePtr GetLastInputCnode(const NotNull<KernelGraphPtr> &graph_ptr, const CNodePtr &cur_cnode_ptr);
bool IsSatisfiedHcom(const std::map<uint32_t, vector<size_t>> &hcom_index, const CNodePtr &node_ptr, size_t index);