Integrate with 1/26/18 drop
Bug: 67478959
Test: mm, test vts and cts binaries
Change-Id: Ib3e63f0df86b3ce4bbc554894c842b603869d7d5
diff --git a/1.0/HexagonController.cpp b/1.0/HexagonController.cpp
index b2cd177..d2753ac 100644
--- a/1.0/HexagonController.cpp
+++ b/1.0/HexagonController.cpp
@@ -45,6 +45,7 @@
MACRO(disable_dcvs) \
MACRO(set_powersave_level) \
MACRO(config) \
+ MACRO(get_dsp_offset) \
MACRO(boost) \
MACRO(slow)
@@ -201,6 +202,10 @@
CONTROLLER_CHECK(config);
}
+unsigned int Controller::get_dsp_offset() {
+ CONTROLLER_CHECK(get_dsp_offset);
+}
+
int Controller::boost(int bus_usage) {
CONTROLLER_CHECK(boost, bus_usage);
}
diff --git a/1.0/HexagonController.h b/1.0/HexagonController.h
index 163c2f0..ce7e8e7 100644
--- a/1.0/HexagonController.h
+++ b/1.0/HexagonController.h
@@ -108,6 +108,8 @@
int config();
+ unsigned int get_dsp_offset();
+
int boost(int bus_usage);
int slow();
@@ -137,6 +139,7 @@
hexagon_nn_controller_disable_dcvs_fn mFn_disable_dcvs;
hexagon_nn_controller_set_powersave_level_fn mFn_set_powersave_level;
hexagon_nn_controller_config_fn mFn_config;
+ hexagon_nn_controller_get_dsp_offset_fn mFn_get_dsp_offset;
hexagon_nn_controller_boost_fn mFn_boost;
hexagon_nn_controller_slow_fn mFn_slow;
};
diff --git a/1.0/hexagon_nn_controller/hexagon_nn_controller.h b/1.0/hexagon_nn_controller/hexagon_nn_controller.h
index 0de74f1..cc1aada 100644
--- a/1.0/hexagon_nn_controller/hexagon_nn_controller.h
+++ b/1.0/hexagon_nn_controller/hexagon_nn_controller.h
@@ -140,6 +140,8 @@
typedef int (*hexagon_nn_controller_config_fn)();
+typedef unsigned int (*hexagon_nn_controller_get_dsp_offset_fn)();
+
typedef int (*hexagon_nn_controller_boost_fn)(int bus_usage);
typedef int (*hexagon_nn_controller_slow_fn)();
diff --git a/1.0/hexagon_nn_controller/ops.def b/1.0/hexagon_nn_controller/ops.def
index f2c8d5a..28e0b8f 100644
--- a/1.0/hexagon_nn_controller/ops.def
+++ b/1.0/hexagon_nn_controller/ops.def
@@ -1,3 +1,38 @@
+/*
+ * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted (subject to the limitations in the
+ * disclaimer below) provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * * Neither the name of The Linux Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * '
+ * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+ * GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+ * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
/*
* You probably want to
*
@@ -225,9 +260,8 @@
DEF_OP_WREF(QuantizedSigmoid_8_d32)
DEF_OP_WREF(QuantizedSoftmax_8_d32)
-#if 0
+
DEF_OP_WREF(QuantizedL2Pool_8_d32)
-#endif
DEF_OP(Gather_f)
DEF_OP(Gather_int32)
