From c12c02ff63bb21ccc1ee0b2e693df3d09d48231f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=AF=85?= <liyin@xiaomi.com>
Date: Wed, 8 Aug 2018 17:01:29 +0800
Subject: [PATCH] Make hexagon runtime compatible to nnlib-old

---
 .../hexagon/hexagon_control_wrapper.cc        |   8 +
 third_party/nnlib/hexagon_nn.h                | 195 ++++++++++++++++++
 .../nnlib/libhexagon_controller_old.so        | Bin 0 -> 15564 bytes
 third_party/nnlib/ops.h                       | 143 +++++++++++++
 4 files changed, 346 insertions(+)
 create mode 100755 third_party/nnlib/libhexagon_controller_old.so

diff --git a/mace/core/runtime/hexagon/hexagon_control_wrapper.cc b/mace/core/runtime/hexagon/hexagon_control_wrapper.cc
index 62312744..4e435ebf 100644
--- a/mace/core/runtime/hexagon/hexagon_control_wrapper.cc
+++ b/mace/core/runtime/hexagon/hexagon_control_wrapper.cc
@@ -59,7 +59,11 @@ bool HexagonControlWrapper::Config() {
 
 bool HexagonControlWrapper::Init() {
   LOG(INFO) << "Hexagon init";
+#ifdef MACE_USE_NNLIB_OLD
+  nn_id_ = hexagon_nn_init();
+#else
   MACE_CHECK(hexagon_nn_init(&nn_id_) == 0, "hexagon_nn_init failed");
+#endif
   ResetPerfInfo();
   return true;
 }
@@ -141,6 +145,9 @@ bool HexagonControlWrapper::SetupGraph(const NetDef &net_def,
       }
       outputs.resize(op.output_shape().size());
       for (int i = 0; i < op.output_shape().size(); ++i) {
+#ifdef MACE_USE_NNLIB_OLD
+        outputs[i].max_size = op.out_max_byte_size()[i];
+#else
         outputs[i].rank = op.output_shape()[i].dims().size();
         for (size_t j = 0; j < outputs[i].rank; ++j) {
           outputs[i].max_sizes[j] = op.output_shape()[i].dims()[j];
@@ -154,6 +161,7 @@ bool HexagonControlWrapper::SetupGraph(const NetDef &net_def,
             static_cast<DataType>(op.output_type()[i]));
         outputs[i].zero_offset = 0;
         outputs[i].stepsize = 0;
+#endif
       }
       cached_inputs.push_back(inputs);
       cached_outputs.push_back(outputs);
diff --git a/third_party/nnlib/hexagon_nn.h b/third_party/nnlib/hexagon_nn.h
index b7485c93..84933ddb 100644
--- a/third_party/nnlib/hexagon_nn.h
+++ b/third_party/nnlib/hexagon_nn.h
@@ -35,6 +35,198 @@
 
 #ifndef THIRD_PARTY_NNLIB_HEXAGON_NN_H_
 #define THIRD_PARTY_NNLIB_HEXAGON_NN_H_
+
+#ifdef MACE_USE_NNLIB_OLD
+
+#ifndef __QAIC_HEADER
+#define __QAIC_HEADER(ff) ff
+#endif  // __QAIC_HEADER
+
+#ifndef __QAIC_HEADER_EXPORT
+#define __QAIC_HEADER_EXPORT
+#endif  // __QAIC_HEADER_EXPORT
+
+#ifndef __QAIC_HEADER_ATTRIBUTE
+#define __QAIC_HEADER_ATTRIBUTE
+#endif  // __QAIC_HEADER_ATTRIBUTE
+
+#ifndef __QAIC_IMPL
+#define __QAIC_IMPL(ff) ff
+#endif  // __QAIC_IMPL
+
+#ifndef __QAIC_IMPL_EXPORT
+#define __QAIC_IMPL_EXPORT
+#endif  // __QAIC_IMPL_EXPORT
+
+#ifndef __QAIC_IMPL_ATTRIBUTE
+#define __QAIC_IMPL_ATTRIBUTE
+#endif  // __QAIC_IMPL_ATTRIBUTE
+#ifdef __cplusplus
+extern "C" {
+#endif
+#if !defined(__QAIC_STRING1_OBJECT_DEFINED__) && !defined(__STRING1_OBJECT__)
+#define __QAIC_STRING1_OBJECT_DEFINED__
+#define __STRING1_OBJECT__
+typedef struct _cstring1_s {
+  char *data;
+  int dataLen;
+} _cstring1_t;
+
+#endif /* __QAIC_STRING1_OBJECT_DEFINED__ */
+typedef struct hexagon_nn_input hexagon_nn_input;
+struct hexagon_nn_input {
+  unsigned int src_id;
+  unsigned int output_idx;
+};
+typedef struct hexagon_nn_output hexagon_nn_output;
+struct hexagon_nn_output {
+  unsigned int max_size;
+  unsigned int unused;
+};
+typedef struct hexagon_nn_perfinfo hexagon_nn_perfinfo;
+struct hexagon_nn_perfinfo {
+  unsigned int node_id;
+  unsigned int node_type;
+  unsigned int executions;
+  unsigned int unused;
+  unsigned int counter_lo;
+  unsigned int counter_hi;
+};
+typedef int hexagon_nn_nn_id;
+enum hexagon_nn_padding_type {
+  NN_PAD_NA,
+  NN_PAD_SAME,
+  NN_PAD_VALID,
+  NN_PAD_MIRROR_REFLECT,
+  NN_PAD_MIRROR_SYMMETRIC,
+  NN_PAD_SAME_CAFFE,
+  _32BIT_PLACEHOLDER_hexagon_nn_padding_type = 0x7fffffff
+};
+typedef enum hexagon_nn_padding_type hexagon_nn_padding_type;
+typedef struct hexagon_nn_tensordef hexagon_nn_tensordef;
+struct hexagon_nn_tensordef {
+  unsigned int batches;
+  unsigned int height;
+  unsigned int width;
+  unsigned int depth;
+  unsigned char *data;
+  int dataLen;
+  unsigned int data_valid_len;
+  unsigned int unused;
+};
+typedef struct hexagon_nn_op_node hexagon_nn_op_node;
+struct hexagon_nn_op_node {
+  unsigned int node_id;
+  unsigned int operation;
+  hexagon_nn_padding_type padding;
+  hexagon_nn_input *inputs;
+  int inputsLen;
+  hexagon_nn_output *outputs;
+  int outputsLen;
+};
+typedef struct hexagon_nn_const_node hexagon_nn_const_node;
+struct hexagon_nn_const_node {
+  unsigned int node_id;
+  hexagon_nn_tensordef tensor;
+};
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_config)(void)
+    __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_init)(void)
+    __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_set_debug_level)(
+    hexagon_nn_nn_id id, int level) __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_set_graph_mode)(
+    hexagon_nn_nn_id id, int mode) __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_snpprint)(hexagon_nn_nn_id id,
+                                                            unsigned char *buf,
+                                                            int bufLen)
+    __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_getlog)(hexagon_nn_nn_id id,
+                                                          unsigned char *buf,
+                                                          int bufLen)
+    __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_append_node)(
+    hexagon_nn_nn_id id,
+    unsigned int node_id,
+    unsigned int operation,
+    hexagon_nn_padding_type padding,
+    const hexagon_nn_input *inputs,
+    int inputsLen,
+    const hexagon_nn_output *outputs,
+    int outputsLen) __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_append_node_list)(
+    hexagon_nn_nn_id id,
+    const hexagon_nn_op_node *ops,
+    int opsLen) __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_append_const_node)(
+    hexagon_nn_nn_id id,
+    unsigned int node_id,
+    unsigned int batches,
+    unsigned int height,
+    unsigned int width,
+    unsigned int depth,
+    const unsigned char *data,
+    int dataLen) __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_append_const_node_list)(
+    hexagon_nn_nn_id id,
+    const hexagon_nn_const_node *consts,
+    int constsLen) __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_prepare)(hexagon_nn_nn_id id)
+    __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_execute)(
+    hexagon_nn_nn_id id,
+    unsigned int batches_in,
+    unsigned int height_in,
+    unsigned int width_in,
+    unsigned int depth_in,
+    const unsigned char *data_in,
+    int data_inLen,
+    unsigned int *batches_out,
+    unsigned int *height_out,
+    unsigned int *width_out,
+    unsigned int *depth_out,
+    unsigned char *data_out,
+    int data_outLen,
+    unsigned int *data_len_out) __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_teardown)(hexagon_nn_nn_id id)
+    __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_set_powersave_level)(
+    unsigned int level) __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_get_perfinfo)(
+    hexagon_nn_nn_id id,
+    hexagon_nn_perfinfo *info_out,
+    int info_outLen,
+    unsigned int *n_items) __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_reset_perfinfo)(
+    hexagon_nn_nn_id id, unsigned int event) __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_last_execution_cycles)(
+    hexagon_nn_nn_id id,
+    unsigned int *cycles_lo,
+    unsigned int *cycles_hi) __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_version)(int *ver)
+    __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_op_name_to_id)(
+    const char *name, unsigned int *node_id) __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_op_id_to_name)(
+    unsigned int node_id, char *name, int nameLen) __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_disable_dcvs)(void)
+    __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_GetHexagonBinaryVersion)(
+    int *ver) __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_PrintLog)(
+    const unsigned char *buf, int bufLen) __QAIC_HEADER_ATTRIBUTE;
+__QAIC_HEADER_EXPORT int __QAIC_HEADER(hexagon_nn_execute_new)(
+    hexagon_nn_nn_id id,
+    const hexagon_nn_tensordef *inputs,
+    int inputsLen,
+    hexagon_nn_tensordef *outputs,
+    int outputsLen) __QAIC_HEADER_ATTRIBUTE;
+#ifdef __cplusplus
+}
+#endif
+
+#else  // nnlib version
+
 #ifndef __QAIC_HEADER
 #define __QAIC_HEADER(ff) ff
 #endif  //__QAIC_HEADER
