aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Moberg <anton.moberg@arm.com>2021-02-10 08:45:39 +0100
committerKristofer Jonsson <kristofer.jonsson@arm.com>2021-02-15 08:57:46 +0000
commit1a679c4116484c1e2912d948b0784ac5b55d1c52 (patch)
tree97329ce0a7be1c7ce72fe7fee62f4aaadb98c1b3
parent174e98d38a70251b554702a8d5ad733506f994ef (diff)
downloadethos-u-core-platform-1a679c4116484c1e2912d948b0784ac5b55d1c52.tar.gz
core_platform - TensorArena move21.02-rc2
Moved the initialisation of the TensorArena from inference_process.cpp in core_software to application level. Change-Id: Id2f8361b19241b4251e2ce90b4f330d32734e801
-rw-r--r--applications/freertos/main.cpp6
-rw-r--r--targets/corstone-300/retarget.c13
2 files changed, 12 insertions, 7 deletions
diff --git a/applications/freertos/main.cpp b/applications/freertos/main.cpp
index 095af50..b926d1e 100644
--- a/applications/freertos/main.cpp
+++ b/applications/freertos/main.cpp
@@ -39,6 +39,10 @@ using namespace InferenceProcess;
* InferenceJob
****************************************************************************/
+#define TENSOR_ARENA_SIZE 200000
+
+__attribute__((section(".bss.NoInit"), aligned(16))) uint8_t inferenceProcessTensorArena[TENSOR_ARENA_SIZE];
+
namespace {
struct xInferenceJob : public InferenceJob {
@@ -197,7 +201,7 @@ uint8_t expectedData[] = {
void inferenceProcessTask(void *pvParameters) {
QueueHandle_t queue = reinterpret_cast<QueueHandle_t>(pvParameters);
- class InferenceProcess inferenceProcess;
+ class InferenceProcess inferenceProcess(inferenceProcessTensorArena, TENSOR_ARENA_SIZE);
while (true) {
xInferenceJob *job;
diff --git a/targets/corstone-300/retarget.c b/targets/corstone-300/retarget.c
index d53431f..b83ac40 100644
--- a/targets/corstone-300/retarget.c
+++ b/targets/corstone-300/retarget.c
@@ -184,7 +184,7 @@ char *RETARGET(_command_string)(char *cmd, int len) {
void RETARGET(_exit)(int return_code) {
char exit_code_buffer[64] = {0};
- const char *p = exit_code_buffer;
+ const char *p = exit_code_buffer;
/* Print out the exit code on the uart so any reader know how we exit. */
/* By appending 0x04, ASCII for end-of-transmission the FVP model exits,
@@ -194,11 +194,12 @@ void RETARGET(_exit)(int return_code) {
* uart when starting the model so that is added last as well.
*/
- snprintf(exit_code_buffer, sizeof(exit_code_buffer),
- "Application exit code: %d.\n" // Let the readers know how we exit
- "\04\n" // end-of-transmission
- "EXITTHESIM\n", // shutdown_tag
- return_code);
+ snprintf(exit_code_buffer,
+ sizeof(exit_code_buffer),
+ "Application exit code: %d.\n" // Let the readers know how we exit
+ "\04\n" // end-of-transmission
+ "EXITTHESIM\n", // shutdown_tag
+ return_code);
while (*p != '\0') {
uart_putc(*p++);