diff options
Diffstat (limited to 'applications/message_handler_openamp/message_handler.cpp')
-rw-r--r-- | applications/message_handler_openamp/message_handler.cpp | 40 |
1 files changed, 3 insertions, 37 deletions
diff --git a/applications/message_handler_openamp/message_handler.cpp b/applications/message_handler_openamp/message_handler.cpp index 4bd611d..9694f39 100644 --- a/applications/message_handler_openamp/message_handler.cpp +++ b/applications/message_handler_openamp/message_handler.cpp @@ -1,6 +1,5 @@ /* * SPDX-FileCopyrightText: Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office@arm.com> - * * SPDX-License-Identifier: Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the License); you may @@ -308,7 +307,7 @@ void MessageHandler::sendNetworkInfoRsp(const uint32_t src, rsp.ifm_count = 0; rsp.ofm_count = 0; - bool failed = networkToVirtual(network); + bool failed = getNetwork(network); if (!failed) { InferenceProcess::InferenceParser parser; @@ -333,15 +332,7 @@ void MessageHandler::forwardInferenceReq(const uint32_t src, req = inference; - for (uint32_t i = 0; i < req.ifm_count; i++) { - bufferToVirtual(req.ifm[i]); - } - - for (uint32_t i = 0; i < req.ofm_count; i++) { - bufferToVirtual(req.ofm[i]); - } - - networkToVirtual(req.network); + getNetwork(req.network); inferenceQueue.send(message); } @@ -368,35 +359,10 @@ void MessageHandler::sendCancelInferenceRsp(const uint32_t src, responseQueue.send(message); } -bool MessageHandler::getNetwork(const EthosU::ethosu_core_network_buffer &buffer, void *&data, size_t &size) { +bool MessageHandler::getNetwork(EthosU::ethosu_core_network_buffer &buffer) { switch (buffer.type) { case EthosU::ETHOSU_CORE_NETWORK_BUFFER: - data = physicalToVirtual(buffer.buffer.ptr); - size = buffer.buffer.size; return false; - case EthosU::ETHOSU_CORE_NETWORK_INDEX: - return getIndexedNetwork(buffer.index, data, size); - default: - LOG_WARN("Unsupported network model type. type=%" PRIu32, buffer.type); - return true; - } -} - -bool MessageHandler::bufferToVirtual(EthosU::ethosu_core_buffer &buffer) { - void *ptr = physicalToVirtual(buffer.ptr); - if (ptr == nullptr) { - return true; - } - - buffer.ptr = reinterpret_cast<uint32_t>(ptr); - - return false; -} - -bool MessageHandler::networkToVirtual(EthosU::ethosu_core_network_buffer &buffer) { - switch (buffer.type) { - case EthosU::ETHOSU_CORE_NETWORK_BUFFER: - return bufferToVirtual(buffer.buffer); case EthosU::ETHOSU_CORE_NETWORK_INDEX: { void *ptr; size_t size; |