From c6df234185848cf07e7bf55e99f94e78ad585e73 Mon Sep 17 00:00:00 2001
From: "liyihan2@huawei.com" <liyihan2@huawei.com>
Date: Wed, 14 Apr 2021 11:27:38 +0800
Subject: [PATCH] ge log optimize

---
 ge/common/dump/dump_manager.cc   |  1 +
 ge/common/dump/dump_op.cc        |  4 ++--
 ge/common/helper/model_helper.cc | 14 +++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ge/common/dump/dump_manager.cc b/ge/common/dump/dump_manager.cc
index cf2460d0..51936260 100644
--- a/ge/common/dump/dump_manager.cc
+++ b/ge/common/dump/dump_manager.cc
@@ -86,6 +86,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status DumpManager::SetDumpConf
   dump_path = dump_config.dump_path;
   if (dump_path.empty()) {
     GELOGE(PARAM_INVALID, "[Check][DumpPath]It is empty");
+    REPORT_INNER_ERROR("E19999", "Dump path check is empty");
     return PARAM_INVALID;
   }
 
diff --git a/ge/common/dump/dump_op.cc b/ge/common/dump/dump_op.cc
index 12a1572f..9a75c786 100755
--- a/ge/common/dump/dump_op.cc
+++ b/ge/common/dump/dump_op.cc
@@ -130,8 +130,8 @@ Status DumpOp::DumpInput(aicpu::dump::Task &task) {
     }
     int64_t input_size = 0;
     if (TensorUtils::GetTensorSizeInBytes(input_descs.at(i), input_size) != SUCCESS) {
-      GELOGE(ACL_ERROR_GE_INTERNAL_ERROR, "[Get][TensorSize]Failed, input_size %d", input_size);
-      REPORT_CALL_ERROR("E19999", "Get input size %d failed", input_size);
+      GELOGE(ACL_ERROR_GE_INTERNAL_ERROR, "[Get][TensorSize]Failed, input_size %ld", input_size);
+      REPORT_CALL_ERROR("E19999", "Get input size %ld failed", input_size);
       return ACL_ERROR_GE_INTERNAL_ERROR;
     }
     GELOGD("Get input size in lanch dump op is %ld", input_size);
diff --git a/ge/common/helper/model_helper.cc b/ge/common/helper/model_helper.cc
index 646f8b2c..38dcd8ac 100644
--- a/ge/common/helper/model_helper.cc
+++ b/ge/common/helper/model_helper.cc
@@ -533,14 +533,14 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::LoadModel(c
 
   if (ReleaseLocalModelData() != SUCCESS) {
     GELOGE(ACL_ERROR_GE_EXEC_RELEASE_MODEL_DATA, "[Release][ModelData]Failed.");
-    REPORT_INNER_ERROR("E19999", "Release local model data failed");
+    REPORT_CALL_ERROR("E19999", "Release local model data failed");
     return ACL_ERROR_GE_EXEC_RELEASE_MODEL_DATA;
   }
 
   Status status = ModelParserBase::ParseModelContent(model_data, model_addr_tmp_, model_len_tmp_);
   if (status != SUCCESS) {
     GELOGE(ACL_ERROR_GE_PARAM_INVALID, "[Parse][ModelContent]Failed!");
-    REPORT_INNER_ERROR("E19999", "Parse model content failed");
+    REPORT_CALL_ERROR("E19999", "Parse model content failed");
     return ACL_ERROR_GE_PARAM_INVALID;
   }
 
@@ -549,7 +549,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::LoadModel(c
   status = om_load_helper.Init(model_addr_tmp_, model_len_tmp_);
   if (status != SUCCESS) {
     GELOGE(status, "[Init][OmLoadHelper]Failed");
-    REPORT_INNER_ERROR("E19999", "Om_load_helper init failed");
+    REPORT_CALL_ERROR("E19999", "Om_load_helper init failed");
     model_addr_tmp_ = nullptr;
     return status;
   }
@@ -566,7 +566,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::LoadModel(c
   status = GenerateGeModel(om_load_helper);
   if (status != SUCCESS) {
     GELOGE(status, "[Generate][GEModel]Failed");
-    REPORT_INNER_ERROR("E19999", "Generate GE model failed");
+    REPORT_CALL_ERROR("E19999", "Generate GE model failed");
     return status;
   }
   GELOGD("in ModelHelper::LoadModel, is_assign_model_ is setted to true!");
@@ -591,7 +591,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::LoadRootMod
 
   if (ReleaseLocalModelData() != SUCCESS) {
     GELOGE(INTERNAL_ERROR, "[Release][ModelData]Failed.");
-    REPORT_INNER_ERROR("E19999", "Release local root model data failed");
+    REPORT_CALL_ERROR("E19999", "Release local root model data failed");
     return INTERNAL_ERROR;
   }
 
@@ -618,7 +618,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::LoadRootMod
   }
   if (status != SUCCESS) {
     GELOGE(status, "[Init][OmLoadHelper]Failed");
-    REPORT_INNER_ERROR("E19999", "Om_load_helper init failed");
+    REPORT_CALL_ERROR("E19999", "Om_load_helper init failed");
     model_addr_tmp_ = nullptr;
     return status;
   }
@@ -669,7 +669,7 @@ Status ModelHelper::GenerateGeRootModel(OmFileLoadHelper &om_load_helper) {
   if (!is_unknown_shape_model_) {
     if (GenerateGeModel(om_load_helper) != SUCCESS) {
       GELOGE(FAILED, "[Generate][GERootModel]Failed");
-      REPORT_INNER_ERROR("E19999", "Generate GE root model failed");
+      REPORT_CALL_ERROR("E19999", "Generate GE root model failed");
       return FAILED;
     }
     GE_CHECK_NOTNULL(model_);