From a7f366754a757da82eb18264991f60dcc24d0990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=AF=85?= <liyin@xiaomi.com>
Date: Tue, 9 Jan 2018 22:19:10 +0800
Subject: [PATCH] Refactor hexagon engine since several changes break it.

---
 mace/core/mace.cc                             |  26 ++++++++++--------
 .../hexagon/hexagon_control_wrapper.cc        |   2 +-
 .../runtime/hexagon/libhexagon_controller.so  | Bin 17180 -> 16328 bytes
 mace/examples/mace_run.cc                     |   4 +--
 tools/validate_gcn_dsp.sh                     |  20 ++++++++------
 5 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/mace/core/mace.cc b/mace/core/mace.cc
index 770a8067..47d49dfe 100644
--- a/mace/core/mace.cc
+++ b/mace/core/mace.cc
@@ -513,14 +513,22 @@ const OperatorDef &NetDef::op(const int idx) const {
 MaceEngine::MaceEngine(const NetDef *net_def, DeviceType device_type) :
     op_registry_(new OperatorRegistry()), device_type_(device_type),
     ws_(new Workspace()), net_(nullptr), hexagon_controller_(nullptr) {
-
+  ws_->CreateTensor("mace_input_node:0",
+                    GetDeviceAllocator(device_type_),
+                    DT_FLOAT);
+  ws_->CreateTensor("mace_output_node:0",
+                    GetDeviceAllocator(device_type_),
+                    DT_FLOAT);
   if (device_type == HEXAGON) {
     hexagon_controller_.reset(new HexagonControlWrapper());
     hexagon_controller_->Init();
-    hexagon_controller_->SetDebugLevel(0);
+    hexagon_controller_->SetDebugLevel(
+      static_cast<int>(mace::internal::LogMessage::MinVLogLevel()));
     hexagon_controller_->Config();
     hexagon_controller_->SetupGraph(*net_def);
-    hexagon_controller_->PrintGraph();
+    if (VLOG_IS_ON(2)) {
+      hexagon_controller_->PrintGraph();
+    }
   } else {
     ws_->LoadModelTensor(*net_def, device_type);
 
@@ -531,19 +539,15 @@ MaceEngine::MaceEngine(const NetDef *net_def, DeviceType device_type) :
       LOG(FATAL) << "Net init run failed";
     }
     ws_->RemoveUnsedTensor();
-    ws_->CreateTensor("mace_input_node:0",
-                      GetDeviceAllocator(device_type_),
-                      DT_FLOAT);
-    ws_->CreateTensor("mace_output_node:0",
-                      GetDeviceAllocator(device_type_),
-                      DT_FLOAT);
     net_ = std::move(CreateNet(op_registry_, *net_def, ws_.get(), device_type));
   }
 }
 MaceEngine::~MaceEngine() {
   if (device_type_ == HEXAGON) {
-    hexagon_controller_->GetPerfInfo();
-    hexagon_controller_->PrintLog();
+    if (VLOG_IS_ON(2)) {
+      hexagon_controller_->GetPerfInfo();
+      hexagon_controller_->PrintLog();
+    }
     hexagon_controller_->TeardownGraph();
     hexagon_controller_->Finalize();
   }
diff --git a/mace/core/runtime/hexagon/hexagon_control_wrapper.cc b/mace/core/runtime/hexagon/hexagon_control_wrapper.cc
index 89c09c91..032f29d1 100644
--- a/mace/core/runtime/hexagon/hexagon_control_wrapper.cc
+++ b/mace/core/runtime/hexagon/hexagon_control_wrapper.cc
@@ -184,7 +184,7 @@ void HexagonControlWrapper::SetDebugLevel(int level) {
 void HexagonControlWrapper::GetPerfInfo() {
   LOG(INFO) << "Get perf info";
   vector<hexagon_nn_perfinfo> perf_info(MAX_NODE);
-  unsigned int n_items;
+  unsigned int n_items = 0;
   hexagon_nn_get_perfinfo(nn_id_, perf_info.data(), MAX_NODE, &n_items);
 
   std::unordered_map<uint32_t, float> node_id_counters;
diff --git a/mace/core/runtime/hexagon/libhexagon_controller.so b/mace/core/runtime/hexagon/libhexagon_controller.so
index da6f257e152d486dc82e686e2fe6cad2f60bd173..0ff470a75cf04a6f489fdc9e2113c7ea09cb35e5 100755
GIT binary patch
delta 5664
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

literal 17180
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

diff --git a/mace/examples/mace_run.cc b/mace/examples/mace_run.cc
index 825a1964..2d57d7f7 100644
--- a/mace/examples/mace_run.cc
+++ b/mace/examples/mace_run.cc
@@ -124,7 +124,7 @@ int main(int argc, char **argv) {
       Flag("output_shape", &output_shape, "output shape, separated by comma"),
       Flag("input_file", &input_file, "input file name"),
       Flag("output_file", &output_file, "output file name"),
-      Flag("device", &device, "CPU/NEON"),
+      Flag("device", &device, "CPU/NEON/OPENCL/HEXAGON"),
       Flag("round", &round, "round"),
       Flag("malloc_check_cycle", &malloc_check_cycle,
            "malloc debug check cycle, -1 to disable"),
@@ -175,7 +175,7 @@ int main(int argc, char **argv) {
                  input_size * sizeof(float));
     in_file.close();
   } else {
-    LOG(ERROR) << "Open input file failed";
+    LOG(FATAL) << "Open input file failed";
   }
 
   // Init model
diff --git a/tools/validate_gcn_dsp.sh b/tools/validate_gcn_dsp.sh
index d155136b..5bd30df4 100755
--- a/tools/validate_gcn_dsp.sh
+++ b/tools/validate_gcn_dsp.sh
@@ -36,13 +36,17 @@ build_and_run()
     --cpu=armeabi-v7a \
     --copt="-std=c++11" \
     --copt="-D_GLIBCXX_USE_C99_MATH_TR1" \
-    --copt="-Werror=return-type"
+    --copt="-Werror=return-type" \
+    --copt="-DMACE_MODEL_TAG=${MODEL_TAG}" \
+    --define hexagon=true --define production=true || exit -1
 
-  adb shell "mkdir -p ${PHONE_DATA_DIR}"
-  adb push ${MODEL_DIR}/${INPUT_FILE_NAME} ${PHONE_DATA_DIR}
-  adb push bazel-bin/mace/examples/mace_run ${PHONE_DATA_DIR}
+  adb shell "mkdir -p ${PHONE_DATA_DIR}" || exit -1
+  adb push ${MODEL_DIR}/${INPUT_FILE_NAME} ${PHONE_DATA_DIR} || exit -1
+  adb push bazel-bin/mace/examples/mace_run ${PHONE_DATA_DIR} || exit -1
+  adb push mace/core/runtime/hexagon/libhexagon_controller.so ${PHONE_DATA_DIR} || exit -1
 
   adb </dev/null shell \
+    LD_LIBRARY_PATH=${PHONE_DATA_DIR} \
     MACE_CPP_MIN_VLOG_LEVEL=$VLOG_LEVEL \
     MACE_RUN_PARAMETER_PATH=${PHONE_DATA_DIR}/mace_run.config \
     ${PHONE_DATA_DIR}/mace_run \
@@ -50,15 +54,15 @@ build_and_run()
     --output_shape="1,${IMAGE_SIZE},${IMAGE_SIZE},2"\
     --input_file=${PHONE_DATA_DIR}/${INPUT_FILE_NAME} \
     --output_file=${PHONE_DATA_DIR}/${OUTPUT_FILE_NAME} \
-    --device=HEXAGON   \
-    --round=$round
+    --device=HEXAGON \
+    --round=2 || exit -1
 }
 
 echo "Step 1: Generate input data"
 rm -rf ${MODEL_DIR}/${INPUT_FILE_NAME}
 python tools/validate.py --generate_data true \
  --input_file=${MODEL_DIR}/${INPUT_FILE_NAME} \
- --input_shape="${IMAGE_SIZE},${IMAGE_SIZE},3"
+ --input_shape="${IMAGE_SIZE},${IMAGE_SIZE},3" || exit -1
 
 echo "Step 2: Convert tf model to mace model and optimize memory"
 bazel build //mace/python/tools:tf_converter
@@ -73,7 +77,7 @@ bazel-bin/mace/python/tools/tf_converter --input=${TF_MODEL_FILE_PATH} \
                                          --output_type=source \
                                          --template=${MACE_SOURCE_DIR}/mace/python/tools/model.template \
                                          --model_tag=${MODEL_TAG} \
-                                         --obfuscate=True
+                                         --obfuscate=True || exit -1
 
 echo "Step 3: Generate version source"
 rm -rf ${VERSION_SOURCE_PATH}
-- 
GitLab