@@ -20,6 +20,7 @@ | |||||
#include "common/ge/datatype_util.h" | #include "common/ge/datatype_util.h" | ||||
#include "framework/common/debug/ge_log.h" | #include "framework/common/debug/ge_log.h" | ||||
#include "framework/common/util.h" | #include "framework/common/util.h" | ||||
#include "framework/common/types.h" | |||||
#include "graph/anchor.h" | #include "graph/anchor.h" | ||||
#include "graph/ge_tensor.h" | #include "graph/ge_tensor.h" | ||||
#include "graph/op_desc.h" | #include "graph/op_desc.h" | ||||
@@ -55,8 +56,10 @@ void DumpOp::SetLoopAddr(void *global_step, void *loop_per_iter, void *loop_cond | |||||
loop_cond_ = reinterpret_cast<uintptr_t>(loop_cond); | loop_cond_ = reinterpret_cast<uintptr_t>(loop_cond); | ||||
} | } | ||||
void DumpOp::SetDynamicModelInfo(const string &dynamic_model_name, uint32_t dynamic_model_id) { | |||||
void DumpOp::SetDynamicModelInfo(const string &dynamic_model_name, const string &dynamic_om_name, | |||||
uint32_t dynamic_model_id) { | |||||
dynamic_model_name_ = dynamic_model_name; | dynamic_model_name_ = dynamic_model_name; | ||||
dynamic_om_name_ = dynamic_om_name; | |||||
dynamic_model_id_ = dynamic_model_id; | dynamic_model_id_ = dynamic_model_id; | ||||
} | } | ||||
@@ -200,6 +203,28 @@ Status DumpOp::ExecutorDumpOp(aicpu::dump::OpMappingInfo &op_mapping_info) { | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
Status DumpOp::SetDumpModelName(aicpu::dump::OpMappingInfo &op_mapping_info) { | |||||
std::set<std::string> model_list = dump_properties_.GetAllDumpModel(); | |||||
bool not_find_by_omname = model_list.find(dynamic_om_name_) == model_list.end(); | |||||
bool not_find_by_modelname = model_list.find(dynamic_model_name_) == model_list.end(); | |||||
std::string dump_model_name = not_find_by_omname ? dynamic_model_name_ : dynamic_om_name_; | |||||
if (model_list.find(DUMP_ALL_MODEL) == model_list.end()) { | |||||
if (not_find_by_omname && not_find_by_modelname) { | |||||
std::string model_list_str; | |||||
for (auto &model : model_list) { | |||||
model_list_str += "[" + model + "]."; | |||||
} | |||||
GELOGW("Model %s will not be set to dump, dump list: %s", dump_model_name.c_str(), model_list_str.c_str()); | |||||
return FAILED; | |||||
} | |||||
} | |||||
if (!dump_model_name.empty() && dump_properties_.IsDumpOpen()) { | |||||
GELOGD("Dump model name is %s", dump_model_name.c_str()); | |||||
op_mapping_info.set_model_name(dump_model_name); | |||||
} | |||||
return SUCCESS; | |||||
} | |||||
Status DumpOp::LaunchDumpOp() { | Status DumpOp::LaunchDumpOp() { | ||||
GELOGI("Start to launch dump op %s", op_desc_->GetName().c_str()); | GELOGI("Start to launch dump op %s", op_desc_->GetName().c_str()); | ||||
int32_t device_id = 0; | int32_t device_id = 0; | ||||
@@ -209,8 +234,7 @@ Status DumpOp::LaunchDumpOp() { | |||||
return RT_ERROR_TO_GE_STATUS(rt_ret); | return RT_ERROR_TO_GE_STATUS(rt_ret); | ||||
} | } | ||||
if (device_id < 0) { | if (device_id < 0) { | ||||
GELOGE(ACL_ERROR_GE_INTERNAL_ERROR, | |||||
"Check device_id failed, device_id = %d, which should be not less than 0.", | |||||
GELOGE(ACL_ERROR_GE_INTERNAL_ERROR, "Check device_id failed, device_id = %d, which should be not less than 0.", | |||||
device_id); | device_id); | ||||
return ACL_ERROR_GE_INTERNAL_ERROR; | return ACL_ERROR_GE_INTERNAL_ERROR; | ||||
} | } | ||||
@@ -220,11 +244,12 @@ Status DumpOp::LaunchDumpOp() { | |||||
op_mapping_info.set_flag(kAicpuLoadFlag); | op_mapping_info.set_flag(kAicpuLoadFlag); | ||||
op_mapping_info.set_dump_step(dump_properties_.GetDumpStep()); | op_mapping_info.set_dump_step(dump_properties_.GetDumpStep()); | ||||
op_mapping_info.set_model_id(dynamic_model_id_); | op_mapping_info.set_model_id(dynamic_model_id_); | ||||
if (!dynamic_model_name_.empty() && dump_properties_.IsDumpOpen()) { | |||||
op_mapping_info.set_model_name(dynamic_model_name_); | |||||
if (SetDumpModelName(op_mapping_info) != SUCCESS) { | |||||
return SUCCESS; | |||||
} | } | ||||
SetOpMappingLoopAddr(global_step_, loop_per_iter_, loop_cond_, op_mapping_info); | SetOpMappingLoopAddr(global_step_, loop_per_iter_, loop_cond_, op_mapping_info); | ||||
GELOGI("Dump step is %s ,dump path is %s ,in Launch dump op", dump_properties_.GetDumpStep().c_str(), | |||||
GELOGI("Dump step is %s ,dump path is %s in Launch dump op", dump_properties_.GetDumpStep().c_str(), | |||||
dump_path.c_str()); | dump_path.c_str()); | ||||
uint32_t task_id = 0; | uint32_t task_id = 0; | ||||
uint32_t stream_id = 0; | uint32_t stream_id = 0; | ||||
@@ -273,4 +298,4 @@ Status DumpOp::LaunchDumpOp() { | |||||
} | } | ||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
} // namesapce ge | |||||
} // namespace ge |
@@ -34,12 +34,13 @@ class DumpOp { | |||||
vector<uintptr_t> output_addrs, rtStream_t stream); | vector<uintptr_t> output_addrs, rtStream_t stream); | ||||
Status LaunchDumpOp(); | Status LaunchDumpOp(); | ||||
void SetLoopAddr(void *global_step, void *loop_per_iter, void *loop_cond); | void SetLoopAddr(void *global_step, void *loop_per_iter, void *loop_cond); | ||||
void SetDynamicModelInfo(const string &dynamic_model_name, uint32_t dynamic_model_id); | |||||
void SetDynamicModelInfo(const string &dynamic_model_name, const string &dynamic_om_name, uint32_t dynamic_model_id); | |||||
private: | private: | ||||
Status ExecutorDumpOp(aicpu::dump::OpMappingInfo &op_mapping_info); | Status ExecutorDumpOp(aicpu::dump::OpMappingInfo &op_mapping_info); | ||||
Status DumpOutput(aicpu::dump::Task &task); | Status DumpOutput(aicpu::dump::Task &task); | ||||
Status DumpInput(aicpu::dump::Task &task); | Status DumpInput(aicpu::dump::Task &task); | ||||
Status SetDumpModelName(aicpu::dump::OpMappingInfo &op_mapping_info); | |||||
DumpProperties dump_properties_; | DumpProperties dump_properties_; | ||||
OpDescPtr op_desc_; | OpDescPtr op_desc_; | ||||
@@ -54,6 +55,7 @@ class DumpOp { | |||||
uintptr_t loop_cond_; | uintptr_t loop_cond_; | ||||
std::string dynamic_model_name_; | std::string dynamic_model_name_; | ||||
std::string dynamic_om_name_; | |||||
std::uint32_t dynamic_model_id_; | std::uint32_t dynamic_model_id_; | ||||
}; | }; | ||||
} // namespace ge | } // namespace ge | ||||
@@ -35,14 +35,14 @@ const std::string kDumpStatusOpen = "on"; | |||||
const uint32_t kAicoreOverflow = (0x1 << 0); | const uint32_t kAicoreOverflow = (0x1 << 0); | ||||
const uint32_t kAtomicOverflow = (0x1 << 1); | const uint32_t kAtomicOverflow = (0x1 << 1); | ||||
const uint32_t kAllOverflow = (kAicoreOverflow | kAtomicOverflow); | const uint32_t kAllOverflow = (kAicoreOverflow | kAtomicOverflow); | ||||
} | |||||
} // namespace | |||||
namespace ge { | namespace ge { | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY DumpProperties::DumpProperties(const DumpProperties &other) { | FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY DumpProperties::DumpProperties(const DumpProperties &other) { | ||||
CopyFrom(other); | CopyFrom(other); | ||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY DumpProperties &DumpProperties::operator=( | FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY DumpProperties &DumpProperties::operator=( | ||||
const DumpProperties &other) { | |||||
const DumpProperties &other) { | |||||
CopyFrom(other); | CopyFrom(other); | ||||
return *this; | return *this; | ||||
} | } | ||||
@@ -97,7 +97,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::InitByOpti | |||||
// The following is the new dump scenario of the fusion operator | // The following is the new dump scenario of the fusion operator | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::AddPropertyValue( | FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::AddPropertyValue( | ||||
const std::string &model, const std::set<std::string> &layers) { | |||||
const std::string &model, const std::set<std::string> &layers) { | |||||
for (const std::string &layer : layers) { | for (const std::string &layer : layers) { | ||||
GELOGI("This model %s config to dump layer %s", model.c_str(), layer.c_str()); | GELOGI("This model %s config to dump layer %s", model.c_str(), layer.c_str()); | ||||
} | } | ||||
@@ -138,7 +138,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY std::set<std::string> DumpPrope | |||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY std::set<std::string> DumpProperties::GetPropertyValue( | FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY std::set<std::string> DumpProperties::GetPropertyValue( | ||||
const std::string &model) const { | |||||
const std::string &model) const { | |||||
auto iter = model_dump_properties_map_.find(model); | auto iter = model_dump_properties_map_.find(model); | ||||
if (iter != model_dump_properties_map_.end()) { | if (iter != model_dump_properties_map_.end()) { | ||||
return iter->second; | return iter->second; | ||||
@@ -147,8 +147,9 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY std::set<std::string> DumpPrope | |||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool DumpProperties::IsLayerNeedDump( | FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY bool DumpProperties::IsLayerNeedDump( | ||||
const std::string &model, const std::string &om_name, const std::string &op_name) const { | |||||
const std::string &model, const std::string &om_name, const std::string &op_name) const { | |||||
// if dump all | // if dump all | ||||
GELOGD("model name is %s om name is %s op is %s in layer need dump", model.c_str(), om_name.c_str(), op_name.c_str()); | |||||
if (model_dump_properties_map_.find(DUMP_ALL_MODEL) != model_dump_properties_map_.end()) { | if (model_dump_properties_map_.find(DUMP_ALL_MODEL) != model_dump_properties_map_.end()) { | ||||
return true; | return true; | ||||
} | } | ||||
@@ -203,7 +204,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY const std::string &DumpProperti | |||||
} | } | ||||
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::SetDumpOpSwitch( | FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void DumpProperties::SetDumpOpSwitch( | ||||
const std::string &dump_op_switch) { | |||||
const std::string &dump_op_switch) { | |||||
dump_op_switch_ = dump_op_switch; | dump_op_switch_ = dump_op_switch; | ||||
} | } | ||||
@@ -270,4 +271,4 @@ void DumpProperties::SetDumpDebugOptions() { | |||||
GELOGI("ge.exec.enableDumpDebug is false or is not set."); | GELOGI("ge.exec.enableDumpDebug is false or is not set."); | ||||
} | } | ||||
} | } | ||||
} // namespace | |||||
} // namespace ge |
@@ -3067,9 +3067,8 @@ Status DavinciModel::DistributeTask() { | |||||
task_def.kernel_ex().op_index()); | task_def.kernel_ex().op_index()); | ||||
OpDescPtr op = GetOpByIndex(op_index); | OpDescPtr op = GetOpByIndex(op_index); | ||||
GE_CHECK_NOTNULL(op); | GE_CHECK_NOTNULL(op); | ||||
if (reinterpret_cast<void *>(task->GetDumpArgs()) != nullptr) { | if (reinterpret_cast<void *>(task->GetDumpArgs()) != nullptr) { | ||||
bool call_dump = GetDumpProperties().IsLayerNeedDump(name_, om_name_, op->GetName()) && task->CallSaveDumpInfo(); | |||||
bool call_dump = OpNeedDump(op->GetName()) && task->CallSaveDumpInfo(); | |||||
if (call_dump || is_op_debug_reg_) { | if (call_dump || is_op_debug_reg_) { | ||||
SaveDumpTask(task->GetTaskID(), task->GetStreamId(), op, task->GetDumpArgs()); | SaveDumpTask(task->GetTaskID(), task->GetStreamId(), op, task->GetDumpArgs()); | ||||
} | } | ||||
@@ -3089,11 +3088,16 @@ Status DavinciModel::DistributeTask() { | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
void DavinciModel::SetEndGraphId(uint32_t task_id, uint32_t stream_id) { | |||||
bool DavinciModel::ModelNeedDump() { | |||||
auto all_dump_model = GetDumpProperties().GetAllDumpModel(); | auto all_dump_model = GetDumpProperties().GetAllDumpModel(); | ||||
bool findByOmName = all_dump_model.find(om_name_) != all_dump_model.end(); | |||||
bool findByModelName = all_dump_model.find(name_) != all_dump_model.end(); | |||||
if (all_dump_model.find(ge::DUMP_ALL_MODEL) != all_dump_model.end() || findByOmName || findByModelName) { | |||||
bool ret = all_dump_model.find(ge::DUMP_ALL_MODEL) != all_dump_model.end() || | |||||
all_dump_model.find(dump_model_name_) != all_dump_model.end() || | |||||
all_dump_model.find(om_name_) != all_dump_model.end(); | |||||
return ret; | |||||
} | |||||
void DavinciModel::SetEndGraphId(uint32_t task_id, uint32_t stream_id) { | |||||
if (ModelNeedDump()) { | |||||
GELOGI("start save end_graph_info to dumper, task_id is %u, stream_id is %u", task_id, stream_id); | GELOGI("start save end_graph_info to dumper, task_id is %u, stream_id is %u", task_id, stream_id); | ||||
data_dumper_.SaveEndGraphId(task_id, stream_id); | data_dumper_.SaveEndGraphId(task_id, stream_id); | ||||
} | } | ||||
@@ -3893,7 +3897,10 @@ Status DavinciModel::TransAllVarData(ComputeGraphPtr &graph, uint32_t graph_id) | |||||
} | } | ||||
void DavinciModel::SetDataDumperArgs(const ComputeGraphPtr &graph, const map<string, OpDescPtr> &variable_by_name) { | void DavinciModel::SetDataDumperArgs(const ComputeGraphPtr &graph, const map<string, OpDescPtr> &variable_by_name) { | ||||
data_dumper_.SetModelName(name_); | |||||
if(dump_model_name_.empty()) { | |||||
dump_model_name_ = name_; | |||||
} | |||||
data_dumper_.SetModelName(dump_model_name_); | |||||
data_dumper_.SetModelId(model_id_); | data_dumper_.SetModelId(model_id_); | ||||
data_dumper_.SetOmName(om_name_); | data_dumper_.SetOmName(om_name_); | ||||
data_dumper_.SetComputeGraph(graph); | data_dumper_.SetComputeGraph(graph); | ||||
@@ -4082,7 +4089,7 @@ int64_t DavinciModel::GetFixedAddrsSize(string tensor_name) { | |||||
Status DavinciModel::InitL1DataDumperArgs() { | Status DavinciModel::InitL1DataDumperArgs() { | ||||
auto all_dump_model = GetDumpProperties().GetAllDumpModel(); | auto all_dump_model = GetDumpProperties().GetAllDumpModel(); | ||||
bool find_by_om_name = all_dump_model.find(om_name_) != all_dump_model.end(); | bool find_by_om_name = all_dump_model.find(om_name_) != all_dump_model.end(); | ||||
bool find_by_model_name = all_dump_model.find(name_) != all_dump_model.end(); | |||||
bool find_by_model_name = all_dump_model.find(dump_model_name_) != all_dump_model.end(); | |||||
bool dump_l1fusion_op = | bool dump_l1fusion_op = | ||||
(all_dump_model.find(ge::DUMP_ALL_MODEL) != all_dump_model.end()) || find_by_om_name || find_by_model_name; | (all_dump_model.find(ge::DUMP_ALL_MODEL) != all_dump_model.end()) || find_by_om_name || find_by_model_name; | ||||
if (dump_l1fusion_op) { | if (dump_l1fusion_op) { | ||||
@@ -248,7 +248,10 @@ class DavinciModel { | |||||
string Name() const { return name_; } | string Name() const { return name_; } | ||||
// om_name | // om_name | ||||
string OmName() const { return om_name_; } | |||||
const string &OmName() const { return om_name_; } | |||||
// dump_model_name | |||||
const string &DumpModelName() const { return dump_model_name_; } | |||||
// version | // version | ||||
uint32_t Version() const { return version_; } | uint32_t Version() const { return version_; } | ||||
@@ -483,6 +486,12 @@ class DavinciModel { | |||||
data_dumper_.DumpShrink(); | data_dumper_.DumpShrink(); | ||||
} | } | ||||
bool OpNeedDump(const string &op_name) { | |||||
return GetDumpProperties().IsLayerNeedDump(dump_model_name_, om_name_, op_name); | |||||
} | |||||
bool ModelNeedDump(); | |||||
void SetEndGraphId(uint32_t task_id, uint32_t stream_id); | void SetEndGraphId(uint32_t task_id, uint32_t stream_id); | ||||
DavinciModel &operator=(const DavinciModel &model) = delete; | DavinciModel &operator=(const DavinciModel &model) = delete; | ||||
@@ -542,6 +551,7 @@ class DavinciModel { | |||||
// om file name | // om file name | ||||
void SetOmName(const string &om_name) { om_name_ = om_name; } | void SetOmName(const string &om_name) { om_name_ = om_name; } | ||||
void SetDumpModelName(const string &dump_model_name) { dump_model_name_ = dump_model_name; } | |||||
void SetDumpProperties(const DumpProperties &dump_properties) { data_dumper_.SetDumpProperties(dump_properties); } | void SetDumpProperties(const DumpProperties &dump_properties) { data_dumper_.SetDumpProperties(dump_properties); } | ||||
const DumpProperties &GetDumpProperties() const { return data_dumper_.GetDumpProperties(); } | const DumpProperties &GetDumpProperties() const { return data_dumper_.GetDumpProperties(); } | ||||
@@ -888,6 +898,7 @@ class DavinciModel { | |||||
// used for inference data dump | // used for inference data dump | ||||
string om_name_; | string om_name_; | ||||
string dump_model_name_; | |||||
uint32_t version_; | uint32_t version_; | ||||
GeModelPtr ge_model_; // release after DavinciModel::Init | GeModelPtr ge_model_; // release after DavinciModel::Init | ||||
@@ -271,7 +271,7 @@ ge::Status ModelManager::SetDynamicSize(uint32_t model_id, const std::vector<uin | |||||
return SUCCESS; | return SUCCESS; | ||||
} | } | ||||
ge::Status ModelManager::DoLoadHybridModelOnline(uint32_t model_id, const string &model_name, | |||||
ge::Status ModelManager::DoLoadHybridModelOnline(uint32_t model_id, const string &om_name, | |||||
const shared_ptr<ge::GeRootModel> &ge_root_model, | const shared_ptr<ge::GeRootModel> &ge_root_model, | ||||
const shared_ptr<ModelListener> &listener) { | const shared_ptr<ModelListener> &listener) { | ||||
auto hybrid_model = hybrid::HybridDavinciModel::Create(ge_root_model); | auto hybrid_model = hybrid::HybridDavinciModel::Create(ge_root_model); | ||||
@@ -279,7 +279,7 @@ ge::Status ModelManager::DoLoadHybridModelOnline(uint32_t model_id, const string | |||||
hybrid_model->SetListener(listener); | hybrid_model->SetListener(listener); | ||||
hybrid_model->SetModelId(model_id); | hybrid_model->SetModelId(model_id); | ||||
hybrid_model->SetDeviceId(GetContext().DeviceId()); | hybrid_model->SetDeviceId(GetContext().DeviceId()); | ||||
hybrid_model->SetModelName(model_name); | |||||
hybrid_model->SetOmName(om_name); | |||||
GE_CHK_STATUS_RET(hybrid_model->Init(), "Failed to init hybrid model. model_id = %u", model_id); | GE_CHK_STATUS_RET(hybrid_model->Init(), "Failed to init hybrid model. model_id = %u", model_id); | ||||
auto shared_model = std::shared_ptr<hybrid::HybridDavinciModel>(hybrid_model.release()); | auto shared_model = std::shared_ptr<hybrid::HybridDavinciModel>(hybrid_model.release()); | ||||
InsertModel(model_id, shared_model); | InsertModel(model_id, shared_model); | ||||
@@ -309,9 +309,9 @@ Status ModelManager::LoadModelOnline(uint32_t &model_id, const shared_ptr<ge::Ge | |||||
GenModelId(&model_id); | GenModelId(&model_id); | ||||
} | } | ||||
auto name_to_model = ge_root_model->GetSubgraphInstanceNameToModel(); | auto name_to_model = ge_root_model->GetSubgraphInstanceNameToModel(); | ||||
string model_name = ""; | |||||
string om_name; | |||||
if (IsNeedHybridLoad(*ge_root_model)) { | if (IsNeedHybridLoad(*ge_root_model)) { | ||||
return DoLoadHybridModelOnline(model_id, model_name, ge_root_model, listener); | |||||
return DoLoadHybridModelOnline(model_id, om_name, ge_root_model, listener); | |||||
} | } | ||||
mmTimespec timespec = mmGetTickCount(); | mmTimespec timespec = mmGetTickCount(); | ||||
@@ -45,10 +45,7 @@ Status EndGraphTaskInfo::Init(const domi::TaskDef &task_def, DavinciModel *davin | |||||
Status EndGraphTaskInfo::Distribute() { | Status EndGraphTaskInfo::Distribute() { | ||||
GELOGI("EndGraphTaskInfo Distribute Start."); | GELOGI("EndGraphTaskInfo Distribute Start."); | ||||
GE_CHECK_NOTNULL(davinci_model_); | GE_CHECK_NOTNULL(davinci_model_); | ||||
auto all_dump_model = davinci_model_->GetDumpProperties().GetAllDumpModel(); | |||||
if (all_dump_model.find(ge::DUMP_ALL_MODEL) != all_dump_model.end() || | |||||
all_dump_model.find(davinci_model_->Name()) != all_dump_model.end() || | |||||
all_dump_model.find(davinci_model_->OmName()) != all_dump_model.end()) { | |||||
if (davinci_model_->ModelNeedDump()) { | |||||
GELOGI("Start to call rtEndGraphEx"); | GELOGI("Start to call rtEndGraphEx"); | ||||
rtError_t rt_ret = rtEndGraphEx(model_, stream_, kDumpFlag); | rtError_t rt_ret = rtEndGraphEx(model_, stream_, kDumpFlag); | ||||
if (rt_ret != RT_ERROR_NONE) { | if (rt_ret != RT_ERROR_NONE) { | ||||
@@ -238,8 +238,7 @@ Status KernelExTaskInfo::Init(const domi::TaskDef &task_def, DavinciModel *davin | |||||
} | } | ||||
void KernelExTaskInfo::InitDumpTask(void *addr, const OpDescPtr &op_desc) { | void KernelExTaskInfo::InitDumpTask(void *addr, const OpDescPtr &op_desc) { | ||||
if (davinci_model_->GetDumpProperties().IsLayerNeedDump(davinci_model_->Name(), davinci_model_->OmName(), | |||||
op_desc->GetName())) { | |||||
if (davinci_model_->OpNeedDump(op_desc->GetName())) { | |||||
dump_flag_ = RT_KERNEL_DUMPFLAG; | dump_flag_ = RT_KERNEL_DUMPFLAG; | ||||
dump_args_ = addr; | dump_args_ = addr; | ||||
} | } | ||||
@@ -409,10 +409,7 @@ Status KernelTaskInfo::Distribute() { | |||||
call_skt, task_id_, skt_id_, skt_info.last_task_id, stub_func_name_.c_str(), stub_func_, block_dim_, stream_); | call_skt, task_id_, skt_id_, skt_info.last_task_id, stub_func_name_.c_str(), stub_func_, block_dim_, stream_); | ||||
// l1 fusion enable and env flag open (kCloseSkt for skt debug) | // l1 fusion enable and env flag open (kCloseSkt for skt debug) | ||||
bool open_dump = false; | bool open_dump = false; | ||||
auto all_dump_model = davinci_model_->GetDumpProperties().GetAllDumpModel(); | |||||
if (all_dump_model.find(ge::DUMP_ALL_MODEL) != all_dump_model.end() || | |||||
all_dump_model.find(davinci_model_->Name()) != all_dump_model.end() || | |||||
all_dump_model.find(davinci_model_->OmName()) != all_dump_model.end()) { | |||||
if (davinci_model_->ModelNeedDump()) { | |||||
open_dump = true; | open_dump = true; | ||||
} | } | ||||
if (call_skt && (env_flag != kCloseSkt) && !open_dump) { | if (call_skt && (env_flag != kCloseSkt) && !open_dump) { | ||||
@@ -980,8 +977,7 @@ Status KernelTaskInfo::InitAicpuTask(uint32_t op_index, const domi::KernelDef &k | |||||
} | } | ||||
void KernelTaskInfo::InitDumpTask(uint32_t offset) { | void KernelTaskInfo::InitDumpTask(uint32_t offset) { | ||||
if (davinci_model_->GetDumpProperties().IsLayerNeedDump(davinci_model_->Name(), davinci_model_->OmName(), | |||||
op_desc_->GetName())) { | |||||
if (davinci_model_->OpNeedDump(op_desc_->GetName())) { | |||||
if (IsL1FusionOp(op_desc_)) { | if (IsL1FusionOp(op_desc_)) { | ||||
dump_flag_ = RT_FUSION_KERNEL_DUMPFLAG; | dump_flag_ = RT_FUSION_KERNEL_DUMPFLAG; | ||||
} else { | } else { | ||||
@@ -46,10 +46,6 @@ void HybridModelAsyncExecutor::SetModelId(uint32_t model_id) { | |||||
model_id_ = model_id; | model_id_ = model_id; | ||||
} | } | ||||
void HybridModelAsyncExecutor::SetModelName(const string &model_name) { | |||||
om_name_ = model_name; | |||||
} | |||||
Status HybridModelAsyncExecutor::EnqueueData(const shared_ptr<InputDataWrapper> &data) { | Status HybridModelAsyncExecutor::EnqueueData(const shared_ptr<InputDataWrapper> &data) { | ||||
GE_CHK_STATUS_EXEC(data_inputer_->Push(data), return domi::DATA_QUEUE_ISFULL, | GE_CHK_STATUS_EXEC(data_inputer_->Push(data), return domi::DATA_QUEUE_ISFULL, | ||||
"Data queue is full, please call again later, model_id %u ", model_id_); | "Data queue is full, please call again later, model_id %u ", model_id_); | ||||
@@ -51,8 +51,6 @@ class HybridModelAsyncExecutor { | |||||
void SetModelId(uint32_t model_id); | void SetModelId(uint32_t model_id); | ||||
void SetModelName(const string &model_name); | |||||
Status Stop(); | Status Stop(); | ||||
Status EnqueueData(const std::shared_ptr<InputDataWrapper> &data); | Status EnqueueData(const std::shared_ptr<InputDataWrapper> &data); | ||||
@@ -97,7 +95,6 @@ class HybridModelAsyncExecutor { | |||||
std::map<uint32_t, GeTensorDescPtr> input_tensor_desc_; | std::map<uint32_t, GeTensorDescPtr> input_tensor_desc_; | ||||
std::vector<bool> is_input_dynamic_; | std::vector<bool> is_input_dynamic_; | ||||
std::shared_ptr<ModelListener> listener_; | std::shared_ptr<ModelListener> listener_; | ||||
string om_name_; | |||||
DataDumper data_dumper_; | DataDumper data_dumper_; | ||||
bool is_op_debug_reg_ = false; | bool is_op_debug_reg_ = false; | ||||
OpdebugRegister op_debug_register_; | OpdebugRegister op_debug_register_; | ||||
@@ -206,36 +206,38 @@ Status NodeDoneCallback::DumpDynamicNode() { | |||||
return PARAM_INVALID; | return PARAM_INVALID; | ||||
} | } | ||||
auto op_desc = node->GetOpDesc(); | auto op_desc = node->GetOpDesc(); | ||||
GE_CHECK_NOTNULL(graph_context_); | |||||
const HybridModel *model = graph_context_->model; | |||||
GE_CHECK_NOTNULL(model); | |||||
std::string dynamic_model_name = model->GetModelName(); | |||||
std::string dynamic_om_name = model->GetOmName(); | |||||
uint32_t model_id = model->GetModelId(); | |||||
if(!context_->GetDumpProperties().IsLayerNeedDump(dynamic_model_name, dynamic_om_name, op_desc->GetName())) { | |||||
GELOGI("[%s] is not in dump list, no need dump", op_desc->GetName().c_str()); | |||||
return SUCCESS; | |||||
} | |||||
dump_op_.SetDynamicModelInfo(dynamic_model_name, dynamic_om_name, model_id); | |||||
auto stream = context_->GetStream(); | auto stream = context_->GetStream(); | ||||
vector<uintptr_t> input_addrs; | vector<uintptr_t> input_addrs; | ||||
vector<uintptr_t> output_addrs; | vector<uintptr_t> output_addrs; | ||||
for (int i = 0; i < context_->NumInputs(); i++) { | for (int i = 0; i < context_->NumInputs(); i++) { | ||||
auto tensor_value = context_->GetInput(i); | auto tensor_value = context_->GetInput(i); | ||||
GE_CHK_BOOL_RET_STATUS(tensor_value != nullptr, PARAM_INVALID, "Tensor value is nullptr"); | GE_CHK_BOOL_RET_STATUS(tensor_value != nullptr, PARAM_INVALID, "Tensor value is nullptr"); | ||||
uint64_t input_addr = reinterpret_cast<uintptr_t>(tensor_value->GetData()); | |||||
uintptr_t input_addr = reinterpret_cast<uintptr_t>(tensor_value->GetData()); | |||||
input_addrs.emplace_back(input_addr); | input_addrs.emplace_back(input_addr); | ||||
} | } | ||||
for (int j = 0; j < context_->NumOutputs(); j++) { | for (int j = 0; j < context_->NumOutputs(); j++) { | ||||
auto tensor_value = context_->GetOutput(j); | auto tensor_value = context_->GetOutput(j); | ||||
GE_CHK_BOOL_RET_STATUS(tensor_value != nullptr, PARAM_INVALID, "Tensor value is nullptr"); | GE_CHK_BOOL_RET_STATUS(tensor_value != nullptr, PARAM_INVALID, "Tensor value is nullptr"); | ||||
uint64_t output_addr = reinterpret_cast<uintptr_t>(tensor_value->GetData()); | |||||
uintptr_t output_addr = reinterpret_cast<uintptr_t>(tensor_value->GetData()); | |||||
output_addrs.emplace_back(output_addr); | output_addrs.emplace_back(output_addr); | ||||
} | } | ||||
dump_op_.SetDumpInfo(context_->GetDumpProperties(), op_desc, input_addrs, output_addrs, stream); | |||||
GE_CHECK_NOTNULL(graph_context_); | |||||
const HybridModel *model = graph_context_->model; | |||||
GE_CHECK_NOTNULL(model); | |||||
std::string dynamic_model_name = model->GetModelName(); | |||||
uint32_t model_id = model->GetModelId(); | |||||
dump_op_.SetDynamicModelInfo(dynamic_model_name, model_id); | |||||
void *loop_per_iter = nullptr; | |||||
TensorValue *varible_loop_per_iter = context_->GetVariable(NODE_NAME_FLOWCTRL_LOOP_PER_ITER); | |||||
if (varible_loop_per_iter != nullptr) { | |||||
loop_per_iter = const_cast<void *>(varible_loop_per_iter->GetData()); | |||||
} | |||||
void *loop_per_iter = nullptr; | |||||
TensorValue *varible_loop_per_iter = context_->GetVariable(NODE_NAME_FLOWCTRL_LOOP_PER_ITER); | |||||
if (varible_loop_per_iter != nullptr) { | |||||
loop_per_iter = const_cast<void *>(varible_loop_per_iter->GetData()); | |||||
} | |||||
void *loop_cond = nullptr; | void *loop_cond = nullptr; | ||||
TensorValue *varible_loop_cond = context_->GetVariable(NODE_NAME_FLOWCTRL_LOOP_COND); | TensorValue *varible_loop_cond = context_->GetVariable(NODE_NAME_FLOWCTRL_LOOP_COND); | ||||
@@ -76,9 +76,8 @@ class HybridDavinciModel::Impl { | |||||
executor_.SetDeviceId(device_id); | executor_.SetDeviceId(device_id); | ||||
} | } | ||||
void SetModelName(const string &model_name) { | |||||
model_.SetModelName(model_name); | |||||
executor_.SetModelName(model_name); | |||||
void SetOmName(const string &model_name) { | |||||
model_.SetOmName(model_name); | |||||
} | } | ||||
uint64_t GetSessionId() { | uint64_t GetSessionId() { | ||||
@@ -181,9 +180,9 @@ void HybridDavinciModel::SetDeviceId(uint32_t device_id) { | |||||
} | } | ||||
} | } | ||||
void HybridDavinciModel::SetModelName(const string &model_name) { | |||||
void HybridDavinciModel::SetOmName(const string &om_name) { | |||||
if (impl_ != nullptr) { | if (impl_ != nullptr) { | ||||
impl_->SetModelName(model_name); | |||||
impl_->SetOmName(om_name); | |||||
} | } | ||||
} | } | ||||
@@ -57,7 +57,7 @@ class HybridDavinciModel { | |||||
void SetDeviceId(uint32_t device_id); | void SetDeviceId(uint32_t device_id); | ||||
void SetModelName(const string &model_name); | |||||
void SetOmName(const string &om_name); | |||||
uint64_t GetSessionId(); | uint64_t GetSessionId(); | ||||
@@ -61,7 +61,7 @@ void HybridDavinciModel::SetModelId(uint32_t model_id) { | |||||
void HybridDavinciModel::SetDeviceId(uint32_t device_id) { | void HybridDavinciModel::SetDeviceId(uint32_t device_id) { | ||||
} | } | ||||
void HybridDavinciModel::SetModelName(const string &model_name) { | |||||
void HybridDavinciModel::SetOmName(const string &om_name) { | |||||
} | } | ||||
uint64_t HybridDavinciModel::GetSessionId() { | uint64_t HybridDavinciModel::GetSessionId() { | ||||
@@ -69,8 +69,8 @@ class HybridModel { | |||||
model_id_ = model_id; | model_id_ = model_id; | ||||
} | } | ||||
void SetModelName(const string &model_name) { | |||||
om_name_ = model_name; | |||||
void SetOmName(const string &om_name) { | |||||
om_name_ = om_name; | |||||
} | } | ||||
const std::string &GetOmName() const { | const std::string &GetOmName() const { | ||||
@@ -171,6 +171,7 @@ Status KnownNodeExecutor::LoadTask(const HybridModel &model, const NodePtr &node | |||||
// set known node flag as true | // set known node flag as true | ||||
davinci_model->SetKnownNode(true); | davinci_model->SetKnownNode(true); | ||||
davinci_model->SetId(model.GetModelId()); | davinci_model->SetId(model.GetModelId()); | ||||
davinci_model->SetDumpModelName(model.GetModelName()); | |||||
davinci_model->SetOmName(model.GetOmName()); | davinci_model->SetOmName(model.GetOmName()); | ||||
// set model id as root node's node id | // set model id as root node's node id | ||||
davinci_model->SetSubModelId(node->GetOpDesc()->GetId()); | davinci_model->SetSubModelId(node->GetOpDesc()->GetId()); | ||||
@@ -166,6 +166,7 @@ set(COMMON_SRC_FILES | |||||
"${GE_CODE_DIR}/ge/common/helper/model_helper.cc" | "${GE_CODE_DIR}/ge/common/helper/model_helper.cc" | ||||
"${GE_CODE_DIR}/ge/common/dump/dump_manager.cc" | "${GE_CODE_DIR}/ge/common/dump/dump_manager.cc" | ||||
"${GE_CODE_DIR}/ge/common/dump/opdebug_register.cc" | "${GE_CODE_DIR}/ge/common/dump/opdebug_register.cc" | ||||
"${GE_CODE_DIR}/ge/common/dump/dump_op.cc" | |||||
"${GE_CODE_DIR}/ge/common/helper/om_file_helper.cc" | "${GE_CODE_DIR}/ge/common/helper/om_file_helper.cc" | ||||
"${GE_CODE_DIR}/ge/model/ge_root_model.cc" | "${GE_CODE_DIR}/ge/model/ge_root_model.cc" | ||||
"${GE_CODE_DIR}/ge/common/model_parser/model_parser.cc" | "${GE_CODE_DIR}/ge/common/model_parser/model_parser.cc" | ||||
@@ -742,6 +743,7 @@ set(MULTI_PARTS_TEST_FILES | |||||
"graph/transop_util_unittest.cc" | "graph/transop_util_unittest.cc" | ||||
"common/datatype_transfer_unittest.cc" | "common/datatype_transfer_unittest.cc" | ||||
"common/dump_manager_unittest.cc" | "common/dump_manager_unittest.cc" | ||||
"common/dump_op_unittest.cc" | |||||
"common/opdebug_register_unittest.cc" | "common/opdebug_register_unittest.cc" | ||||
"common/format_transfer_unittest.cc" | "common/format_transfer_unittest.cc" | ||||
"common/format_transfer_transpose_unittest.cc" | "common/format_transfer_transpose_unittest.cc" | ||||
@@ -0,0 +1,61 @@ | |||||
/** | |||||
* 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 <gtest/gtest.h> | |||||
#define protected public | |||||
#define private public | |||||
#include "common/dump/dump_op.h" | |||||
#include "common/debug/log.h" | |||||
#include "common/ge_inner_error_codes.h" | |||||
#include "common/dump/dump_properties.h" | |||||
#undef private | |||||
#undef protected | |||||
namespace ge { | |||||
class UTEST_dump_op : public testing::Test { | |||||
protected: | |||||
void SetUp() {} | |||||
void TearDown() {} | |||||
}; | |||||
TEST_F(UTEST_dump_op, launch_dump_op_success) { | |||||
DumpOp dump_op; | |||||
DumpProperties dump_properties; | |||||
OpDescPtr op_desc = std::make_shared<OpDesc>("GatherV2", "GatherV2"); | |||||
std::set<std::string> temp; | |||||
dump_properties.model_dump_properties_map_.emplace("model1", temp); | |||||
dump_properties.enable_dump_ = "1"; | |||||
dump_op.SetDynamicModelInfo("model1", "model2", 1); | |||||
dump_op.SetDumpInfo(dump_properties, op_desc, {}, {}, nullptr); | |||||
auto ret = dump_op.LaunchDumpOp(); | |||||
EXPECT_EQ(ret, ge::SUCCESS); | |||||
} | |||||
TEST_F(UTEST_dump_op, launch_dump_op_success_2) { | |||||
DumpOp dump_op; | |||||
DumpProperties dump_properties; | |||||
OpDescPtr op_desc = std::make_shared<OpDesc>("GatherV2", "GatherV2"); | |||||
std::set<std::string> temp; | |||||
dump_properties.model_dump_properties_map_.emplace("model1", temp); | |||||
dump_properties.enable_dump_ = "1"; | |||||
dump_op.SetDynamicModelInfo("modle2", "model2", 1); | |||||
dump_op.SetDumpInfo(dump_properties, op_desc, {}, {}, nullptr); | |||||
auto ret = dump_op.LaunchDumpOp(); | |||||
EXPECT_EQ(ret, ge::SUCCESS); | |||||
} | |||||
} // namespace ge |