@@ -226,4 +418,7 @@ __QAIC_HEADER_EXPORT unsigned int __QAIC_HEADER(hexagon_nn_get_dsp_offset)(void)
 #ifdef __cplusplus
 }
 #endif
+
+#endif  // nnlib version
+
 #endif  // THIRD_PARTY_NNLIB_HEXAGON_NN_H_
diff --git a/third_party/nnlib/libhexagon_controller_old.so b/third_party/nnlib/libhexagon_controller_old.so
new file mode 100755
index 0000000000000000000000000000000000000000..1c5a4111f9958eddfb0426c3010bc93ad8e13119
GIT binary patch
literal 15564
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
QBo;T;VJ*Ta1T^ga3sWWQXaE2J

literal 0
HcmV?d00001

diff --git a/third_party/nnlib/ops.h b/third_party/nnlib/ops.h
index 43670832..48318c70 100644
--- a/third_party/nnlib/ops.h
+++ b/third_party/nnlib/ops.h
@@ -79,6 +79,147 @@
  */
 // NOLINT(build/header_guard)
 
+#ifdef MACE_USE_NNLIB_OLD
+
+DEF_OP(INPUT)
+DEF_OP(OUTPUT)
+DEF_OP(Nop)
+DEF_OP(Const)
+DEF_OP(Check)
+DEF_OP(Close_f)
+DEF_OP(Close_quint8)
+DEF_OP(Close_q_quint8)
+DEF_OP(Close_int32)
+DEF_OP(Close_qint32)
+DEF_OP(PPrint_8)
+DEF_OP(PPrint_32)
+DEF_OP(PPrint_f)
+DEF_OP(PreFree)
+DEF_OP(Flatten)
+
+#ifndef DEF_OP_WREF
+#define DEF_OP_WREF(NAME) DEF_OP(NAME) DEF_OP(NAME##_ref)
+#define __SELF_DEF_OP_WREF
+#endif
+
+DEF_OP_WREF(QuantizedConv2d_8x8to32)
+DEF_OP_WREF(QuantizedMatMul_8x8to32)
+DEF_OP_WREF(QuantizeDownAndShrinkRange_32to8)
+DEF_OP_WREF(QuantizedRelu_8)
+DEF_OP_WREF(QuantizedReluX_8)
+DEF_OP_WREF(QuantizedMaxPool_8)
+DEF_OP_WREF(QuantizedAvgPool_8)
+DEF_OP_WREF(QuantizedConcat_8)
+DEF_OP_WREF(QuantizedBiasAdd_8p8to32)
+DEF_OP_WREF(Min_f)
+DEF_OP_WREF(Max_f)
+DEF_OP_WREF(Quantize)
+DEF_OP_WREF(Dequantize)
+DEF_OP_WREF(Supernode_8x8p8to8)
+
+DEF_OP(QuantizedFlatten)
+DEF_OP(Softmax_f)
+DEF_OP(Conv2d_f)
+DEF_OP(MatMul_f)
+DEF_OP(Relu_f)
+DEF_OP(ReluX_f)
+DEF_OP(AvgPool_f)
+DEF_OP(MaxPool_f)
+DEF_OP(Concat_f)
+DEF_OP(BiasAdd_f)
+DEF_OP(LRN_f)
+
+DEF_OP(Variable)
+DEF_OP(Assign)
+DEF_OP(Reshape)
+DEF_OP(QuantizedReshape)
+DEF_OP(Tanh_f)
+DEF_OP(Sigmoid_f)
+DEF_OP(Slice_8)
+DEF_OP(Slice_f)
+DEF_OP(QuantizedSlice_8)
+DEF_OP(Add_f)
+DEF_OP(Mul_f)
+DEF_OP(Minimum_f)
+DEF_OP(Maximum_f)
+
+DEF_OP_WREF(Requantize_32to8)
+DEF_OP_WREF(RequantizationRange_32)
+
+DEF_OP(Neg_f)
+DEF_OP(Sub_f)
+DEF_OP(AddN_f)
+DEF_OP(Range_int32)
+DEF_OP(Rank_int32)
+DEF_OP(Transpose_int32)
+DEF_OP(Transpose_f)
+DEF_OP(InstanceNorm_f)
+DEF_OP_WREF(QuantizedInstanceNorm_8)
+DEF_OP(Sub_int32)
+DEF_OP(Add_int32)
+DEF_OP(Split_f)
+DEF_OP(Dequantize_qint32_f)
+DEF_OP(PRelu_f)
+DEF_OP_WREF(QuantizedPRelu_8)
+DEF_OP(Sum_f)
+DEF_OP(Prod_f)
+DEF_OP(Mul_int32)
+DEF_OP(LogicalAnd_int32)
+DEF_OP(LogicalOr_int32)
+DEF_OP(LogicalXor_int32)
+DEF_OP(Shape_int32)
+DEF_OP(Pack_int32)
+DEF_OP(MirrorPad_f)
+DEF_OP(ResizeNearestNeighbor_f)
+DEF_OP(StridedSlice_int32)
+DEF_OP(StridedSlice_f)
+DEF_OP(ExpandDims_int32)
+DEF_OP(ExpandDims_f)
+
+DEF_OP(LogSoftmax_f)
+DEF_OP(Split_int32)
+DEF_OP(QuantizedSplit_8)
+
+DEF_OP(Deconv_f)
+DEF_OP_WREF(QuantizedDeconv_8x8to32)
+
+DEF_OP_WREF(QuantizedMul_8x8to32)
+DEF_OP_WREF(QuantizedAdd_8p8to32)
+DEF_OP_WREF(QuantizedSigmoid_8)
+DEF_OP_WREF(QuantizedTanh_8)
+DEF_OP_WREF(QuantizedSoftmax_8)
+DEF_OP_WREF(QuantizedLRN_8)
+DEF_OP_WREF(QuantizedSub_8p8to32)
+DEF_OP_WREF(QuantizedMaximum_8)
+DEF_OP_WREF(QuantizedMinimum_8)
+
+DEF_OP(Pad_f)
+DEF_OP(SpaceToBatchND_f)
+DEF_OP(BatchToSpaceND_f)
+DEF_OP(QuantizedSpaceToBatchND_8)
+DEF_OP(QuantizedBatchToSpaceND_8)
+DEF_OP(QuantizedPad_8)
+DEF_OP(ResizeBilinear_f)
+DEF_OP(QuantizedResizeBilinear_8)
+DEF_OP(ConcatV2_f)
+DEF_OP(ConcatV2_int32)
+DEF_OP(Prod_int32)
+DEF_OP(Slice_int32)
+
+DEF_OP(QuantizedAdd_8p8to8)
+
+DEF_OP_WREF(AutoQuantize)
+DEF_OP_WREF(QuantizedDepthwiseConv2d_8x8to32)
+DEF_OP(DepthwiseConv2d_f)
+DEF_OP(QuantizedBiasAdd_8p8to8)
+
+#ifdef __SELF_DEF_OP_WREF
+#undef __SELF_DEF_OP_WREF
+#undef DEF_OP_WREF
+#endif
+
+#else  // nnlib version
+
 DEF_OP(INPUT)
 DEF_OP(OUTPUT)
 DEF_OP(Nop)
@@ -285,3 +426,5 @@ DEF_OP(DepthToSpace_8)
 #undef __SELF_DEF_OP_WREF
 #undef DEF_OP_WREF
 #endif
+
+#endif  // nnlib version
-- 
GitLab