diff options
Diffstat (limited to 'applications/message_handler')
21 files changed, 0 insertions, 2781 deletions
diff --git a/applications/message_handler/CMakeLists.txt b/applications/message_handler/CMakeLists.txt deleted file mode 100644 index 5e95bdd..0000000 --- a/applications/message_handler/CMakeLists.txt +++ /dev/null @@ -1,63 +0,0 @@ -# -# Copyright (c) 2020-2022 Arm Limited. -# -# SPDX-License-Identifier: Apache-2.0 -# -# 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 -# -# 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. -# - -if(NOT TARGET freertos_kernel) - message("Skipping message handler") - return() -endif() - -# Split total tensor arena equally for each NPU -if(TARGET ethosu_core_driver AND ETHOSU_TARGET_NPU_COUNT GREATER 0) - set(NUM_ARENAS ${ETHOSU_TARGET_NPU_COUNT}) -else() - set(NUM_ARENAS 1) -endif() - -set(MESSAGE_HANDLER_ARENA_SIZE 2000000 CACHE STRING "Total size of all message handler tensor arenas") -math(EXPR TENSOR_ARENA_SIZE "${MESSAGE_HANDLER_ARENA_SIZE} / ${NUM_ARENAS}") - -add_subdirectory(lib) -add_subdirectory(test) - -set(MESSAGE_HANDLER_MODEL_0 "" CACHE STRING "Path to built in model 0") -set(MESSAGE_HANDLER_MODEL_1 "" CACHE STRING "Path to built in model 1") -set(MESSAGE_HANDLER_MODEL_2 "" CACHE STRING "Path to built in model 2") -set(MESSAGE_HANDLER_MODEL_3 "" CACHE STRING "Path to built in model 3") - -ethosu_add_executable(message_handler - SOURCES - main.cpp - LIBRARIES - message_handler_lib - freertos_kernel) - -target_include_directories(message_handler PRIVATE - indexed_networks - ${LINUX_DRIVER_STACK_PATH}/kernel) - -target_compile_definitions(message_handler PRIVATE - TENSOR_ARENA_SIZE=${TENSOR_ARENA_SIZE} - $<$<BOOL:${MESSAGE_HANDLER_MODEL_0}>:MODEL_0=${MESSAGE_HANDLER_MODEL_0}> - $<$<BOOL:${MESSAGE_HANDLER_MODEL_1}>:MODEL_1=${MESSAGE_HANDLER_MODEL_1}> - $<$<BOOL:${MESSAGE_HANDLER_MODEL_2}>:MODEL_2=${MESSAGE_HANDLER_MODEL_2}> - $<$<BOOL:${MESSAGE_HANDLER_MODEL_3}>:MODEL_3=${MESSAGE_HANDLER_MODEL_3}>) - -install(FILES $<TARGET_FILE:message_handler> - DESTINATION "lib/firmware" - RENAME "arm-${ETHOSU_TARGET_NPU_CONFIG}.fw" -) diff --git a/applications/message_handler/indexed_networks/indexed_networks.hpp b/applications/message_handler/indexed_networks/indexed_networks.hpp deleted file mode 100644 index d37ddba..0000000 --- a/applications/message_handler/indexed_networks/indexed_networks.hpp +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (c) 2022 Arm Limited. - * - * SPDX-License-Identifier: Apache-2.0 - * - * 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 - * - * 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. - */ - -#ifndef INDEXED_NETWORKS_H -#define INDEXED_NETWORKS_H - -#include "networks.hpp" - -#include <cstdio> -#include <inttypes.h> - -#define XSTRINGIFY(src) #src -#define STRINGIFY(src) XSTRINGIFY(src) - -namespace { -#if defined(__has_include) - -#if defined(MODEL_0) -namespace Model0 { -#include STRINGIFY(MODEL_0) -} -#endif - -#if defined(MODEL_1) -namespace Model1 { -#include STRINGIFY(MODEL_1) -} -#endif - -#if defined(MODEL_2) -namespace Model2 { -#include STRINGIFY(MODEL_2) -} -#endif - -#if defined(MODEL_3) -namespace Model3 { -#include STRINGIFY(MODEL_3) -} -#endif - -#endif -} // namespace - -namespace MessageHandler { - -class WithIndexedNetworks : public BaseNetworks<WithIndexedNetworks> { -public: - static bool getIndexedNetwork(const uint32_t index, void *&data, size_t &size) { - switch (index) { -#if defined(MODEL_0) - case 0: - data = reinterpret_cast<void *>(Model0::networkModelData); - size = sizeof(Model0::networkModelData); - break; -#endif - -#if defined(MODEL_1) - case 1: - data = reinterpret_cast<void *>(Model1::networkModelData); - size = sizeof(Model1::networkModelData); - break; -#endif - -#if defined(MODEL_2) - case 2: - data = reinterpret_cast<void *>(Model2::networkModelData); - size = sizeof(Model2::networkModelData); - break; -#endif - -#if defined(MODEL_3) - case 3: - data = reinterpret_cast<void *>(Model3::networkModelData); - size = sizeof(Model3::networkModelData); - break; -#endif - - default: - printf("Error: Network model index out of range. index=%" PRIu32 "\n", index); - return true; - } - - return false; - } -}; - -} // namespace MessageHandler - -#endif diff --git a/applications/message_handler/indexed_networks/network_template.hpp b/applications/message_handler/indexed_networks/network_template.hpp deleted file mode 100644 index a477b84..0000000 --- a/applications/message_handler/indexed_networks/network_template.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2022 Arm Limited. - * - * SPDX-License-Identifier: Apache-2.0 - * - * 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 - * - * 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 <stdint.h> - -__attribute__((section(".sram.data"), aligned(16))) uint8_t networkModelData[] = { - /* Add network model here */ -}; diff --git a/applications/message_handler/lib/CMakeLists.txt b/applications/message_handler/lib/CMakeLists.txt deleted file mode 100644 index c17742a..0000000 --- a/applications/message_handler/lib/CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2020-2022 Arm Limited. -# -# SPDX-License-Identifier: Apache-2.0 -# -# 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 -# -# 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. -# - -add_library(message_handler_lib STATIC) - -target_include_directories(message_handler_lib PUBLIC include - PRIVATE ${LINUX_DRIVER_STACK_PATH}/kernel) - -target_link_libraries(message_handler_lib - PUBLIC - ethosu_mailbox - $<$<TARGET_EXISTS:ethosu_core_driver>:ethosu_core_driver> - inference_process - PRIVATE - cmsis_device - freertos_kernel - tflu) - -target_sources(message_handler_lib PRIVATE - message_handler.cpp - message_queue.cpp - core_driver_mutex.cpp - freertos_allocator.cpp) diff --git a/applications/message_handler/lib/core_driver_mutex.cpp b/applications/message_handler/lib/core_driver_mutex.cpp deleted file mode 100644 index d023ad2..0000000 --- a/applications/message_handler/lib/core_driver_mutex.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/* - * 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 - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * 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. - */ - -#if defined(ETHOSU) - -#include "FreeRTOS.h" -#include "semphr.h" - -#include <ethosu_driver.h> -#include <stdio.h> - -extern "C" { - -void *ethosu_mutex_create(void) { - return xSemaphoreCreateMutex(); -} - -int ethosu_mutex_lock(void *mutex) { - SemaphoreHandle_t handle = reinterpret_cast<SemaphoreHandle_t>(mutex); - if (xSemaphoreTake(handle, portMAX_DELAY) != pdTRUE) { - printf("Error: Failed to lock mutex.\n"); - return -1; - } - return 0; -} - -int ethosu_mutex_unlock(void *mutex) { - SemaphoreHandle_t handle = reinterpret_cast<SemaphoreHandle_t>(mutex); - if (xSemaphoreGive(handle) != pdTRUE) { - printf("Error: Failed to unlock mutex.\n"); - return -1; - } - return 0; -} - -void *ethosu_semaphore_create(void) { - return xSemaphoreCreateCounting(255, 0); -} - -int ethosu_semaphore_take(void *sem) { - SemaphoreHandle_t handle = reinterpret_cast<SemaphoreHandle_t>(sem); - if (xSemaphoreTake(handle, portMAX_DELAY) != pdTRUE) { - printf("Error: Failed to take semaphore.\n"); - return -1; - } - return 0; -} - -int ethosu_semaphore_give(void *sem) { - SemaphoreHandle_t handle = reinterpret_cast<SemaphoreHandle_t>(sem); - if (xPortIsInsideInterrupt()) { - if (xSemaphoreGiveFromISR(handle, NULL) != pdTRUE) { - printf("Error: Failed to give semaphore from ISR.\n"); - return -1; - } - } else { - if (xSemaphoreGive(handle) != pdTRUE) { - printf("Error: Failed to give semaphore.\n"); - return -1; - } - } - return 0; -} -} - -#endif diff --git a/applications/message_handler/lib/freertos_allocator.cpp b/applications/message_handler/lib/freertos_allocator.cpp deleted file mode 100644 index 883ada8..0000000 --- a/applications/message_handler/lib/freertos_allocator.cpp +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2022 Arm Limited. - * - * SPDX-License-Identifier: Apache-2.0 - * - * 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 - * - * 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 "FreeRTOS.h" -#include <cstddef> -#include <new> - -void *operator new(size_t size) { - return pvPortMalloc(size); -} - -void *operator new[](size_t size) { - return pvPortMalloc(size); -} - -void operator delete(void *ptr) noexcept { - vPortFree(ptr); -} - -void operator delete(void *ptr, std::size_t) noexcept { - vPortFree(ptr); -} - -void operator delete[](void *ptr) noexcept { - vPortFree(ptr); -} - -void operator delete[](void *ptr, std::size_t) noexcept { - vPortFree(ptr); -} diff --git a/applications/message_handler/lib/include/message_handler.hpp b/applications/message_handler/lib/include/message_handler.hpp deleted file mode 100644 index 98875f4..0000000 --- a/applications/message_handler/lib/include/message_handler.hpp +++ /dev/null @@ -1,187 +0,0 @@ -/* - * Copyright (c) 2020-2022 Arm Limited. - * - * SPDX-License-Identifier: Apache-2.0 - * - * 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 - * - * 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. - */ - -#ifndef MESSAGE_HANDLER_H -#define MESSAGE_HANDLER_H - -#include "FreeRTOS.h" -#include "queue.h" -#include "semphr.h" - -#include "message_queue.hpp" -#include "networks.hpp" -#include <ethosu_core_interface.h> -#if defined(ETHOSU) -#include <ethosu_driver.h> -#endif -#include <inference_parser.hpp> -#include <inference_process.hpp> -#include <mailbox.hpp> - -#include <algorithm> -#include <cstddef> -#include <cstdio> -#include <inttypes.h> -#include <list> -#include <vector> - -namespace MessageHandler { - -template <typename T, size_t capacity = 5> -class Queue { -public: - using Predicate = std::function<bool(const T &data)>; - - Queue() { - mutex = xSemaphoreCreateMutex(); - size = xSemaphoreCreateCounting(capacity, 0u); - - if (mutex == nullptr || size == nullptr) { - printf("Error: failed to allocate memory for inference queue\n"); - } - } - - ~Queue() { - vSemaphoreDelete(mutex); - vSemaphoreDelete(size); - } - - bool push(const T &data) { - xSemaphoreTake(mutex, portMAX_DELAY); - if (list.size() >= capacity) { - xSemaphoreGive(mutex); - return false; - } - - list.push_back(data); - xSemaphoreGive(mutex); - - // increase number of available inferences to pop - xSemaphoreGive(size); - return true; - } - - void pop(T &data) { - // decrease the number of available inferences to pop - xSemaphoreTake(size, portMAX_DELAY); - - xSemaphoreTake(mutex, portMAX_DELAY); - data = list.front(); - list.pop_front(); - xSemaphoreGive(mutex); - } - - bool erase(Predicate pred) { - // let's optimistically assume we are removing an inference, so decrease pop - if (pdFALSE == xSemaphoreTake(size, 0)) { - // if there are no inferences return immediately - return false; - } - - xSemaphoreTake(mutex, portMAX_DELAY); - auto found = std::find_if(list.begin(), list.end(), pred); - bool erased = found != list.end(); - if (erased) { - list.erase(found); - } - xSemaphoreGive(mutex); - - if (!erased) { - // no inference erased, so let's put the size count back - xSemaphoreGive(size); - } - - return erased; - } - -private: - std::list<T> list; - - SemaphoreHandle_t mutex; - SemaphoreHandle_t size; -}; - -class IncomingMessageHandler { -public: - IncomingMessageHandler(EthosU::ethosu_core_queue &inputMessageQueue, - EthosU::ethosu_core_queue &outputMessageQueue, - Mailbox::Mailbox &mailbox, - std::shared_ptr<Queue<EthosU::ethosu_core_inference_req>> inferenceInputQueue, - QueueHandle_t inferenceOutputQueue, - SemaphoreHandle_t messageNotify, - std::shared_ptr<Networks> networks); - - void run(); - -private: - bool handleMessage(); - bool handleInferenceOutput(); - static void handleIrq(void *userArg); - - void sendPong(); - void sendErrorAndResetQueue(EthosU::ethosu_core_msg_err_type type, const char *message); - void sendVersionRsp(); - void sendCapabilitiesRsp(uint64_t userArg); - void sendNetworkInfoRsp(uint64_t userArg, EthosU::ethosu_core_network_buffer &network); - void sendInferenceRsp(EthosU::ethosu_core_inference_rsp &inference); - void sendFailedInferenceRsp(uint64_t userArg, uint32_t status); - void sendCancelInferenceRsp(uint64_t userArg, uint32_t status); - void readCapabilties(EthosU::ethosu_core_msg_capabilities_rsp &rsp); - - MessageQueue::QueueImpl inputMessageQueue; - MessageQueue::QueueImpl outputMessageQueue; - Mailbox::Mailbox &mailbox; - InferenceProcess::InferenceParser parser; - std::shared_ptr<Queue<EthosU::ethosu_core_inference_req>> inferenceInputQueue; - QueueHandle_t inferenceOutputQueue; - SemaphoreHandle_t messageNotify; - EthosU::ethosu_core_msg_capabilities_rsp capabilities; - std::shared_ptr<Networks> networks; -}; - -class InferenceHandler { -public: - InferenceHandler(uint8_t *tensorArena, - size_t arenaSize, - std::shared_ptr<Queue<EthosU::ethosu_core_inference_req>> inferenceInputQueue, - QueueHandle_t inferenceOutputQueue, - SemaphoreHandle_t messageNotify, - std::shared_ptr<Networks> networks); - - void run(); - -private: - void runInference(EthosU::ethosu_core_inference_req &req, EthosU::ethosu_core_inference_rsp &rsp); - bool getInferenceJob(const EthosU::ethosu_core_inference_req &req, InferenceProcess::InferenceJob &job); - -#if defined(ETHOSU) - friend void ::ethosu_inference_begin(struct ethosu_driver *drv, void *userArg); - friend void ::ethosu_inference_end(struct ethosu_driver *drv, void *userArg); -#endif - std::shared_ptr<Queue<EthosU::ethosu_core_inference_req>> inferenceInputQueue; - QueueHandle_t inferenceOutputQueue; - SemaphoreHandle_t messageNotify; - InferenceProcess::InferenceProcess inference; - EthosU::ethosu_core_inference_req *currentReq; - EthosU::ethosu_core_inference_rsp *currentRsp; - std::shared_ptr<Networks> networks; -}; - -} // namespace MessageHandler - -#endif diff --git a/applications/message_handler/lib/include/message_queue.hpp b/applications/message_handler/lib/include/message_queue.hpp deleted file mode 100644 index ec9d7b6..0000000 --- a/applications/message_handler/lib/include/message_queue.hpp +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2020-2022 Arm Limited. - * - * SPDX-License-Identifier: Apache-2.0 - * - * 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 - * - * 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. - */ - -#ifndef MESSAGE_QUEUE_H -#define MESSAGE_QUEUE_H - -#include <cstddef> -#include <ethosu_core_interface.h> - -namespace MessageQueue { - -template <uint32_t SIZE> -struct Queue { - EthosU::ethosu_core_queue_header header; - uint8_t data[SIZE]; - - constexpr Queue() : header({SIZE, 0, {0}, 0}) {} - - constexpr EthosU::ethosu_core_queue *toQueue() { - return reinterpret_cast<EthosU::ethosu_core_queue *>(&header); - } -}; - -class QueueImpl { -public: - struct Vec { - const void *base; - size_t length; - }; - - QueueImpl(EthosU::ethosu_core_queue &queue); - - bool empty() const; - size_t available() const; - size_t capacity() const; - void reset(); - bool read(uint8_t *dst, uint32_t length); - template <typename T> - bool read(T &dst) { - return read(reinterpret_cast<uint8_t *>(&dst), sizeof(dst)); - } - bool write(const Vec *vec, size_t length); - bool write(const uint32_t type, const void *src = nullptr, uint32_t length = 0); - template <typename T> - bool write(const uint32_t type, const T &src) { - return write(type, reinterpret_cast<const void *>(&src), sizeof(src)); - } - -private: - void cleanHeader() const; - void cleanHeaderData() const; - void invalidateHeader() const; - void invalidateHeaderData() const; - - EthosU::ethosu_core_queue &queue; -}; -} // namespace MessageQueue - -#endif diff --git a/applications/message_handler/lib/include/networks.hpp b/applications/message_handler/lib/include/networks.hpp deleted file mode 100644 index eb01d10..0000000 --- a/applications/message_handler/lib/include/networks.hpp +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2022 Arm Limited. - * - * SPDX-License-Identifier: Apache-2.0 - * - * 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 - * - * 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. - */ - -#ifndef NETWORKS_H -#define NETWORKS_H - -#include <ethosu_core_interface.h> - -#include <cstdio> -#include <inttypes.h> - -using namespace EthosU; - -namespace MessageHandler { - -class Networks { -public: - virtual ~Networks() {} - virtual bool getNetwork(const ethosu_core_network_buffer &buffer, void *&data, size_t &size) = 0; -}; - -template <typename T> -class BaseNetworks : public Networks { -public: - bool getNetwork(const ethosu_core_network_buffer &buffer, void *&data, size_t &size) override { - switch (buffer.type) { - case ETHOSU_CORE_NETWORK_BUFFER: - data = reinterpret_cast<void *>(buffer.buffer.ptr); - size = buffer.buffer.size; - return false; - case ETHOSU_CORE_NETWORK_INDEX: - return T::getIndexedNetwork(buffer.index, data, size); - default: - printf("Error: Unsupported network model type. type=%" PRIu32 "\n", buffer.type); - return true; - } - } -}; - -class NoIndexedNetworks : public BaseNetworks<NoIndexedNetworks> { - static bool getIndexedNetwork(const uint32_t index, void *&data, size_t &size) { - printf("Error: Network model index out of range. index=%" PRIu32 "\n", index); - return true; - } -}; - -} // namespace MessageHandler - -#endif diff --git a/applications/message_handler/lib/message_handler.cpp b/applications/message_handler/lib/message_handler.cpp deleted file mode 100644 index 66623f9..0000000 --- a/applications/message_handler/lib/message_handler.cpp +++ /dev/null @@ -1,523 +0,0 @@ -/* - * Copyright (c) 2020-2022 Arm Limited. - * - * SPDX-License-Identifier: Apache-2.0 - * - * 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 - * - * 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 "message_handler.hpp" - -#include "cmsis_compiler.h" - -#ifdef ETHOSU -#include <ethosu_driver.h> -#include <pmu_ethosu.h> -#endif - -#include "FreeRTOS.h" -#include "queue.h" -#include "semphr.h" - -#include <cstring> -#include <vector> - -using namespace EthosU; -using namespace MessageQueue; - -namespace MessageHandler { - -/**************************************************************************** - * IncomingMessageHandler - ****************************************************************************/ - -IncomingMessageHandler::IncomingMessageHandler( - EthosU::ethosu_core_queue &_inputMessageQueue, - EthosU::ethosu_core_queue &_outputMessageQueue, - Mailbox::Mailbox &_mailbox, - std::shared_ptr<Queue<EthosU::ethosu_core_inference_req>> _inferenceInputQueue, - QueueHandle_t _inferenceOutputQueue, - SemaphoreHandle_t _messageNotify, - std::shared_ptr<Networks> _networks) : - inputMessageQueue(_inputMessageQueue), - outputMessageQueue(_outputMessageQueue), mailbox(_mailbox), inferenceInputQueue(_inferenceInputQueue), - inferenceOutputQueue(_inferenceOutputQueue), messageNotify(_messageNotify), networks(_networks) { - mailbox.registerCallback(handleIrq, reinterpret_cast<void *>(this)); - readCapabilties(capabilities); -} - -void IncomingMessageHandler::run() { - while (true) { - // Wait for event - xSemaphoreTake(messageNotify, portMAX_DELAY); - - // Handle all inference outputs and all messages in queue - while (handleInferenceOutput() || handleMessage()) {} - } -} - -void IncomingMessageHandler::handleIrq(void *userArg) { - if (userArg == nullptr) { - return; - } - IncomingMessageHandler *_this = reinterpret_cast<IncomingMessageHandler *>(userArg); - xSemaphoreGiveFromISR(_this->messageNotify, nullptr); -} - -void IncomingMessageHandler::sendErrorAndResetQueue(ethosu_core_msg_err_type type, const char *message) { - ethosu_core_msg_err error; - error.type = type; - - for (size_t i = 0; i < sizeof(error.msg) && message[i]; i++) { - error.msg[i] = message[i]; - } - printf("ERROR: Msg: \"%s\"\n", error.msg); - - if (!outputMessageQueue.write(ETHOSU_CORE_MSG_ERR, error)) { - printf("ERROR: Msg: Failed to write error response. No mailbox message sent\n"); - } else { - mailbox.sendMessage(); - } - inputMessageQueue.reset(); -} - -bool IncomingMessageHandler::handleInferenceOutput() { - struct ethosu_core_inference_rsp rsp; - if (pdTRUE != xQueueReceive(inferenceOutputQueue, &rsp, 0)) { - return false; - } - - sendInferenceRsp(rsp); - return true; -} - -bool IncomingMessageHandler::handleMessage() { - struct ethosu_core_msg msg; - - if (inputMessageQueue.available() == 0) { - return false; - } - - // Read msg header - // Only process a complete message header, else send error message - // and reset queue - if (!inputMessageQueue.read(msg)) { - sendErrorAndResetQueue(ETHOSU_CORE_MSG_ERR_INVALID_SIZE, "Failed to read a complete header"); - return false; - } - - printf("Msg: header magic=%" PRIX32 ", type=%" PRIu32 ", length=%" PRIu32 "\n", msg.magic, msg.type, msg.length); - - if (msg.magic != ETHOSU_CORE_MSG_MAGIC) { - printf("Msg: Invalid Magic\n"); - sendErrorAndResetQueue(ETHOSU_CORE_MSG_ERR_INVALID_MAGIC, "Invalid magic"); - return false; - } - - switch (msg.type) { - case ETHOSU_CORE_MSG_PING: { - printf("Msg: Ping\n"); - sendPong(); - break; - } - case ETHOSU_CORE_MSG_ERR: { - ethosu_core_msg_err error; - if (!inputMessageQueue.read(error)) { - printf("ERROR: Msg: Failed to receive error message\n"); - } else { - printf("Msg: Received an error response, type=%" PRIu32 ", msg=\"%s\"\n", error.type, error.msg); - } - - inputMessageQueue.reset(); - return false; - } - case ETHOSU_CORE_MSG_VERSION_REQ: { - printf("Msg: Version request\n"); - sendVersionRsp(); - break; - } - case ETHOSU_CORE_MSG_CAPABILITIES_REQ: { - ethosu_core_capabilities_req req; - if (!inputMessageQueue.read(req)) { - sendErrorAndResetQueue(ETHOSU_CORE_MSG_ERR_INVALID_PAYLOAD, "CapabilitiesReq. Failed to read payload"); - break; - } - - printf("Msg: Capabilities request.user_arg=0x%" PRIx64 "\n", req.user_arg); - sendCapabilitiesRsp(req.user_arg); - break; - } - case ETHOSU_CORE_MSG_INFERENCE_REQ: { - ethosu_core_inference_req req; - if (!inputMessageQueue.read(req)) { - sendErrorAndResetQueue(ETHOSU_CORE_MSG_ERR_INVALID_PAYLOAD, "InferenceReq. Failed to read payload"); - break; - } - - printf("Msg: InferenceReq. user_arg=0x%" PRIx64 ", network_type=%" PRIu32 ", ", req.user_arg, req.network.type); - - if (req.network.type == ETHOSU_CORE_NETWORK_BUFFER) { - printf("network.buffer={0x%" PRIx32 ", %" PRIu32 "},\n", req.network.buffer.ptr, req.network.buffer.size); - } else { - printf("network.index=%" PRIu32 ",\n", req.network.index); - } - - printf("ifm_count=%" PRIu32 ", ifm=[", req.ifm_count); - for (uint32_t i = 0; i < req.ifm_count; ++i) { - if (i > 0) { - printf(", "); - } - - printf("{0x%" PRIx32 ", %" PRIu32 "}", req.ifm[i].ptr, req.ifm[i].size); - } - printf("]"); - - printf(", ofm_count=%" PRIu32 ", ofm=[", req.ofm_count); - for (uint32_t i = 0; i < req.ofm_count; ++i) { - if (i > 0) { - printf(", "); - } - - printf("{0x%" PRIx32 ", %" PRIu32 "}", req.ofm[i].ptr, req.ofm[i].size); - } - printf("]\n"); - - if (!inferenceInputQueue->push(req)) { - printf("Msg: Inference queue full. Rejecting inference user_arg=0x%" PRIx64 "\n", req.user_arg); - sendFailedInferenceRsp(req.user_arg, ETHOSU_CORE_STATUS_REJECTED); - } - break; - } - case ETHOSU_CORE_MSG_CANCEL_INFERENCE_REQ: { - ethosu_core_cancel_inference_req req; - if (!inputMessageQueue.read(req)) { - sendErrorAndResetQueue(ETHOSU_CORE_MSG_ERR_INVALID_PAYLOAD, "CancelInferenceReq. Failed to read payload"); - break; - } - printf("Msg: CancelInferenceReq. user_arg=0x%" PRIx64 ", inference_handle=0x%" PRIx64 "\n", - req.user_arg, - req.inference_handle); - - bool found = - inferenceInputQueue->erase([req](auto &inf_req) { return inf_req.user_arg == req.inference_handle; }); - - // NOTE: send an inference response with status ABORTED if the inference has been droped from the queue - if (found) { - sendFailedInferenceRsp(req.inference_handle, ETHOSU_CORE_STATUS_ABORTED); - } - - sendCancelInferenceRsp(req.user_arg, found ? ETHOSU_CORE_STATUS_OK : ETHOSU_CORE_STATUS_ERROR); - break; - } - case ETHOSU_CORE_MSG_NETWORK_INFO_REQ: { - ethosu_core_network_info_req req; - if (!inputMessageQueue.read(req)) { - sendErrorAndResetQueue(ETHOSU_CORE_MSG_ERR_INVALID_PAYLOAD, "NetworkInfoReq. Failed to read payload"); - break; - } - - printf("Msg: NetworkInfoReq. user_arg=0x%" PRIx64 "\n", req.user_arg); - sendNetworkInfoRsp(req.user_arg, req.network); - break; - } - default: { - char errMsg[128]; - snprintf(&errMsg[0], - sizeof(errMsg), - "Msg: Unknown type: %" PRIu32 " with payload length %" PRIu32 " bytes\n", - msg.type, - msg.length); - - sendErrorAndResetQueue(ETHOSU_CORE_MSG_ERR_UNSUPPORTED_TYPE, errMsg); - return false; - } - } - - return true; -} - -void IncomingMessageHandler::sendPong() { - if (!outputMessageQueue.write(ETHOSU_CORE_MSG_PONG)) { - printf("ERROR: Msg: Failed to write pong response. No mailbox message sent\n"); - } else { - mailbox.sendMessage(); - } -} - -void IncomingMessageHandler::sendVersionRsp() { - ethosu_core_msg_version version = { - ETHOSU_CORE_MSG_VERSION_MAJOR, - ETHOSU_CORE_MSG_VERSION_MINOR, - ETHOSU_CORE_MSG_VERSION_PATCH, - 0, - }; - - if (!outputMessageQueue.write(ETHOSU_CORE_MSG_VERSION_RSP, version)) { - printf("ERROR: Failed to write version response. No mailbox message sent\n"); - } else { - mailbox.sendMessage(); - } -} - -void IncomingMessageHandler::sendCapabilitiesRsp(uint64_t userArg) { - capabilities.user_arg = userArg; - - if (!outputMessageQueue.write(ETHOSU_CORE_MSG_CAPABILITIES_RSP, capabilities)) { - printf("ERROR: Failed to write capabilities response. No mailbox message sent\n"); - } else { - mailbox.sendMessage(); - } -} - -void IncomingMessageHandler::sendNetworkInfoRsp(uint64_t userArg, ethosu_core_network_buffer &network) { - ethosu_core_network_info_rsp rsp; - rsp.user_arg = userArg; - rsp.ifm_count = 0; - rsp.ofm_count = 0; - - void *buffer; - size_t size; - - bool failed = networks->getNetwork(network, buffer, size); - - if (!failed) { - failed = parser.parseModel(buffer, - size, - rsp.desc, - InferenceProcess::makeArray(rsp.ifm_size, rsp.ifm_count, ETHOSU_CORE_BUFFER_MAX), - InferenceProcess::makeArray(rsp.ofm_size, rsp.ofm_count, ETHOSU_CORE_BUFFER_MAX)); - } - rsp.status = failed ? ETHOSU_CORE_STATUS_ERROR : ETHOSU_CORE_STATUS_OK; - - if (!outputMessageQueue.write(ETHOSU_CORE_MSG_NETWORK_INFO_RSP, rsp)) { - printf("ERROR: Msg: Failed to write network info response. No mailbox message sent\n"); - } else { - mailbox.sendMessage(); - } -} - -void IncomingMessageHandler::sendInferenceRsp(ethosu_core_inference_rsp &rsp) { - if (!outputMessageQueue.write(ETHOSU_CORE_MSG_INFERENCE_RSP, rsp)) { - printf("ERROR: Msg: Failed to write inference response. No mailbox message sent\n"); - } else { - mailbox.sendMessage(); - } -} - -void IncomingMessageHandler::sendFailedInferenceRsp(uint64_t userArg, uint32_t status) { - ethosu_core_inference_rsp rsp; - rsp.user_arg = userArg; - rsp.status = status; - if (!outputMessageQueue.write(ETHOSU_CORE_MSG_INFERENCE_RSP, rsp)) { - printf("ERROR: Msg: Failed to write inference response. No mailbox message sent\n"); - } else { - mailbox.sendMessage(); - } -} -void IncomingMessageHandler::sendCancelInferenceRsp(uint64_t userArg, uint32_t status) { - ethosu_core_cancel_inference_rsp cancellation; - cancellation.user_arg = userArg; - cancellation.status = status; - if (!outputMessageQueue.write(ETHOSU_CORE_MSG_CANCEL_INFERENCE_RSP, cancellation)) { - printf("ERROR: Msg: Failed to write cancel inference response. No mailbox message sent\n"); - } else { - mailbox.sendMessage(); - } -} - -void IncomingMessageHandler::readCapabilties(ethosu_core_msg_capabilities_rsp &rsp) { - rsp = {}; - -#ifdef ETHOSU - struct ethosu_driver_version version; - ethosu_get_driver_version(&version); - - struct ethosu_hw_info info; - struct ethosu_driver *drv = ethosu_reserve_driver(); - ethosu_get_hw_info(drv, &info); - ethosu_release_driver(drv); - - rsp.user_arg = 0; - rsp.version_status = info.version.version_status; - rsp.version_minor = info.version.version_minor; - rsp.version_major = info.version.version_major; - rsp.product_major = info.version.product_major; - rsp.arch_patch_rev = info.version.arch_patch_rev; - rsp.arch_minor_rev = info.version.arch_minor_rev; - rsp.arch_major_rev = info.version.arch_major_rev; - rsp.driver_patch_rev = version.patch; - rsp.driver_minor_rev = version.minor; - rsp.driver_major_rev = version.major; - rsp.macs_per_cc = info.cfg.macs_per_cc; - rsp.cmd_stream_version = info.cfg.cmd_stream_version; - rsp.custom_dma = info.cfg.custom_dma; -#endif -} - -/**************************************************************************** - * InferenceHandler - ****************************************************************************/ - -InferenceHandler::InferenceHandler(uint8_t *tensorArena, - size_t arenaSize, - std::shared_ptr<Queue<EthosU::ethosu_core_inference_req>> _inferenceInputQueue, - QueueHandle_t _inferenceOutputQueue, - SemaphoreHandle_t _messageNotify, - std::shared_ptr<Networks> _networks) : - inferenceInputQueue(_inferenceInputQueue), - inferenceOutputQueue(_inferenceOutputQueue), messageNotify(_messageNotify), inference(tensorArena, arenaSize), - networks(_networks) {} - -void InferenceHandler::run() { - ethosu_core_inference_req req; - ethosu_core_inference_rsp rsp; - - while (true) { - inferenceInputQueue->pop(req); - - runInference(req, rsp); - - xQueueSend(inferenceOutputQueue, &rsp, portMAX_DELAY); - xSemaphoreGive(messageNotify); - } -} - -void InferenceHandler::runInference(ethosu_core_inference_req &req, ethosu_core_inference_rsp &rsp) { - currentReq = &req; - currentRsp = &rsp; - - /* - * Run inference - */ - - InferenceProcess::InferenceJob job; - bool failed = getInferenceJob(req, job); - - if (!failed) { - job.invalidate(); - failed = inference.runJob(job); - job.clean(); - } - -#if defined(ETHOSU) - /* - * Print PMU counters - */ - - if (!failed) { - const int numEvents = std::min(static_cast<int>(ETHOSU_PMU_Get_NumEventCounters()), ETHOSU_CORE_PMU_MAX); - - for (int i = 0; i < numEvents; i++) { - printf("ethosu_pmu_cntr%d : %" PRIu32 "\n", i, rsp.pmu_event_count[i]); - } - - if (rsp.pmu_cycle_counter_enable) { - printf("ethosu_pmu_cycle_cntr : %" PRIu64 " cycles\n", rsp.pmu_cycle_counter_count); - } - } -#endif - - /* - * Send inference response - */ - - rsp.user_arg = req.user_arg; - rsp.ofm_count = job.output.size(); - rsp.status = failed ? ETHOSU_CORE_STATUS_ERROR : ETHOSU_CORE_STATUS_OK; - - for (size_t i = 0; i < job.output.size(); ++i) { - rsp.ofm_size[i] = job.output[i].size; - } - - currentReq = nullptr; - currentRsp = nullptr; -} - -bool InferenceHandler::getInferenceJob(const ethosu_core_inference_req &req, InferenceProcess::InferenceJob &job) { - bool failed = networks->getNetwork(req.network, job.networkModel.data, job.networkModel.size); - if (failed) { - return true; - } - - for (uint32_t i = 0; i < req.ifm_count; ++i) { - job.input.push_back(InferenceProcess::DataPtr(reinterpret_cast<void *>(req.ifm[i].ptr), req.ifm[i].size)); - } - - for (uint32_t i = 0; i < req.ofm_count; ++i) { - job.output.push_back(InferenceProcess::DataPtr(reinterpret_cast<void *>(req.ofm[i].ptr), req.ofm[i].size)); - } - - job.externalContext = this; - - return false; -} - -} // namespace MessageHandler - -#if defined(ETHOSU) -extern "C" void ethosu_inference_begin(struct ethosu_driver *drv, void *userArg) { - MessageHandler::InferenceHandler *self = static_cast<MessageHandler::InferenceHandler *>(userArg); - - // Calculate maximum number of events - const int numEvents = std::min(static_cast<int>(ETHOSU_PMU_Get_NumEventCounters()), ETHOSU_CORE_PMU_MAX); - - // Enable PMU - ETHOSU_PMU_Enable(drv); - - // Configure and enable events - for (int i = 0; i < numEvents; i++) { - ETHOSU_PMU_Set_EVTYPER(drv, i, static_cast<ethosu_pmu_event_type>(self->currentReq->pmu_event_config[i])); - ETHOSU_PMU_CNTR_Enable(drv, 1 << i); - } - - // Enable cycle counter - if (self->currentReq->pmu_cycle_counter_enable) { - ETHOSU_PMU_PMCCNTR_CFG_Set_Stop_Event(drv, ETHOSU_PMU_NPU_IDLE); - ETHOSU_PMU_PMCCNTR_CFG_Set_Start_Event(drv, ETHOSU_PMU_NPU_ACTIVE); - - ETHOSU_PMU_CNTR_Enable(drv, ETHOSU_PMU_CCNT_Msk); - ETHOSU_PMU_CYCCNT_Reset(drv); - } - - // Reset all counters - ETHOSU_PMU_EVCNTR_ALL_Reset(drv); -} - -extern "C" void ethosu_inference_end(struct ethosu_driver *drv, void *userArg) { - MessageHandler::InferenceHandler *self = static_cast<MessageHandler::InferenceHandler *>(userArg); - - // Get cycle counter - self->currentRsp->pmu_cycle_counter_enable = self->currentReq->pmu_cycle_counter_enable; - if (self->currentReq->pmu_cycle_counter_enable) { - self->currentRsp->pmu_cycle_counter_count = ETHOSU_PMU_Get_CCNTR(drv); - } - - // Calculate maximum number of events - const int numEvents = std::min(static_cast<int>(ETHOSU_PMU_Get_NumEventCounters()), ETHOSU_CORE_PMU_MAX); - - // Get event counters - int i; - for (i = 0; i < numEvents; i++) { - self->currentRsp->pmu_event_config[i] = self->currentReq->pmu_event_config[i]; - self->currentRsp->pmu_event_count[i] = ETHOSU_PMU_Get_EVCNTR(drv, i); - } - - for (; i < ETHOSU_CORE_PMU_MAX; i++) { - self->currentRsp->pmu_event_config[i] = 0; - self->currentRsp->pmu_event_count[i] = 0; - } - - // Disable PMU - ETHOSU_PMU_Disable(drv); -} -#endif diff --git a/applications/message_handler/lib/message_queue.cpp b/applications/message_handler/lib/message_queue.cpp deleted file mode 100644 index 4001f8c..0000000 --- a/applications/message_handler/lib/message_queue.cpp +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Copyright (c) 2020-2022 Arm Limited. - * - * SPDX-License-Identifier: Apache-2.0 - * - * 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 - * - * 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 "message_queue.hpp" - -#include <cstddef> -#include <cstdio> -#include <cstring> -#include <inttypes.h> - -namespace MessageQueue { - -QueueImpl::QueueImpl(EthosU::ethosu_core_queue &_queue) : queue(_queue) { - cleanHeaderData(); -} - -bool QueueImpl::empty() const { - invalidateHeaderData(); - - return queue.header.read == queue.header.write; -} - -size_t QueueImpl::available() const { - invalidateHeaderData(); - - size_t avail = queue.header.write - queue.header.read; - - if (queue.header.read > queue.header.write) { - avail += queue.header.size; - } - - return avail; -} - -size_t QueueImpl::capacity() const { - return queue.header.size - available() - 1; -} - -bool QueueImpl::read(uint8_t *dst, uint32_t length) { - const uint8_t *end = dst + length; - - // Available will invalidate the cache - if (length > available()) { - return false; - } - - uint32_t rpos = queue.header.read; - - while (dst < end) { - *dst++ = queue.data[rpos]; - rpos = (rpos + 1) % queue.header.size; - } - - queue.header.read = rpos; - - cleanHeader(); - - return true; -} - -bool QueueImpl::write(const Vec *vec, size_t length) { - size_t total = 0; - - for (size_t i = 0; i < length; i++) { - total += vec[i].length; - } - - invalidateHeader(); - - if (total > capacity()) { - return false; - } - - uint32_t wpos = queue.header.write; - - for (size_t i = 0; i < length; i++) { - const uint8_t *src = reinterpret_cast<const uint8_t *>(vec[i].base); - const uint8_t *end = src + vec[i].length; - - while (src < end) { - queue.data[wpos] = *src++; - wpos = (wpos + 1) % queue.header.size; - } - } - - // Update the write position last - queue.header.write = wpos; - - cleanHeaderData(); - - return true; -} - -bool QueueImpl::write(const uint32_t type, const void *src, uint32_t length) { - EthosU::ethosu_core_msg msg = {ETHOSU_CORE_MSG_MAGIC, type, length}; - Vec vec[2] = {{&msg, sizeof(msg)}, {src, length}}; - - return write(vec, 2); -} - -// Skip to magic or end of queue -void QueueImpl::reset() { - invalidateHeader(); - queue.header.read = queue.header.write; - cleanHeader(); -} - -void QueueImpl::cleanHeader() const { -#if defined(__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U) - SCB_CleanDCache_by_Addr(reinterpret_cast<uint32_t *>(&queue.header), sizeof(queue.header)); -#endif -} - -void QueueImpl::cleanHeaderData() const { -#if defined(__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U) - SCB_CleanDCache_by_Addr(reinterpret_cast<uint32_t *>(&queue.header), sizeof(queue.header)); - uintptr_t queueDataPtr = reinterpret_cast<uintptr_t>(&queue.data[0]); - SCB_CleanDCache_by_Addr(reinterpret_cast<uint32_t *>(queueDataPtr & ~3), queue.header.size + (queueDataPtr & 3)); -#endif -} - -void QueueImpl::invalidateHeader() const { -#if defined(__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U) - SCB_InvalidateDCache_by_Addr(reinterpret_cast<uint32_t *>(&queue.header), sizeof(queue.header)); -#endif -} - -void QueueImpl::invalidateHeaderData() const { -#if defined(__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U) - SCB_InvalidateDCache_by_Addr(reinterpret_cast<uint32_t *>(&queue.header), sizeof(queue.header)); - uintptr_t queueDataPtr = reinterpret_cast<uintptr_t>(&queue.data[0]); - SCB_InvalidateDCache_by_Addr(reinterpret_cast<uint32_t *>(queueDataPtr & ~3), - queue.header.size + (queueDataPtr & 3)); -#endif -} -} // namespace MessageQueue diff --git a/applications/message_handler/main.cpp b/applications/message_handler/main.cpp deleted file mode 100644 index 4bd721e..0000000 --- a/applications/message_handler/main.cpp +++ /dev/null @@ -1,194 +0,0 @@ -/* - * Copyright (c) 2019-2022 Arm Limited. - * - * SPDX-License-Identifier: Apache-2.0 - * - * 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 - * - * 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. - */ - -/**************************************************************************** - * Includes - ****************************************************************************/ - -#include "FreeRTOS.h" -#include "queue.h" -#include "semphr.h" -#include "task.h" - -#include <inttypes.h> -#include <stdio.h> - -#include "ethosu_core_interface.h" -#include "indexed_networks.hpp" -#include "message_handler.hpp" -#include "message_queue.hpp" -#include "networks.hpp" - -#include <mailbox.hpp> -#if defined(MHU_V2) -#include <mhu_v2.hpp> -#elif defined(MHU_JUNO) -#include <mhu_juno.hpp> -#else -#include <mhu_dummy.hpp> -#endif - -/* Disable semihosting */ -__asm(".global __use_no_semihosting\n\t"); - -using namespace EthosU; -using namespace MessageHandler; - -/**************************************************************************** - * Defines - ****************************************************************************/ - -// Nr. of tasks to process inferences with, reserves driver & runs inference (Normally 1 per NPU, but not a must) -#if defined(ETHOSU) && defined(ETHOSU_NPU_COUNT) && ETHOSU_NPU_COUNT > 0 -constexpr size_t NUM_PARALLEL_TASKS = ETHOSU_NPU_COUNT; -#else -constexpr size_t NUM_PARALLEL_TASKS = 1; -#endif - -// TensorArena static initialisation -constexpr size_t arenaSize = TENSOR_ARENA_SIZE; - -__attribute__((section(".bss.tensor_arena"), aligned(16))) uint8_t tensorArena[NUM_PARALLEL_TASKS][arenaSize]; - -// Message queue from remote host -__attribute__((section("ethosu_core_in_queue"))) MessageQueue::Queue<1000> inputMessageQueue; - -// Message queue to remote host -__attribute__((section("ethosu_core_out_queue"))) MessageQueue::Queue<1000> outputMessageQueue; - -namespace { - -// Mailbox driver -#ifdef MHU_V2 -Mailbox::MHUv2 mailbox(MHU_TX_BASE_ADDRESS, MHU_RX_BASE_ADDRESS); // txBase, rxBase -#elif defined(MHU_JUNO) -Mailbox::MHUJuno mailbox(MHU_BASE_ADDRESS); -#else -Mailbox::MHUDummy mailbox; -#endif - -} // namespace - -/**************************************************************************** - * Application - ****************************************************************************/ -namespace { - -struct TaskParams { - TaskParams() : - messageNotify(xSemaphoreCreateBinary()), - inferenceInputQueue(std::make_shared<Queue<ethosu_core_inference_req>>()), - inferenceOutputQueue(xQueueCreate(5, sizeof(ethosu_core_inference_rsp))), - networks(std::make_shared<WithIndexedNetworks>()) {} - - SemaphoreHandle_t messageNotify; - // Used to pass inference requests to the inference runner task - std::shared_ptr<Queue<ethosu_core_inference_req>> inferenceInputQueue; - // Queue for message responses to the remote host - QueueHandle_t inferenceOutputQueue; - // Networks provider - std::shared_ptr<Networks> networks; -}; - -struct InferenceTaskParams { - TaskParams *taskParams; - uint8_t *arena; -}; - -#ifdef MHU_IRQ -void mailboxIrqHandler() { - mailbox.handleMessage(); -} -#endif - -void inferenceTask(void *pvParameters) { - printf("Starting inference task\n"); - InferenceTaskParams *params = reinterpret_cast<InferenceTaskParams *>(pvParameters); - - InferenceHandler process(params->arena, - arenaSize, - params->taskParams->inferenceInputQueue, - params->taskParams->inferenceOutputQueue, - params->taskParams->messageNotify, - params->taskParams->networks); - - process.run(); -} - -void messageTask(void *pvParameters) { - printf("Starting message task\n"); - TaskParams *params = reinterpret_cast<TaskParams *>(pvParameters); - - IncomingMessageHandler process(*inputMessageQueue.toQueue(), - *outputMessageQueue.toQueue(), - mailbox, - params->inferenceInputQueue, - params->inferenceOutputQueue, - params->messageNotify, - params->networks); - -#ifdef MHU_IRQ - // Register mailbox interrupt handler - NVIC_SetVector((IRQn_Type)MHU_IRQ, (uint32_t)&mailboxIrqHandler); - NVIC_EnableIRQ((IRQn_Type)MHU_IRQ); -#endif - - process.run(); -} - -/* - * Keep task parameters as global data as FreeRTOS resets the stack when the - * scheduler is started. - */ -TaskParams taskParams; -InferenceTaskParams infParams[NUM_PARALLEL_TASKS]; - -} // namespace - -// FreeRTOS application. NOTE: Additional tasks may require increased heap size. -int main() { - BaseType_t ret; - - if (!mailbox.verifyHardware()) { - printf("Failed to verify mailbox hardware\n"); - return 1; - } - - // Task for handling incoming /outgoing messages from the remote host - ret = xTaskCreate(messageTask, "messageTask", 1024, &taskParams, 2, nullptr); - if (ret != pdPASS) { - printf("Failed to create 'messageTask'\n"); - return ret; - } - - // One inference task for each NPU - for (size_t n = 0; n < NUM_PARALLEL_TASKS; n++) { - infParams[n].taskParams = &taskParams; - infParams[n].arena = reinterpret_cast<uint8_t *>(&tensorArena[n]); - ret = xTaskCreate(inferenceTask, "inferenceTask", 8 * 1024, &infParams[n], 3, nullptr); - if (ret != pdPASS) { - printf("Failed to create 'inferenceTask%d'\n", n); - return ret; - } - } - - // Start Scheduler - vTaskStartScheduler(); - - return 1; -} diff --git a/applications/message_handler/test/CMakeLists.txt b/applications/message_handler/test/CMakeLists.txt deleted file mode 100644 index 3334ff2..0000000 --- a/applications/message_handler/test/CMakeLists.txt +++ /dev/null @@ -1,62 +0,0 @@ -# -# Copyright (c) 2022 Arm Limited. -# -# SPDX-License-Identifier: Apache-2.0 -# -# 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 -# -# 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. -# - -add_subdirectory(test_message_handler) - -set(TEST_MESSAGE_HANDLER_MODEL_0 "model.h" CACHE STRING "Path to built in model 0") -set(TEST_MESSAGE_HANDLER_MODEL_1 "" CACHE STRING "Path to built in model 1") -set(TEST_MESSAGE_HANDLER_MODEL_2 "" CACHE STRING "Path to built in model 2") -set(TEST_MESSAGE_HANDLER_MODEL_3 "" CACHE STRING "Path to built in model 3") - -function(ethosu_add_message_handler_test testname) - if(TARGET ethosu_core_driver) - file(GLOB models LIST_DIRECTORIES true "${CMAKE_CURRENT_SOURCE_DIR}/../../baremetal/models/${ETHOSU_TARGET_NPU_CONFIG}/*") - endif() - - foreach(model ${models}) - get_filename_component(modelname ${model} NAME) - ethosu_add_executable_test(mh_${testname}_${modelname} - SOURCES - ${testname}.cpp - message_client.cpp - LIBRARIES - message_handler_lib - freertos_kernel) - - get_target_property(INTERFACE_LINK_LIBRARIES ethosu_target_startup INTERFACE_LINK_LIBRARIES) - if (NOT ethosu_mhu_dummy IN_LIST INTERFACE_LINK_LIBRARIES) - target_link_libraries(mh_${testname}_${modelname} PRIVATE ethosu_mhu_dummy) - endif() - - - target_include_directories(mh_${testname}_${modelname} PRIVATE - ../indexed_networks - ${model} - ${LINUX_DRIVER_STACK_PATH}/kernel) - - target_compile_definitions(mh_${testname}_${modelname} PRIVATE - TENSOR_ARENA_SIZE=${MESSAGE_HANDLER_ARENA_SIZE} - $<$<BOOL:${TEST_MESSAGE_HANDLER_MODEL_0}>:MODEL_0=${TEST_MESSAGE_HANDLER_MODEL_0}> - $<$<BOOL:${TEST_MESSAGE_HANDLER_MODEL_1}>:MODEL_1=${TEST_MESSAGE_HANDLER_MODEL_1}> - $<$<BOOL:${TEST_MESSAGE_HANDLER_MODEL_2}>:MODEL_2=${TEST_MESSAGE_HANDLER_MODEL_2}> - $<$<BOOL:${TEST_MESSAGE_HANDLER_MODEL_3}>:MODEL_3=${TEST_MESSAGE_HANDLER_MODEL_3}>) - endforeach() -endfunction() - -ethosu_add_message_handler_test(run_inference_test) -ethosu_add_message_handler_test(cancel_reject_inference_test) diff --git a/applications/message_handler/test/cancel_reject_inference_test.cpp b/applications/message_handler/test/cancel_reject_inference_test.cpp deleted file mode 100644 index 9f4f9b4..0000000 --- a/applications/message_handler/test/cancel_reject_inference_test.cpp +++ /dev/null @@ -1,255 +0,0 @@ -/* - * Copyright (c) 2022 Arm Limited. - * - * SPDX-License-Identifier: Apache-2.0 - * - * 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 - * - * 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. - */ - -/**************************************************************************** - * Includes - ****************************************************************************/ - -#include "FreeRTOS.h" -#include "queue.h" -#include "semphr.h" -#include "task.h" - -#include <inttypes.h> -#include <stdio.h> - -#include "ethosu_core_interface.h" -#include "indexed_networks.hpp" -#include "message_client.hpp" -#include "message_handler.hpp" -#include "message_queue.hpp" -#include "networks.hpp" -#include "test_assertions.hpp" -#include "test_helpers.hpp" - -#include <mailbox.hpp> -#include <mhu_dummy.hpp> - -/* Disable semihosting */ -__asm(".global __use_no_semihosting\n\t"); - -using namespace EthosU; -using namespace MessageHandler; - -/**************************************************************************** - * Defines - ****************************************************************************/ - -// TensorArena static initialisation -constexpr size_t arenaSize = TENSOR_ARENA_SIZE; - -__attribute__((section(".bss.tensor_arena"), aligned(16))) uint8_t tensorArena[arenaSize]; - -// Message queue from remote host -__attribute__((section("ethosu_core_in_queue"))) MessageQueue::Queue<1000> inputMessageQueue; - -// Message queue to remote host -__attribute__((section("ethosu_core_out_queue"))) MessageQueue::Queue<1000> outputMessageQueue; - -namespace { -Mailbox::MHUDummy mailbox; -} // namespace - -/**************************************************************************** - * Application - ****************************************************************************/ -namespace { - -struct TaskParams { - TaskParams() : - messageNotify(xSemaphoreCreateBinary()), - inferenceInputQueue(std::make_shared<Queue<ethosu_core_inference_req>>()), - inferenceOutputQueue(xQueueCreate(5, sizeof(ethosu_core_inference_rsp))), - networks(std::make_shared<WithIndexedNetworks>()) {} - - SemaphoreHandle_t messageNotify; - // Used to pass inference requests to the inference runner task - std::shared_ptr<Queue<ethosu_core_inference_req>> inferenceInputQueue; - // Queue for message responses to the remote host - QueueHandle_t inferenceOutputQueue; - // Networks provider - std::shared_ptr<Networks> networks; -}; - -void messageTask(void *pvParameters) { - printf("Starting message task\n"); - TaskParams *params = reinterpret_cast<TaskParams *>(pvParameters); - - IncomingMessageHandler process(*inputMessageQueue.toQueue(), - *outputMessageQueue.toQueue(), - mailbox, - params->inferenceInputQueue, - params->inferenceOutputQueue, - params->messageNotify, - params->networks); - process.run(); -} - -void testCancelInference(MessageClient client) { - const uint64_t fake_inference_user_arg = 42; - const uint32_t network_index = 0; - ethosu_core_inference_req inference_req = - inferenceIndexedRequest(fake_inference_user_arg, network_index, nullptr, 0, nullptr, 0); - - const uint64_t fake_cancel_inference_user_arg = 55; - ethosu_core_cancel_inference_req cancel_req = {fake_cancel_inference_user_arg, fake_inference_user_arg}; - - ethosu_core_inference_rsp inference_rsp; - ethosu_core_cancel_inference_rsp cancel_rsp; - - TEST_ASSERT(client.sendInputMessage(ETHOSU_CORE_MSG_INFERENCE_REQ, inference_req)); - TEST_ASSERT(client.sendInputMessage(ETHOSU_CORE_MSG_CANCEL_INFERENCE_REQ, cancel_req)); - - TEST_ASSERT(client.waitAndReadOutputMessage(ETHOSU_CORE_MSG_INFERENCE_RSP, inference_rsp)); - TEST_ASSERT(client.waitAndReadOutputMessage(ETHOSU_CORE_MSG_CANCEL_INFERENCE_RSP, cancel_rsp)); - - TEST_ASSERT(inference_req.user_arg == inference_rsp.user_arg); - TEST_ASSERT(inference_rsp.status == ETHOSU_CORE_STATUS_ABORTED); - - TEST_ASSERT(cancel_req.user_arg == cancel_rsp.user_arg); - TEST_ASSERT(cancel_rsp.status == ETHOSU_CORE_STATUS_OK); -} - -void testCancelNonExistentInference(MessageClient client) { - const uint64_t fake_inference_user_arg = 42; - const uint64_t fake_cancel_inference_user_arg = 55; - ethosu_core_cancel_inference_req cancel_req = {fake_cancel_inference_user_arg, fake_inference_user_arg}; - ethosu_core_cancel_inference_rsp cancel_rsp; - - TEST_ASSERT(client.sendInputMessage(ETHOSU_CORE_MSG_CANCEL_INFERENCE_REQ, cancel_req)); - TEST_ASSERT(client.waitAndReadOutputMessage(ETHOSU_CORE_MSG_CANCEL_INFERENCE_RSP, cancel_rsp)); - - TEST_ASSERT(cancel_req.user_arg == cancel_rsp.user_arg); - TEST_ASSERT(cancel_rsp.status == ETHOSU_CORE_STATUS_ERROR); -} - -void testCannotCancelRunningInference(MessageClient client, - std::shared_ptr<Queue<ethosu_core_inference_req>> inferenceInputQueue) { - const uint64_t fake_inference_user_arg = 42; - const uint32_t network_index = 0; - ethosu_core_inference_req inference_req = - inferenceIndexedRequest(fake_inference_user_arg, network_index, nullptr, 0, nullptr, 0); - - const uint64_t fake_cancel_inference_user_arg = 55; - ethosu_core_cancel_inference_req cancel_req = {fake_cancel_inference_user_arg, fake_inference_user_arg}; - ethosu_core_cancel_inference_rsp cancel_rsp; - - TEST_ASSERT(client.sendInputMessage(ETHOSU_CORE_MSG_INFERENCE_REQ, inference_req)); - - // fake start of the inference by removing the inference from the queue - ethosu_core_inference_req start_req; - inferenceInputQueue->pop(start_req); - TEST_ASSERT(inference_req.user_arg == start_req.user_arg); - - TEST_ASSERT(client.sendInputMessage(ETHOSU_CORE_MSG_CANCEL_INFERENCE_REQ, cancel_req)); - TEST_ASSERT(client.waitAndReadOutputMessage(ETHOSU_CORE_MSG_CANCEL_INFERENCE_RSP, cancel_rsp)); - - TEST_ASSERT(cancel_req.user_arg == cancel_rsp.user_arg); - TEST_ASSERT(cancel_rsp.status == ETHOSU_CORE_STATUS_ERROR); -} - -void testRejectInference(MessageClient client) { - int runs = 6; - const uint64_t fake_inference_user_arg = 42; - const uint32_t network_index = 0; - const uint64_t fake_cancel_inference_user_arg = 55; - ethosu_core_inference_req req; - ethosu_core_inference_rsp rsp; - - for (int i = 0; i < runs; i++) { - - req = inferenceIndexedRequest(fake_inference_user_arg + i, network_index, nullptr, 0, nullptr, 0); - TEST_ASSERT(client.sendInputMessage(ETHOSU_CORE_MSG_INFERENCE_REQ, req)); - vTaskDelay(150); - } - - TEST_ASSERT(client.waitAndReadOutputMessage(ETHOSU_CORE_MSG_INFERENCE_RSP, rsp)); - TEST_ASSERT(uint64_t(fake_inference_user_arg + runs - 1) == rsp.user_arg); - TEST_ASSERT(rsp.status == ETHOSU_CORE_STATUS_REJECTED); - - // let's cleanup the queue - ethosu_core_cancel_inference_req cancel_req = {0, 0}; - ethosu_core_cancel_inference_rsp cancel_rsp; - ethosu_core_inference_rsp inference_rsp; - - for (int i = 0; i < runs - 1; i++) { - cancel_req.user_arg = fake_cancel_inference_user_arg + i; - cancel_req.inference_handle = fake_inference_user_arg + i; - TEST_ASSERT(client.sendInputMessage(ETHOSU_CORE_MSG_CANCEL_INFERENCE_REQ, cancel_req)); - - TEST_ASSERT(client.waitAndReadOutputMessage(ETHOSU_CORE_MSG_INFERENCE_RSP, inference_rsp)); - TEST_ASSERT(inference_rsp.user_arg = cancel_req.inference_handle); - - TEST_ASSERT(client.waitAndReadOutputMessage(ETHOSU_CORE_MSG_CANCEL_INFERENCE_RSP, cancel_rsp)); - TEST_ASSERT(cancel_req.user_arg == cancel_rsp.user_arg); - TEST_ASSERT(cancel_rsp.status == ETHOSU_CORE_STATUS_OK); - } -} - -void clientTask(void *pvParameters) { - printf("Starting client task\n"); - TaskParams *params = reinterpret_cast<TaskParams *>(pvParameters); - - MessageClient client(*inputMessageQueue.toQueue(), *outputMessageQueue.toQueue(), mailbox); - - vTaskDelay(50); - - testCancelInference(client); - testCancelNonExistentInference(client); - testCannotCancelRunningInference(client, params->inferenceInputQueue); - testRejectInference(client); - - exit(0); -} - -/* - * Keep task parameters as global data as FreeRTOS resets the stack when the - * scheduler is started. - */ -TaskParams taskParams; - -} // namespace - -// FreeRTOS application. NOTE: Additional tasks may require increased heap size. -int main() { - BaseType_t ret; - - if (!mailbox.verifyHardware()) { - printf("Failed to verify mailbox hardware\n"); - return 1; - } - - // Task for handling incoming /outgoing messages from the remote host - ret = xTaskCreate(messageTask, "messageTask", 1024, &taskParams, 2, nullptr); - if (ret != pdPASS) { - printf("Failed to create 'messageTask'\n"); - return ret; - } - - // Task for handling incoming /outgoing messages from the remote host - ret = xTaskCreate(clientTask, "clientTask", 1024, &taskParams, 2, nullptr); - if (ret != pdPASS) { - printf("Failed to create 'messageTask'\n"); - return ret; - } - - // Start Scheduler - vTaskStartScheduler(); - - return 1; -} diff --git a/applications/message_handler/test/message_client.cpp b/applications/message_handler/test/message_client.cpp deleted file mode 100644 index 39d1392..0000000 --- a/applications/message_handler/test/message_client.cpp +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (c) 2022 Arm Limited. - * - * SPDX-License-Identifier: Apache-2.0 - * - * 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 - * - * 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 "FreeRTOS.h" -#include "task.h" - -#include "ethosu_core_interface.h" -#include "message_client.hpp" - -using namespace EthosU; - -namespace MessageHandler { - -MessageClient::MessageClient(EthosU::ethosu_core_queue &_inputMessageQueue, - EthosU::ethosu_core_queue &_outputMessageQueue, - Mailbox::Mailbox &_mailbox) : - input(_inputMessageQueue), - output(_outputMessageQueue), mailbox(_mailbox) {} - -bool MessageClient::sendInputMessage(const uint32_t type, const void *src, uint32_t length) { - if (!input.write(type, src, length)) { - printf("ERROR: Msg: Failed to write message request. No mailbox message sent\n"); - return false; - } - - mailbox.sendMessage(); - mailbox.handleMessage(); - return true; -} - -bool MessageClient::waitAndReadOutputMessage(const uint32_t expected_type, uint8_t *dst, uint32_t length) { - constexpr TickType_t delay = pdMS_TO_TICKS(5); - constexpr TickType_t deadline = pdMS_TO_TICKS(/* 1 minute */ 60 * 1000 * 1000); - struct ethosu_core_msg msg; - - TickType_t totalDelay = 0; - while (output.available() == 0) { - vTaskDelay(delay); - totalDelay += delay; - if (totalDelay >= deadline) { - return false; - } - } - - if (!output.read(msg)) { - printf("ERROR: Failed to read msg header\n"); - return false; - } - - if (msg.magic != ETHOSU_CORE_MSG_MAGIC) { - printf("ERROR: Invalid Magic\n"); - return false; - } - - if (msg.type != expected_type) { - printf("ERROR: Wrong message type. Got %" PRIu32 " expected %" PRIu32 "\n", msg.type, expected_type); - return false; - } - - if (msg.length != length) { - printf("ERROR: Wrong message size\n"); - return false; - } - - if (length == 0) { - return true; - } - - if (!output.read(dst, length)) { - printf("ERROR: Failed to read msg payload\n"); - return false; - } - - return true; -} -} // namespace MessageHandler diff --git a/applications/message_handler/test/message_client.hpp b/applications/message_handler/test/message_client.hpp deleted file mode 100644 index e90843b..0000000 --- a/applications/message_handler/test/message_client.hpp +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2022 Arm Limited. - * - * SPDX-License-Identifier: Apache-2.0 - * - * 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 - * - * 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. - */ - -#ifndef MESSAGE_CLIENT_H -#define MESSAGE_CLIENT_H - -#include <inttypes.h> -#include <stdio.h> - -#include "message_queue.hpp" -#include <mailbox.hpp> - -namespace MessageHandler { - -class MessageClient { -public: - MessageClient(EthosU::ethosu_core_queue &inputMessageQueue, - EthosU::ethosu_core_queue &outputMessageQueue, - Mailbox::Mailbox &mailbox); - - template <typename T> - bool sendInputMessage(const uint32_t type, const T &src) { - return sendInputMessage(type, reinterpret_cast<const uint8_t *>(&src), sizeof(src)); - } - bool sendInputMessage(const uint32_t type, const void *src = nullptr, uint32_t length = 0); - template <typename T> - bool waitAndReadOutputMessage(const uint32_t expected_type, T &dst) { - return waitAndReadOutputMessage(expected_type, reinterpret_cast<uint8_t *>(&dst), sizeof(dst)); - } - bool waitAndReadOutputMessage(const uint32_t expected_type, uint8_t *dst = nullptr, uint32_t length = 0); - -private: - MessageQueue::QueueImpl input; - MessageQueue::QueueImpl output; - Mailbox::Mailbox &mailbox; -}; -} // namespace MessageHandler - -#endif diff --git a/applications/message_handler/test/run_inference_test.cpp b/applications/message_handler/test/run_inference_test.cpp deleted file mode 100644 index d05224f..0000000 --- a/applications/message_handler/test/run_inference_test.cpp +++ /dev/null @@ -1,418 +0,0 @@ -/* - * Copyright (c) 2022 Arm Limited. - * - * SPDX-License-Identifier: Apache-2.0 - * - * 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 - * - * 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. - */ - -/**************************************************************************** - * Includes - ****************************************************************************/ - -#include "FreeRTOS.h" -#include "queue.h" -#include "semphr.h" -#include "task.h" - -#include <inttypes.h> -#include <stdio.h> - -#include "ethosu_core_interface.h" -#include "indexed_networks.hpp" -#include "input.h" -#include "message_client.hpp" -#include "message_handler.hpp" -#include "message_queue.hpp" -#include "networks.hpp" -#include "output.h" -#include "test_assertions.hpp" -#include "test_helpers.hpp" - -#include <mailbox.hpp> -#include <mhu_dummy.hpp> - -/* Disable semihosting */ -__asm(".global __use_no_semihosting\n\t"); - -using namespace EthosU; -using namespace MessageHandler; - -/**************************************************************************** - * Defines - ****************************************************************************/ - -// TensorArena static initialisation -constexpr size_t arenaSize = TENSOR_ARENA_SIZE; - -__attribute__((section(".bss.tensor_arena"), aligned(16))) uint8_t tensorArena[arenaSize]; - -// Message queue from remote host -__attribute__((section("ethosu_core_in_queue"))) MessageQueue::Queue<1000> inputMessageQueue; - -// Message queue to remote host -__attribute__((section("ethosu_core_out_queue"))) MessageQueue::Queue<1000> outputMessageQueue; - -namespace { -Mailbox::MHUDummy mailbox; -} // namespace - -/**************************************************************************** - * Application - ****************************************************************************/ -namespace { - -struct TaskParams { - TaskParams() : - messageNotify(xSemaphoreCreateBinary()), - inferenceInputQueue(std::make_shared<Queue<ethosu_core_inference_req>>()), - inferenceOutputQueue(xQueueCreate(5, sizeof(ethosu_core_inference_rsp))), - networks(std::make_shared<WithIndexedNetworks>()) {} - - SemaphoreHandle_t messageNotify; - // Used to pass inference requests to the inference runner task - std::shared_ptr<Queue<ethosu_core_inference_req>> inferenceInputQueue; - // Queue for message responses to the remote host - QueueHandle_t inferenceOutputQueue; - // Networks provider - std::shared_ptr<Networks> networks; -}; - -void inferenceTask(void *pvParameters) { - printf("Starting inference task\n"); - TaskParams *params = reinterpret_cast<TaskParams *>(pvParameters); - - InferenceHandler process(tensorArena, - arenaSize, - params->inferenceInputQueue, - params->inferenceOutputQueue, - params->messageNotify, - params->networks); - - process.run(); -} - -void messageTask(void *pvParameters) { - printf("Starting message task\n"); - TaskParams *params = reinterpret_cast<TaskParams *>(pvParameters); - - IncomingMessageHandler process(*inputMessageQueue.toQueue(), - *outputMessageQueue.toQueue(), - mailbox, - params->inferenceInputQueue, - params->inferenceOutputQueue, - params->messageNotify, - params->networks); - process.run(); -} - -void testPing(MessageClient client) { - TEST_ASSERT(client.sendInputMessage(ETHOSU_CORE_MSG_PING)); - TEST_ASSERT(client.waitAndReadOutputMessage(ETHOSU_CORE_MSG_PONG)); -} - -void testVersion(MessageClient client) { - ethosu_core_msg_version ver; - TEST_ASSERT(client.sendInputMessage(ETHOSU_CORE_MSG_VERSION_REQ)); - TEST_ASSERT(client.waitAndReadOutputMessage(ETHOSU_CORE_MSG_VERSION_RSP, ver)); - - TEST_ASSERT(ver.major == ETHOSU_CORE_MSG_VERSION_MAJOR); - TEST_ASSERT(ver.minor == ETHOSU_CORE_MSG_VERSION_MINOR); - TEST_ASSERT(ver.patch == ETHOSU_CORE_MSG_VERSION_PATCH); -} - -void readCapabilities(ethosu_core_msg_capabilities_rsp &rsp) { -#ifdef ETHOSU - struct ethosu_driver_version version; - ethosu_get_driver_version(&version); - - struct ethosu_hw_info info; - struct ethosu_driver *drv = ethosu_reserve_driver(); - ethosu_get_hw_info(drv, &info); - ethosu_release_driver(drv); - - rsp.version_status = info.version.version_status; - rsp.version_minor = info.version.version_minor; - rsp.version_major = info.version.version_major; - rsp.product_major = info.version.product_major; - rsp.arch_patch_rev = info.version.arch_patch_rev; - rsp.arch_minor_rev = info.version.arch_minor_rev; - rsp.arch_major_rev = info.version.arch_major_rev; - rsp.driver_patch_rev = version.patch; - rsp.driver_minor_rev = version.minor; - rsp.driver_major_rev = version.major; - rsp.macs_per_cc = info.cfg.macs_per_cc; - rsp.cmd_stream_version = info.cfg.cmd_stream_version; - rsp.custom_dma = info.cfg.custom_dma; -#endif -} - -void testCapabilities(MessageClient client) { - const uint64_t fake_user_arg = 42; - ethosu_core_capabilities_req req = {fake_user_arg}; - ethosu_core_msg_capabilities_rsp expected_rsp; - ethosu_core_msg_capabilities_rsp rsp; - - readCapabilities(expected_rsp); - expected_rsp.user_arg = req.user_arg; - - TEST_ASSERT(client.sendInputMessage(ETHOSU_CORE_MSG_CAPABILITIES_REQ, req)); - TEST_ASSERT(client.waitAndReadOutputMessage(ETHOSU_CORE_MSG_CAPABILITIES_RSP, rsp)); - - TEST_ASSERT(expected_rsp.version_status == rsp.version_status); - TEST_ASSERT(expected_rsp.version_minor == rsp.version_minor); - TEST_ASSERT(expected_rsp.version_major == rsp.version_major); - TEST_ASSERT(expected_rsp.product_major == rsp.product_major); - TEST_ASSERT(expected_rsp.arch_patch_rev == rsp.arch_patch_rev); - TEST_ASSERT(expected_rsp.arch_minor_rev == rsp.arch_minor_rev); - TEST_ASSERT(expected_rsp.arch_major_rev == rsp.arch_major_rev); - TEST_ASSERT(expected_rsp.driver_patch_rev == rsp.driver_patch_rev); - TEST_ASSERT(expected_rsp.driver_minor_rev == rsp.driver_minor_rev); - TEST_ASSERT(expected_rsp.driver_major_rev == rsp.driver_major_rev); - TEST_ASSERT(expected_rsp.macs_per_cc == rsp.macs_per_cc); - TEST_ASSERT(expected_rsp.cmd_stream_version == rsp.cmd_stream_version); - TEST_ASSERT(expected_rsp.custom_dma == rsp.custom_dma); - -#ifdef ETHOSU - TEST_ASSERT(rsp.version_status > 0); - TEST_ASSERT(rsp.product_major > 0); - TEST_ASSERT(rsp.arch_major_rev > 0 || rsp.arch_minor_rev > 0 || rsp.arch_patch_rev > 0); - TEST_ASSERT(rsp.driver_major_rev > 0 || rsp.driver_minor_rev > 0 || rsp.driver_patch_rev > 0); - TEST_ASSERT(rsp.macs_per_cc > 0); -#endif -} - -void testNetworkInfoIndex(MessageClient client) { - const uint64_t fake_user_arg = 42; - const uint32_t network_index = 0; - ethosu_core_network_info_req req = networkInfoIndexedRequest(fake_user_arg, network_index); - ethosu_core_network_info_rsp rsp; - ethosu_core_network_info_rsp expected_rsp = networkInfoResponse(fake_user_arg); - - TEST_ASSERT(client.sendInputMessage(ETHOSU_CORE_MSG_NETWORK_INFO_REQ, req)); - TEST_ASSERT(client.waitAndReadOutputMessage(ETHOSU_CORE_MSG_NETWORK_INFO_RSP, rsp)); - - TEST_ASSERT(expected_rsp.user_arg == rsp.user_arg); - TEST_ASSERT(std::strncmp(expected_rsp.desc, rsp.desc, sizeof(rsp.desc)) == 0); - TEST_ASSERT(expected_rsp.ifm_count == rsp.ifm_count); - TEST_ASSERT(expected_rsp.ofm_count == rsp.ofm_count); - TEST_ASSERT(expected_rsp.status == rsp.status); -} - -void testNetworkInfoNonExistantIndex(MessageClient client) { - const uint64_t fake_user_arg = 42; - const uint32_t network_index = 1; - ethosu_core_network_info_req req = networkInfoIndexedRequest(fake_user_arg, network_index); - ethosu_core_network_info_rsp rsp; - - TEST_ASSERT(client.sendInputMessage(ETHOSU_CORE_MSG_NETWORK_INFO_REQ, req)); - TEST_ASSERT(client.waitAndReadOutputMessage(ETHOSU_CORE_MSG_NETWORK_INFO_RSP, rsp)); - - TEST_ASSERT(fake_user_arg == rsp.user_arg); - TEST_ASSERT(ETHOSU_CORE_STATUS_ERROR == rsp.status); -} - -void testNetworkInfoBuffer(MessageClient client) { - const uint64_t fake_user_arg = 42; - uint32_t size = sizeof(Model0::networkModelData); - unsigned char *ptr = Model0::networkModelData; - ethosu_core_network_info_req req = networkInfoBufferRequest(fake_user_arg, ptr, size); - ethosu_core_network_info_rsp rsp; - ethosu_core_network_info_rsp expected_rsp = networkInfoResponse(fake_user_arg); - - TEST_ASSERT(client.sendInputMessage(ETHOSU_CORE_MSG_NETWORK_INFO_REQ, req)); - TEST_ASSERT(client.waitAndReadOutputMessage(ETHOSU_CORE_MSG_NETWORK_INFO_RSP, rsp)); - - TEST_ASSERT(expected_rsp.user_arg == rsp.user_arg); - TEST_ASSERT(std::strncmp(expected_rsp.desc, rsp.desc, sizeof(rsp.desc)) == 0); - TEST_ASSERT(expected_rsp.ifm_count == rsp.ifm_count); - TEST_ASSERT(expected_rsp.ofm_count == rsp.ofm_count); - TEST_ASSERT(expected_rsp.status == rsp.status); -} - -void testNetworkInfoUnparsableBuffer(MessageClient client) { - const uint64_t fake_user_arg = 42; - uint32_t size = sizeof(Model0::networkModelData) / 4; - unsigned char *ptr = Model0::networkModelData + size; - ethosu_core_network_info_req req = networkInfoBufferRequest(fake_user_arg, ptr, size); - ethosu_core_network_info_rsp rsp; - - TEST_ASSERT(client.sendInputMessage(ETHOSU_CORE_MSG_NETWORK_INFO_REQ, req)); - TEST_ASSERT(client.waitAndReadOutputMessage(ETHOSU_CORE_MSG_NETWORK_INFO_RSP, rsp)); - - TEST_ASSERT(42 == rsp.user_arg); - TEST_ASSERT(ETHOSU_CORE_STATUS_ERROR == rsp.status); -} - -void testInferenceRunIndex(MessageClient client) { - const uint64_t fake_user_arg = 42; - const uint32_t network_index = 0; - uint8_t data[sizeof(expectedOutputData)]; - ethosu_core_inference_req req = - inferenceIndexedRequest(fake_user_arg, network_index, inputData, sizeof(inputData), data, sizeof(data)); - ethosu_core_inference_rsp rsp; - - TEST_ASSERT(client.sendInputMessage(ETHOSU_CORE_MSG_INFERENCE_REQ, req)); - TEST_ASSERT(client.waitAndReadOutputMessage(ETHOSU_CORE_MSG_INFERENCE_RSP, rsp)); - - TEST_ASSERT(req.user_arg == rsp.user_arg); - TEST_ASSERT(rsp.ofm_count == 1); - TEST_ASSERT(std::memcmp(expectedOutputData, data, sizeof(expectedOutputData)) == 0); - TEST_ASSERT(rsp.status == ETHOSU_CORE_STATUS_OK); - TEST_ASSERT(rsp.pmu_cycle_counter_enable == req.pmu_cycle_counter_enable); - TEST_ASSERT(std::memcmp(rsp.pmu_event_config, req.pmu_event_config, sizeof(req.pmu_event_config)) == 0); -} - -void testInferenceRunNonExistingIndex(MessageClient client) { - const uint64_t fake_user_arg = 42; - const uint32_t network_index = 1; - uint8_t data[sizeof(expectedOutputData)]; - ethosu_core_inference_req req = - inferenceIndexedRequest(fake_user_arg, network_index, inputData, sizeof(inputData), data, sizeof(data)); - ethosu_core_inference_rsp rsp; - - TEST_ASSERT(client.sendInputMessage(ETHOSU_CORE_MSG_INFERENCE_REQ, req)); - TEST_ASSERT(client.waitAndReadOutputMessage(ETHOSU_CORE_MSG_INFERENCE_RSP, rsp)); - - TEST_ASSERT(req.user_arg == rsp.user_arg); - TEST_ASSERT(rsp.status == ETHOSU_CORE_STATUS_ERROR); -} - -void testInferenceRunBuffer(MessageClient client) { - const uint64_t fake_user_arg = 42; - uint32_t network_size = sizeof(Model0::networkModelData); - unsigned char *network_ptr = Model0::networkModelData; - uint8_t data[sizeof(expectedOutputData)]; - ethosu_core_inference_req req = inferenceBufferRequest( - fake_user_arg, network_ptr, network_size, inputData, sizeof(inputData), data, sizeof(data)); - ethosu_core_inference_rsp rsp; - - TEST_ASSERT(client.sendInputMessage(ETHOSU_CORE_MSG_INFERENCE_REQ, req)); - TEST_ASSERT(client.waitAndReadOutputMessage(ETHOSU_CORE_MSG_INFERENCE_RSP, rsp)); - - TEST_ASSERT(req.user_arg == rsp.user_arg); - TEST_ASSERT(rsp.ofm_count == 1); - TEST_ASSERT(std::memcmp(expectedOutputData, data, sizeof(expectedOutputData)) == 0); - TEST_ASSERT(rsp.status == ETHOSU_CORE_STATUS_OK); - TEST_ASSERT(rsp.pmu_cycle_counter_enable == req.pmu_cycle_counter_enable); - TEST_ASSERT(std::memcmp(rsp.pmu_event_config, req.pmu_event_config, sizeof(req.pmu_event_config)) == 0); -} - -void testInferenceRunUnparsableBuffer(MessageClient client) { - const uint64_t fake_user_arg = 42; - uint32_t network_size = sizeof(Model0::networkModelData) / 4; - unsigned char *network_ptr = Model0::networkModelData + network_size; - uint8_t data[sizeof(expectedOutputData)]; - ethosu_core_inference_req req = inferenceBufferRequest( - fake_user_arg, network_ptr, network_size, inputData, sizeof(inputData), data, sizeof(data)); - ethosu_core_inference_rsp rsp; - - TEST_ASSERT(client.sendInputMessage(ETHOSU_CORE_MSG_INFERENCE_REQ, req)); - TEST_ASSERT(client.waitAndReadOutputMessage(ETHOSU_CORE_MSG_INFERENCE_RSP, rsp)); - - TEST_ASSERT(req.user_arg == rsp.user_arg); - TEST_ASSERT(rsp.status == ETHOSU_CORE_STATUS_ERROR); -} - -void testSequentiallyQueuedInferenceRuns(MessageClient client) { - int runs = 5; - uint8_t data[runs][sizeof(expectedOutputData)]; - const uint64_t fake_user_arg = 42; - const uint32_t network_index = 0; - ethosu_core_inference_req req; - ethosu_core_inference_rsp rsp[runs]; - - for (int i = 0; i < runs; i++) { - vTaskDelay(150); - - req = inferenceIndexedRequest( - fake_user_arg + i, network_index, inputData, sizeof(inputData), data[i], sizeof(data[i])); - TEST_ASSERT(client.sendInputMessage(ETHOSU_CORE_MSG_INFERENCE_REQ, req)); - } - - for (int i = 0; i < runs; i++) { - TEST_ASSERT(client.waitAndReadOutputMessage(ETHOSU_CORE_MSG_INFERENCE_RSP, rsp[i])); - TEST_ASSERT(uint64_t(fake_user_arg + i) == rsp[i].user_arg); - TEST_ASSERT(rsp[i].ofm_count == 1); - TEST_ASSERT(std::memcmp(expectedOutputData, data[i], sizeof(expectedOutputData)) == 0); - TEST_ASSERT(rsp[i].status == ETHOSU_CORE_STATUS_OK); - TEST_ASSERT(rsp[i].pmu_cycle_counter_enable == req.pmu_cycle_counter_enable); - TEST_ASSERT(std::memcmp(rsp[i].pmu_event_config, req.pmu_event_config, sizeof(req.pmu_event_config)) == 0); - } -} - -void clientTask(void *) { - printf("Starting client task\n"); - - MessageClient client(*inputMessageQueue.toQueue(), *outputMessageQueue.toQueue(), mailbox); - - vTaskDelay(50); - - testPing(client); - testVersion(client); - testCapabilities(client); - testNetworkInfoIndex(client); - testNetworkInfoNonExistantIndex(client); - testNetworkInfoBuffer(client); - testNetworkInfoUnparsableBuffer(client); - testInferenceRunIndex(client); - testInferenceRunNonExistingIndex(client); - testInferenceRunBuffer(client); - testInferenceRunUnparsableBuffer(client); - testSequentiallyQueuedInferenceRuns(client); - - exit(0); -} - -/* - * Keep task parameters as global data as FreeRTOS resets the stack when the - * scheduler is started. - */ -TaskParams taskParams; - -} // namespace - -// FreeRTOS application. NOTE: Additional tasks may require increased heap size. -int main() { - BaseType_t ret; - - if (!mailbox.verifyHardware()) { - printf("Failed to verify mailbox hardware\n"); - return 1; - } - - // Task for handling incoming /outgoing messages from the remote host - ret = xTaskCreate(messageTask, "messageTask", 1024, &taskParams, 2, nullptr); - if (ret != pdPASS) { - printf("Failed to create 'messageTask'\n"); - return ret; - } - - ret = xTaskCreate(inferenceTask, "inferenceTask", 8 * 1024, &taskParams, 3, nullptr); - if (ret != pdPASS) { - printf("Failed to create 'inferenceTask'\n"); - return ret; - } - - // Task for handling incoming /outgoing messages from the remote host - ret = xTaskCreate(clientTask, "clientTask", 1024, nullptr, 2, nullptr); - if (ret != pdPASS) { - printf("Failed to create 'messageTask'\n"); - return ret; - } - - // Start Scheduler - vTaskStartScheduler(); - - return 1; -} diff --git a/applications/message_handler/test/test_assertions.hpp b/applications/message_handler/test/test_assertions.hpp deleted file mode 100644 index 7c4cb5c..0000000 --- a/applications/message_handler/test/test_assertions.hpp +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2022 Arm Limited. - * - * SPDX-License-Identifier: Apache-2.0 - * - * 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 - * - * 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. - */ - -#ifndef TEST_ASSERTIONS_H -#define TEST_ASSERTIONS_H - -#include <stddef.h> -#include <stdio.h> - -#define TEST_ASSERT(v) \ - do { \ - if (!(v)) { \ - fprintf(stderr, "%s:%d ERROR test failed: '%s'\n", __FILE__, __LINE__, #v); \ - exit(1); \ - } \ - } while (0) - -#endif diff --git a/applications/message_handler/test/test_helpers.hpp b/applications/message_handler/test/test_helpers.hpp deleted file mode 100644 index 0440b58..0000000 --- a/applications/message_handler/test/test_helpers.hpp +++ /dev/null @@ -1,131 +0,0 @@ - -/* - * Copyright (c) 2022 Arm Limited. - * - * SPDX-License-Identifier: Apache-2.0 - * - * 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 - * - * 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. - */ - -#ifndef TEST_HELPERS_H -#define TEST_HELPERS_H - -#include <inttypes.h> -#include <stdio.h> - -#include "ethosu_core_interface.h" - -namespace MessageHandler { - -ethosu_core_network_info_req networkInfoIndexedRequest(uint64_t user_arg, uint32_t index) { - ethosu_core_network_info_req req = {user_arg, // user_arg - { // network - ETHOSU_CORE_NETWORK_INDEX, // type - {{ - index, // index - 0 // ignored padding of union - }}}}; - return req; -} - -ethosu_core_network_info_req networkInfoBufferRequest(uint64_t user_arg, unsigned char *ptr, uint32_t ptr_size) { - ethosu_core_network_info_req req = {user_arg, // user_arg - { // network - ETHOSU_CORE_NETWORK_BUFFER, // type - {{ - reinterpret_cast<uint32_t>(ptr), // ptr - ptr_size // size - }}}}; - return req; -} - -ethosu_core_network_info_rsp networkInfoResponse(uint64_t user_arg) { - ethosu_core_network_info_rsp rsp = { - user_arg, // user_arg - "Vela Optimised", // description - 1, // ifm_count - {/* not comparable */}, // ifm_sizes - 1, // ofm_count - {/* not comparable */}, // ofm_sizes - ETHOSU_CORE_STATUS_OK // status - }; - return rsp; -} - -ethosu_core_inference_req inferenceIndexedRequest(uint64_t user_arg, - uint32_t index, - unsigned char *input_data, - uint32_t input_data_size, - uint8_t *output_data, - uint32_t output_data_size) { - ethosu_core_inference_req req = { - user_arg, // user_arg - 1, // ifm_count - { // ifm - { - reinterpret_cast<uint32_t>(input_data), // ptr - input_data_size // size - }}, - 1, // ofm_count - { // ofm - { - reinterpret_cast<uint32_t>(output_data), // ptr - output_data_size // size - }}, - { // network - ETHOSU_CORE_NETWORK_INDEX, // type - {{ - index, // index - 0 // ignored padding of union - }}}, - {0, 0, 0, 0, 0, 0, 0, 0}, // pmu_event_config - 0 // pmu_cycle_counter_enable - }; - return req; -} - -ethosu_core_inference_req inferenceBufferRequest(uint64_t user_arg, - unsigned char *ptr, - uint32_t ptr_size, - unsigned char *input_data, - uint32_t input_data_size, - uint8_t *output_data, - uint32_t output_data_size) { - ethosu_core_inference_req req = { - user_arg, // user_arg - 1, // ifm_count - { // ifm - { - reinterpret_cast<uint32_t>(input_data), // ptr - input_data_size // size - }}, - 1, // ofm_count - { // ofm - { - reinterpret_cast<uint32_t>(output_data), // ptr - output_data_size // size - }}, - { // network - ETHOSU_CORE_NETWORK_BUFFER, // type - {{ - reinterpret_cast<uint32_t>(ptr), // ptr - ptr_size // size - }}}, - {0, 0, 0, 0, 0, 0, 0, 0}, // pmu_event_config - 0 // pmu_cycle_counter_enable - }; - return req; -} -} // namespace MessageHandler - -#endif diff --git a/applications/message_handler/test/test_message_handler/CMakeLists.txt b/applications/message_handler/test/test_message_handler/CMakeLists.txt deleted file mode 100644 index bdccf54..0000000 --- a/applications/message_handler/test/test_message_handler/CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2020-2022 Arm Limited. -# -# SPDX-License-Identifier: Apache-2.0 -# -# 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 -# -# 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. -# - -if(NOT BUILD_TEST_MESSAGE_HANDLER OR NOT TARGET freertos_kernel) - message("Skipping test message handler") - return() -endif() - -ethosu_add_executable(test_message_handler - SOURCES - main.cpp - LIBRARIES - message_handler_lib - freertos_kernel) - -target_include_directories(test_message_handler PRIVATE - ../../indexed_networks - ${LINUX_DRIVER_STACK_PATH}/kernel) - -install(FILES $<TARGET_FILE:test_message_handler> - DESTINATION "lib/firmware" - RENAME "arm-test-${ETHOSU_TARGET_NPU_CONFIG}.fw" -) diff --git a/applications/message_handler/test/test_message_handler/main.cpp b/applications/message_handler/test/test_message_handler/main.cpp deleted file mode 100644 index 0a83a56..0000000 --- a/applications/message_handler/test/test_message_handler/main.cpp +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Copyright (c) 2019-2022 Arm Limited. - * - * SPDX-License-Identifier: Apache-2.0 - * - * 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 - * - * 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. - */ - -/**************************************************************************** - * Includes - ****************************************************************************/ - -#include "FreeRTOS.h" -#include "queue.h" -#include "semphr.h" -#include "task.h" - -#include <inttypes.h> -#include <stdio.h> - -#include "ethosu_core_interface.h" -#include "indexed_networks.hpp" -#include "message_handler.hpp" -#include "message_queue.hpp" -#include "networks.hpp" - -#include <mailbox.hpp> -#if defined(MHU_V2) -#include <mhu_v2.hpp> -#elif defined(MHU_JUNO) -#include <mhu_juno.hpp> -#else -#include <mhu_dummy.hpp> -#endif - -/* Disable semihosting */ -__asm(".global __use_no_semihosting\n\t"); - -using namespace EthosU; -using namespace MessageHandler; - -/**************************************************************************** - * Defines - ****************************************************************************/ - -// Message queue from remote host -__attribute__((section("ethosu_core_in_queue"))) MessageQueue::Queue<1000> inputMessageQueue; - -// Message queue to remote host -__attribute__((section("ethosu_core_out_queue"))) MessageQueue::Queue<1000> outputMessageQueue; - -namespace { - -// Mailbox driver -#ifdef MHU_V2 -Mailbox::MHUv2 mailbox(MHU_TX_BASE_ADDRESS, MHU_RX_BASE_ADDRESS); // txBase, rxBase -#elif defined(MHU_JUNO) -Mailbox::MHUJuno mailbox(MHU_BASE_ADDRESS); -#else -Mailbox::MHUDummy mailbox; -#endif - -} // namespace - -/**************************************************************************** - * Application - ****************************************************************************/ -namespace { - -struct TaskParams { - TaskParams() : - messageNotify(xSemaphoreCreateBinary()), - inferenceInputQueue(std::make_shared<Queue<ethosu_core_inference_req>>()), - inferenceOutputQueue(xQueueCreate(10, sizeof(ethosu_core_inference_rsp))), - networks(std::make_shared<WithIndexedNetworks>()) {} - - SemaphoreHandle_t messageNotify; - // Used to pass inference requests to the inference runner task - std::shared_ptr<Queue<ethosu_core_inference_req>> inferenceInputQueue; - // Queue for message responses to the remote host - QueueHandle_t inferenceOutputQueue; - // Networks provider - std::shared_ptr<Networks> networks; -}; - -#ifdef MHU_IRQ -void mailboxIrqHandler() { - mailbox.handleMessage(); -} -#endif - -void messageTask(void *pvParameters) { - printf("Starting message task\n"); - TaskParams *params = reinterpret_cast<TaskParams *>(pvParameters); - - IncomingMessageHandler process(*inputMessageQueue.toQueue(), - *outputMessageQueue.toQueue(), - mailbox, - params->inferenceInputQueue, - params->inferenceOutputQueue, - params->messageNotify, - params->networks); - -#ifdef MHU_IRQ - // Register mailbox interrupt handler - NVIC_SetVector((IRQn_Type)MHU_IRQ, (uint32_t)&mailboxIrqHandler); - NVIC_EnableIRQ((IRQn_Type)MHU_IRQ); -#endif - - process.run(); -} - -/* - * Keep task parameters as global data as FreeRTOS resets the stack when the - * scheduler is started. - */ -TaskParams taskParams; - -} // namespace - -// FreeRTOS application. NOTE: Additional tasks may require increased heap size. -int main() { - BaseType_t ret; - - if (!mailbox.verifyHardware()) { - printf("Failed to verify mailbox hardware\n"); - return 1; - } - - // Task for handling incoming /outgoing messages from the remote host - ret = xTaskCreate(messageTask, "messageTask", 1024, &taskParams, 2, nullptr); - if (ret != pdPASS) { - printf("Failed to create 'messageTask'\n"); - return ret; - } - - // Start Scheduler - vTaskStartScheduler(); - - return 1; -} |