Update to the NeuralNetworks HVX service driver
Adds new operations with the latest drop and addresses the comments in
ag/2999193.
Also accounted for ag/3017213/ and added missing transpose functionality
Bug: 63905942
Bug: 64316595
Test: mm, vts
Change-Id: I12b6444cc44428b7dd2086ca13744e769ca3bbbd
diff --git a/1.0/Device.cpp b/1.0/Device.cpp
new file mode 100644
index 0000000..bf166b6
--- /dev/null
+++ b/1.0/Device.cpp
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * 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.
+ */
+
+#define LOG_TAG "[email protected]"
+
+#include "Device.h"
+#include "HexagonModel.h"
+#include "HexagonUtils.h"
+#include "PreparedModel.h"
+#include <android-base/logging.h>
+#include <mutex>
+#include <thread>
+
+namespace android {
+namespace hardware {
+namespace neuralnetworks {
+namespace V1_0 {
+namespace implementation {
+
+Device::Device() : mCurrentStatus(DeviceStatus::AVAILABLE) {}
+
+Device::~Device() {}
+
+static std::once_flag configure_nnlib;
+static void configureHexagon() {
+ std::call_once(configure_nnlib, [](){ hexagon::Controller::getInstance().config(); });
+}
+
+Return<void> Device::getCapabilities(getCapabilities_cb _hidl_cb) {
+ LOG(INFO) << "Device::getCapabilities";
+ configureHexagon();
+
+ PerformanceInfo float32Performance = {
+ .execTime = 100.0f, // nanoseconds?
+ .powerUsage = 1.0f, // picoJoules
+ };
+
+ PerformanceInfo quantized8Performance = {
+ .execTime = 100.0f, // nanoseconds?
+ .powerUsage = 1.0f, // picoJoules
+ };
+
+ Capabilities capabilities = {
+ .float32Performance = float32Performance,
+ .quantized8Performance = quantized8Performance,
+ };
+
+ ErrorStatus status =
+ hexagon::isHexagonAvailable() ? ErrorStatus::NONE : ErrorStatus::DEVICE_UNAVAILABLE;
+
+ _hidl_cb(status, capabilities);
+ return Void();
+}
+
+Return<void> Device::getSupportedOperations(const Model& model,
+ getSupportedOperations_cb _hidl_cb) {
+ LOG(INFO) << "Device::getSupportedOperations";
+ configureHexagon();
+
+ if (!nn::validateModel(model)) {
+ _hidl_cb(ErrorStatus::INVALID_ARGUMENT, std::vector<bool>{});
+ return Void();
+ }
+ if (!hexagon::isHexagonAvailable()) {
+ _hidl_cb(ErrorStatus::DEVICE_UNAVAILABLE, std::vector<bool>{});
+ return Void();
+ }
+
+ hexagon::Model hexagonModel(model);
+ std::vector<bool> supported = hexagonModel.supportedOperations();
+
+ _hidl_cb(ErrorStatus::NONE, supported);
+ return Void();
+}
+
+void Device::asyncPrepare(const Model& model, const sp<IPreparedModelCallback>& callback) {
+ hexagon::Model hexagonModel(model);
+
+ if (hexagonModel.compile()) {
+ callback->notify(ErrorStatus::NONE, new PreparedModel(model, std::move(hexagonModel)));
+ }
+ else {
+ callback->notify(ErrorStatus::GENERAL_FAILURE, nullptr);
+ }
+}
+
+Return<ErrorStatus> Device::prepareModel(const Model& model,
+ const sp<IPreparedModelCallback>& callback) {
+ LOG(INFO) << "Device::prepareModel";
+ configureHexagon();
+
+ if (callback.get() == nullptr) {
+ LOG(ERROR) << "invalid callback passed to prepareModel";
+ return ErrorStatus::INVALID_ARGUMENT;
+ }
+ if (!nn::validateModel(model)) {
+ callback->notify(ErrorStatus::INVALID_ARGUMENT, nullptr);
+ return ErrorStatus::INVALID_ARGUMENT;
+ }
+ if (!hexagon::isHexagonAvailable()) {
+ callback->notify(ErrorStatus::DEVICE_UNAVAILABLE, nullptr);
+ return ErrorStatus::DEVICE_UNAVAILABLE;
+ }
+
+ // This thread is intentionally detached because the sample driver service
+ // is expected to live forever.
+ std::thread([this, model, callback]{ return asyncPrepare(model, callback); }).detach();
+
+ return ErrorStatus::NONE;
+}
+
+Return<DeviceStatus> Device::getStatus() {
+ LOG(INFO) << "Device::getStatus";
+ configureHexagon();
+ mCurrentStatus =
+ hexagon::isHexagonAvailable() ? DeviceStatus::AVAILABLE : DeviceStatus::OFFLINE;
+ return mCurrentStatus;
+}
+
+} // namespace implementation
+} // namespace V1_0
+} // namespace neuralnetworks
+} // namespace hardware
+} // namespace android
