From 900c28a250297964cf9aa65653b9adce4e6db27a Mon Sep 17 00:00:00 2001 From: Lev Proleev Date: Tue, 26 Jan 2021 19:40:20 +0000 Subject: Add canonical types adapters for NNAPI AIDL interface Also: * Add missing AIDL<->CT conversions * Add AIDL-specific info to neuralnetworks/utils/README.md * Add mock classes and tests AIDL adapters Bug: 179015258 Test: neuralnetworks_utils_hal_test Change-Id: Ifa98fadd46dca5dbf9b3ceb4da811aa8da45b6e4 Merged-In: Ifa98fadd46dca5dbf9b3ceb4da811aa8da45b6e4 (cherry picked from commit 3b93b0b56a4f5128eaa942d804dd490317c0abcb) --- neuralnetworks/aidl/utils/src/Buffer.cpp | 78 ++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 neuralnetworks/aidl/utils/src/Buffer.cpp (limited to 'neuralnetworks/aidl/utils/src/Buffer.cpp') diff --git a/neuralnetworks/aidl/utils/src/Buffer.cpp b/neuralnetworks/aidl/utils/src/Buffer.cpp new file mode 100644 index 0000000000..c729a688d1 --- /dev/null +++ b/neuralnetworks/aidl/utils/src/Buffer.cpp @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2021 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. + */ + +#include "Buffer.h" + +#include +#include +#include + +#include "Conversions.h" +#include "Utils.h" +#include "nnapi/hal/aidl/Conversions.h" + +#include +#include + +// See hardware/interfaces/neuralnetworks/utils/README.md for more information on AIDL interface +// lifetimes across processes. + +namespace aidl::android::hardware::neuralnetworks::utils { + +nn::GeneralResult> Buffer::create( + std::shared_ptr buffer, nn::Request::MemoryDomainToken token) { + if (buffer == nullptr) { + return NN_ERROR() << "aidl_hal::utils::Buffer::create must have non-null buffer"; + } + if (token == static_cast(0)) { + return NN_ERROR() << "aidl_hal::utils::Buffer::create must have non-zero token"; + } + + return std::make_shared(PrivateConstructorTag{}, std::move(buffer), token); +} + +Buffer::Buffer(PrivateConstructorTag /*tag*/, std::shared_ptr buffer, + nn::Request::MemoryDomainToken token) + : kBuffer(std::move(buffer)), kToken(token) { + CHECK(kBuffer != nullptr); + CHECK(kToken != static_cast(0)); +} + +nn::Request::MemoryDomainToken Buffer::getToken() const { + return kToken; +} + +nn::GeneralResult Buffer::copyTo(const nn::SharedMemory& dst) const { + const auto aidlDst = NN_TRY(convert(dst)); + + const auto ret = kBuffer->copyTo(aidlDst); + HANDLE_ASTATUS(ret) << "IBuffer::copyTo failed"; + + return {}; +} + +nn::GeneralResult Buffer::copyFrom(const nn::SharedMemory& src, + const nn::Dimensions& dimensions) const { + const auto aidlSrc = NN_TRY(convert(src)); + const auto aidlDimensions = NN_TRY(toSigned(dimensions)); + + const auto ret = kBuffer->copyFrom(aidlSrc, aidlDimensions); + HANDLE_ASTATUS(ret) << "IBuffer::copyFrom failed"; + + return {}; +} + +} // namespace aidl::android::hardware::neuralnetworks::utils -- cgit v1.2.3