m53297601
/
graphengine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

!670 Delete useless batch label for zero copy.

Browse Source 
From: @zhangxiaokun9
Reviewed-by: @xchu42,@ji_chen
Signed-off-by: @ji_chen
pull/670/MERGE
mindspore-ci-bot 4 years ago committed by Gitee
parent da12574c6e 51ba30ba5e
commit 5514fb6125
6 changed files with 18 additions and 304 deletions
Show Stats Download Patch File Download Diff File

207
ge/graph/load/new_model_manager/davinci_model.cc
View File

File diff suppressed because it is too large Load Diff

46
ge/graph/load/new_model_manager/davinci_model.h
Unescape View File

@ -537,15 +537,6 @@ class DavinciModel {
struct timeInfo time_info_;
int32_t dataInputTid;
///
/// @ingroup ge
/// @brief Save Batch label Info.
/// @param [in] const OpDescPtr &op_desc
/// @param [in] uintptr_t addr: address value in args block.
/// @return None.
///
void SetBatchLabelAddr(const OpDescPtr &op_desc, uintptr_t addr);
///
/// @ingroup ge
/// @brief Copy Check input size and model op size.
@ -657,14 +648,6 @@ class DavinciModel {
///
void AdjustDataOpList(const map<uint32_t, OpDescPtr> &data_by_index);
///
/// @ingroup ge
/// @brief input zero copy node Initialize.
/// @param [in] NodePtr: Data Op.
/// @return Status
///
Status InitInputZeroCopyNodes(const NodePtr &node);
///
/// @ingroup ge
/// @brief NetOutput Op Initialize.
@ -673,30 +656,6 @@ class DavinciModel {
///
Status InitNetOutput(const NodePtr &node);
///
/// @ingroup ge
/// @brief output zero copy node Initialize.
/// @param [in] NodePtr: Data Op.
/// @return Status
///
Status InitOutputZeroCopyNodes(const NodePtr &node);
///
/// @ingroup ge
/// @brief input zero copy node Initialize for Case.
/// @param [in] NodePtr: Data Op.
/// @return Status
///
Status InitInputBatchLabel(const NodePtr &node);
///
/// @ingroup ge
/// @brief output zero copy node Initialize for Case.
/// @param [in] NodePtr: netoutput Op.
/// @return Status
///
Status InitOutputBatchLabel(const NodePtr &node);
///
/// @ingroup ge
/// @brief Constant Op Init.
@ -922,11 +881,6 @@ class DavinciModel {
std::vector<ZeroCopyTask> zero_copy_tasks_; // Task used Data or NetOutput addr.
std::set<const void *> copy_only_addrs_; // Address need copy to original place.
// {op_id, batch_label}
std::map<int64_t, std::string> zero_copy_op_id_batch_label_;
// {batch_label, addrs}
std::map<std::string, std::set<uintptr_t>> zero_copy_batch_label_addrs_;
std::vector<TaskInfoPtr> task_list_;
// rt_moodel_handle
rtModel_t rt_model_handle_;

10
ge/graph/load/new_model_manager/zero_copy_offset.cc
Unescape View File

@ -183,22 +183,18 @@ void ZeroCopyOffset::SetOutputOutsideAddrs(const int64_t &input_offset, const bo
addr_count_ = out_count;
}
bool ZeroCopyOffset::SetOutsideAddrsValue(ZeroCopyTask &zero_copy_task, void *outside_addr, void *args, size_t offset) {
void ZeroCopyOffset::SetOutsideAddrsValue(ZeroCopyTask &zero_copy_task, void *outside_addr, void *args, size_t offset) {
const auto addr_val = reinterpret_cast<uintptr_t>(outside_addr);
bool set_batch_label_flag = false;
for (uint32_t out_count = 0; out_count < GetAddrCount(); ++out_count) {
auto &addrs_mapping_list = GetOutsideAddrs();
auto args_addrs = addrs_mapping_list[out_count].find(outside_addr);
if (args_addrs != addrs_mapping_list[out_count].end()) {
auto args_addrs = outside_addrs_[out_count].find(outside_addr);
if (args_addrs != outside_addrs_[out_count].end()) {
GE_CHK_STATUS(zero_copy_task.SetTaskArgsOffset(addr_val, offset), "Input args invalid.");
void *args_val = static_cast<uint8_t *>(args) + offset;
args_addrs->second.push_back(args_val);
GELOGD("[ZCPY] set copy input: virtual_addr: 0x%lx, task_addr: %p, args: %p, offset: %zu.", addr_val, args_val,
args, offset);
set_batch_label_flag = true;
}
}
return set_batch_label_flag;
}
} // namespace ge

2
ge/graph/load/new_model_manager/zero_copy_offset.h
Unescape View File

@ -51,7 +51,7 @@ class ZeroCopyOffset {
const OpDescPtr &op_desc, const size_t &idx, bool &fusion_flag);
void SetOutputOutsideAddrs(const int64_t &input_offset, const bool &fusion_flag, void *addr,
std::vector<void *> &tensor_addrs);
bool SetOutsideAddrsValue(ZeroCopyTask &zero_copy_task, void *outside_addr, void *args, size_t offset);
void SetOutsideAddrsValue(ZeroCopyTask &zero_copy_task, void *outside_addr, void *args, size_t offset);
// basic_addr of l2-fusion
void *GetBasicAddr() const { return basic_addr_; }

49
ge/graph/load/new_model_manager/zero_copy_task.cc
Unescape View File

@ -66,68 +66,23 @@ void ZeroCopyTask::SetOriginalArgs(const void *info, size_t size) {
const uint8_t *data = static_cast<const uint8_t *>(info);
args_info_.assign(data, data + size);
GELOGI("[ZCPY] %s set info from virtual_addr: %p, args_addr: %p, args size: %zu, info size: %zu", name_.c_str(), info,
GELOGI("[ZCPY] %s set original args info: %p, args_addr: %p, args size: %zu, info size: %zu", name_.c_str(), info,
args_addr_, args_size_, size);
}
/**
* @ingroup ge
* @brief Check is dynamic batch node.
* @param [in] addr: virtual address value from Op.
* @param [in] data: data buffer from user.
* @param [in] batch_addrs: dynamic batch addr info.
* @param [in] batch_label: batch label.
* @return: true / false
*/
bool ZeroCopyTask::CheckDynamicBatch(const map<string, set<uintptr_t>> &batch_addrs, const string &batch_label,
uintptr_t addr) {
// Used for dynamic batch / resolution scene
set<uintptr_t> dynamic_input_addrs;
auto dynamic_input_iter = batch_addrs.find(batch_label);
if (dynamic_input_iter != batch_addrs.end()) {
dynamic_input_addrs = dynamic_input_iter->second;
}
set<uintptr_t> fix_input_addrs;
auto fix_input_iter = batch_addrs.find(kDefaultBatchLable);
if (fix_input_iter != batch_addrs.end()) {
fix_input_addrs = fix_input_iter->second;
}
if (fix_input_addrs.empty()) {
if (!dynamic_input_addrs.empty() && dynamic_input_addrs.find(addr) == dynamic_input_addrs.end()) {
return false;
}
} else {
if (!dynamic_input_addrs.empty() && dynamic_input_addrs.find(addr) == dynamic_input_addrs.end() &&
fix_input_addrs.find(addr) == fix_input_addrs.end()) {
return false;
}
}
return true;
}
/**
* @ingroup ge
* @brief Set user data addr to Task param.
* @param [in] addr: virtual address value from Op.
* @param [in] buffer_addr: real_data_buffer_addr from user.
* @param [in] batch_addrs: dynamic batch addr info.
* @param [in] batch_label: batch label.
* @return: void
*/
Status ZeroCopyTask::UpdateTaskParam(uintptr_t addr, void *buffer_addr, const map<string, set<uintptr_t>> &batch_addrs,
const string &batch_label) {
Status ZeroCopyTask::UpdateTaskParam(uintptr_t addr, void *buffer_addr) {
auto iter = task_addr_offset_.find(addr);
if (iter != task_addr_offset_.end()) {
auto &cur_pair = *iter;
uint8_t *args_info = args_info_.data();
for (auto offset : cur_pair.second) {
if (!CheckDynamicBatch(batch_addrs, batch_label, reinterpret_cast<uintptr_t>(args_addr_ + offset))) {
continue;
}
auto dst_addr = static_cast<uint8_t *>(buffer_addr);
GELOGI("[ZCPY] %s update task, args_addr: %p, size: %zu, offset: %zu, virtual_addr: 0x%lx, user_data_addr: %p",
name_.c_str(), args_addr_, args_size_, offset, addr, buffer_addr);

8
ge/graph/load/new_model_manager/zero_copy_task.h
Unescape View File

@ -67,12 +67,9 @@ class ZeroCopyTask {
* @brief Set user data addr to Task param.
* @param [in] addr: virtual address value from Op.
* @param [in] buffer_addr: data buffer_addr from user.
* @param [in] batch_addrs: dynamic batch addr info.
* @param [in] batch_label: batch label.
* @return: 0 SUCCESS / others FAILED
*/
ge::Status UpdateTaskParam(uintptr_t addr, void *buffer_addr, const map<string, set<uintptr_t>> &batch_addrs,
const string &batch_label);
ge::Status UpdateTaskParam(uintptr_t addr, void *buffer_addr);
/**
* @ingroup ge
@ -91,9 +88,6 @@ class ZeroCopyTask {
return batch_label_;
}
protected:
bool CheckDynamicBatch(const map<string, set<uintptr_t>> &batch_addrs, const string &batch_label, uintptr_t addr);
private:
const string name_;

Write Preview
Loading…
Cancel
Save