aboutsummaryrefslogtreecommitdiff
path: root/applications
diff options
context:
space:
mode:
authorKristofer Jonsson <kristofer.jonsson@arm.com>2021-02-25 09:49:34 +0100
committerKristofer Jonsson <kristofer.jonsson@arm.com>2021-02-25 14:38:59 +0100
commit715c07b06aa3462ceeef38b777e8526d3bffe472 (patch)
treed70433b2fb574adc20bd9cecfc1b3545cb6bcb7b /applications
parent81e01af108cd006e0e12aacd2b2a0bb1a0ce8684 (diff)
downloadethos-u-core-platform-715c07b06aa3462ceeef38b777e8526d3bffe472.tar.gz
Adding CTest script21.02
Adding script to run CTest on the Corstone-300 FVP. The script will detect which version of the FVP that is used and pass the correct command line arguments. Updating README with instructions how to run tests, either using CTest or calling the FVP directly. Update FreeRTOS example to exit with the status of the inference. Minor adjustments are needed to the output vectors. Change-Id: I8a1a740b0dec2ce35d95e5c5d91f4b57a2c8e1fa
Diffstat (limited to 'applications')
-rw-r--r--applications/freertos/main.cpp2
-rw-r--r--applications/freertos/output.h4
-rw-r--r--applications/trustzone_inference/CMakeLists.txt2
-rw-r--r--applications/trustzone_inference/secure/output.h4
4 files changed, 6 insertions, 6 deletions
diff --git a/applications/freertos/main.cpp b/applications/freertos/main.cpp
index 235936e..4e58646 100644
--- a/applications/freertos/main.cpp
+++ b/applications/freertos/main.cpp
@@ -143,7 +143,7 @@ void inferenceJobTask(void *pvParameters) {
xQueueReceive(senderQueue, &j, portMAX_DELAY);
printf("Received inference job response. status=%u\n", j->status);
- exit(0);
+ exit(j->status);
}
} // namespace
diff --git a/applications/freertos/output.h b/applications/freertos/output.h
index d5b87eb..48380b4 100644
--- a/applications/freertos/output.h
+++ b/applications/freertos/output.h
@@ -46,7 +46,7 @@ uint8_t expectedData[1001] __attribute__((aligned(4), section("expected_output_d
0x42, 0x3f, 0x49, 0x3e, 0x4d, 0x4a, 0x48, 0x48, 0x3e, 0x41, 0x34, 0x39,
0x34, 0x41, 0x35, 0x39, 0x59, 0x4f, 0x3f, 0x40, 0x42, 0x32, 0x3d, 0x34,
0x3a, 0x34, 0x34, 0x33, 0x2e, 0x3a, 0x2e, 0x28, 0x28, 0x3b, 0x33, 0x33,
- 0x32, 0x32, 0x32, 0x2d, 0x2b, 0x37, 0x3c, 0x39, 0x28, 0x39, 0x3a, 0x32,
+ 0x32, 0x32, 0x32, 0x2d, 0x2b, 0x37, 0x3c, 0x39, 0x28, 0x39, 0x39, 0x32,
0x39, 0x2b, 0x3d, 0x41, 0x44, 0x2d, 0x35, 0x45, 0x47, 0x2e, 0x2a, 0x37,
0x34, 0x34, 0x3c, 0x34, 0x30, 0x28, 0x27, 0x39, 0x2d, 0x34, 0x35, 0x2e,
0x2f, 0x2a, 0x3e, 0x3c, 0x2c, 0x2a, 0x3d, 0x45, 0x48, 0x35, 0x3e, 0x29,
@@ -99,6 +99,6 @@ uint8_t expectedData[1001] __attribute__((aligned(4), section("expected_output_d
0x37, 0x47, 0x48, 0x45, 0x43, 0x44, 0x42, 0x42, 0x39, 0x37, 0x2d, 0x52,
0x38, 0x2d, 0x41, 0x32, 0x29, 0x30, 0x1f, 0x54, 0x41, 0x53, 0x3e, 0x2b,
0x74, 0x52, 0x52, 0x45, 0x41, 0x45, 0x4f, 0x53, 0x3a, 0x58, 0x4f, 0x32,
- 0x53, 0x58, 0x50, 0x38, 0x3f, 0x40, 0x3d, 0x34, 0x43, 0x39, 0x3a, 0x26,
+ 0x53, 0x58, 0x50, 0x38, 0x3f, 0x40, 0x3d, 0x34, 0x43, 0x39, 0x39, 0x26,
0x2d, 0x3b, 0x2b, 0x37, 0x63
};
diff --git a/applications/trustzone_inference/CMakeLists.txt b/applications/trustzone_inference/CMakeLists.txt
index 2caf983..f23c7f6 100644
--- a/applications/trustzone_inference/CMakeLists.txt
+++ b/applications/trustzone_inference/CMakeLists.txt
@@ -36,4 +36,4 @@ add_dependencies(trustzone trustzone_secure nonsecure_binary)
ethosu_add_test(trustzone_secure
NAME trustzone
- COMMAND ${ETHOSU_COMMAND_DEFAULT} --data ${CMAKE_CURRENT_BINARY_DIR}/nonsecure/ns_bin@0x7c000)
+ COMMAND ${ETHOSU_COMMAND_DEFAULT} -- --data ${CMAKE_CURRENT_BINARY_DIR}/nonsecure/ns_bin@0x7c000)
diff --git a/applications/trustzone_inference/secure/output.h b/applications/trustzone_inference/secure/output.h
index d5b87eb..48380b4 100644
--- a/applications/trustzone_inference/secure/output.h
+++ b/applications/trustzone_inference/secure/output.h
@@ -46,7 +46,7 @@ uint8_t expectedData[1001] __attribute__((aligned(4), section("expected_output_d
0x42, 0x3f, 0x49, 0x3e, 0x4d, 0x4a, 0x48, 0x48, 0x3e, 0x41, 0x34, 0x39,
0x34, 0x41, 0x35, 0x39, 0x59, 0x4f, 0x3f, 0x40, 0x42, 0x32, 0x3d, 0x34,
0x3a, 0x34, 0x34, 0x33, 0x2e, 0x3a, 0x2e, 0x28, 0x28, 0x3b, 0x33, 0x33,
- 0x32, 0x32, 0x32, 0x2d, 0x2b, 0x37, 0x3c, 0x39, 0x28, 0x39, 0x3a, 0x32,
+ 0x32, 0x32, 0x32, 0x2d, 0x2b, 0x37, 0x3c, 0x39, 0x28, 0x39, 0x39, 0x32,
0x39, 0x2b, 0x3d, 0x41, 0x44, 0x2d, 0x35, 0x45, 0x47, 0x2e, 0x2a, 0x37,
0x34, 0x34, 0x3c, 0x34, 0x30, 0x28, 0x27, 0x39, 0x2d, 0x34, 0x35, 0x2e,
0x2f, 0x2a, 0x3e, 0x3c, 0x2c, 0x2a, 0x3d, 0x45, 0x48, 0x35, 0x3e, 0x29,
@@ -99,6 +99,6 @@ uint8_t expectedData[1001] __attribute__((aligned(4), section("expected_output_d
0x37, 0x47, 0x48, 0x45, 0x43, 0x44, 0x42, 0x42, 0x39, 0x37, 0x2d, 0x52,
0x38, 0x2d, 0x41, 0x32, 0x29, 0x30, 0x1f, 0x54, 0x41, 0x53, 0x3e, 0x2b,
0x74, 0x52, 0x52, 0x45, 0x41, 0x45, 0x4f, 0x53, 0x3a, 0x58, 0x4f, 0x32,
- 0x53, 0x58, 0x50, 0x38, 0x3f, 0x40, 0x3d, 0x34, 0x43, 0x39, 0x3a, 0x26,
+ 0x53, 0x58, 0x50, 0x38, 0x3f, 0x40, 0x3d, 0x34, 0x43, 0x39, 0x39, 0x26,
0x2d, 0x3b, 0x2b, 0x37, 0x63
};