tidied delegate_runner output

Signed-off-by: Rob Elliott <[email protected]>

Author: robell

examples/backend/arm/ethos-u-setup/core_platform/patches/0007-Add-delegate-runner-test.patch

@@ -1,4 +1,4 @@
-From 8201e36f90fed6e80fea7021ec4bad325d329bae Mon Sep 17 00:00:00 2001
+From 0fe8caba3068da05021232912c069124a81e0d94 Mon Sep 17 00:00:00 2001
 From: Rob Elliott <[email protected]>
 Date: Wed, 4 Oct 2023 13:31:33 +0000
 Subject: [PATCH] Add delegate runner test
@@ -7,9 +7,9 @@ Signed-off-by: Rob Elliott <[email protected]>
 ---
  applications/executorch_tests/CMakeLists.txt  |  27 ++-
  .../executorch_tests/pte_to_header.py         |  11 +-
- .../executorch_tests/runner_delegate.cpp      | 162 ++++++++++++++++++
+ .../executorch_tests/runner_delegate.cpp      | 160 ++++++++++++++++++
  cmake/toolchain/arm-none-eabi-gcc.cmake       |   6 +-
- 4 files changed, 197 insertions(+), 9 deletions(-)
+ 4 files changed, 195 insertions(+), 9 deletions(-)
  create mode 100644 applications/executorch_tests/runner_delegate.cpp
 
 diff --git a/applications/executorch_tests/CMakeLists.txt b/applications/executorch_tests/CMakeLists.txt
@@ -116,10 +116,10 @@ index 37d88aa..be3282d 100644
  with open(args.pte, "rb") as fr, open(
 diff --git a/applications/executorch_tests/runner_delegate.cpp b/applications/executorch_tests/runner_delegate.cpp
 new file mode 100644
-index 0000000..6af6a92
+index 0000000..ff40084
 --- /dev/null
 +++ b/applications/executorch_tests/runner_delegate.cpp
-@@ -0,0 +1,162 @@
+@@ -0,0 +1,160 @@
 +/*
 + * SPDX-FileCopyrightText: Copyright 2021-2023 Arm Limited and/or its affiliates <[email protected]>
 + *
@@ -167,12 +167,12 @@ index 0000000..6af6a92
 +void et_pal_init(void) {}
 +
 +__ET_NORETURN void et_pal_abort(void) {
-+	__builtin_trap();
++    __builtin_trap();
 +}
 +
 +et_timestamp_t et_pal_current_ticks(void) {
-+	// libc.a - warning: _gettimeofday is not implemented and will always fail
-+	return 11223344;
++    // libc.a - warning: _gettimeofday is not implemented and will always fail
++    return 11223344;
 +}
 +
 +/**
@@ -186,46 +186,45 @@ index 0000000..6af6a92
 +    size_t line,
 +    const char* message,
 +    __ET_UNUSED size_t length) {
-+	fprintf(
-+		stderr,
-+		"%c executorch:%s:%zu] %s\n",
-+		level,
-+		filename,
-+		line,
-+		message);
++    fprintf(
++        stderr,
++        "%c executorch:%s:%zu] %s\n",
++        level,
++        filename,
++        line,
++        message);
 +}
 +
 +int main()
 +{
-+	printf("test test test NG ^2 22\n");
-+	printf("main: Initialising runtime\n");
++    ET_LOG(Info, "Initialising runtime");
 +    torch::executor::runtime_init();
 +
 +    using torch::executor::Result;
 +    using torch::executor::Error;
 +
-+	// Load pte from the global model_pte .pte file loaded into SRAM.
++    // Load pte from the global model_pte .pte file loaded into SRAM.
 +    auto loader = torch::executor::util::BufferDataLoader(model_pte, sizeof(model_pte));
 +    Result<torch::executor::Program> program = torch::executor::Program::load(&loader);
 +    if(!program.ok()) {
-+		printf("main: Program loading failed @ 0x%p: 0x%x", model_pte, (int)program.error());
++        ET_LOG(Info, "Program loading failed @ 0x%p: 0x%x", model_pte, (int)program.error());
 +    }
-+    printf("main: Model buffer loaded, has %u methods\n", program->num_methods());
++    ET_LOG(Info, "Model buffer loaded, has %u methods", program->num_methods());
 +
-+	// Find our entrypoint in the .pte program
++    // Find our entrypoint in the .pte program
 +    const char* method_name = nullptr;
-+	const auto method_name_result = program->get_method_name(0);
-+	ET_CHECK_MSG(method_name_result.ok(), "Program has no methods");
-+	method_name = *method_name_result;
-+    printf("main: Found (and will run) method '%s'\n", method_name);
++    const auto method_name_result = program->get_method_name(0);
++    ET_CHECK_MSG(method_name_result.ok(), "Program has no methods");
++    method_name = *method_name_result;
++    ET_LOG(Info, "Found (and will run) method '%s'", method_name);
 +
-+	// Allocate necessary memories for this method
++    // Allocate necessary memories for this method
 +    Result<torch::executor::MethodMeta> method_meta = program->method_meta(method_name);
 +    if (!method_meta.ok()) {
-+        printf("main: Failed to get method_meta for %s: 0x%x",
++        ET_LOG(Info, "Failed to get method_meta for %s: 0x%x",
 +                method_name, (unsigned int)method_meta.error());
 +    }
-+	
++    
 +    torch::executor::MemoryAllocator method_allocator{
 +        torch::executor::MemoryAllocator(sizeof(method_allocator_pool), method_allocator_pool)};
 +
@@ -235,7 +234,7 @@ index 0000000..6af6a92
 +
 +    for (size_t id = 0; id < num_memory_planned_buffers; ++id) {
 +        size_t buffer_size = static_cast<size_t>(method_meta->memory_planned_buffer_size(id).get());
-+        printf("main: Setting up planned buffer %zu, size %zu.\n", id, buffer_size);
++        ET_LOG(Info, "Setting up planned buffer %zu, size %zu.", id, buffer_size);
 +
 +        planned_buffers.push_back(std::make_unique<uint8_t[]>(buffer_size));
 +        planned_spans.push_back({planned_buffers.back().get(), buffer_size});
@@ -249,36 +248,35 @@ index 0000000..6af6a92
 +    Result<torch::executor::Method> method = program->load_method(method_name, &memory_manager);
 +
 +    if(!method.ok()) {
-+        printf("main: Loading of method %s failed with status 0x%x\n", method_name, (int)method.error());
++        ET_LOG(Info, "Loading of method %s failed with status 0x%x", method_name, (int)method.error());
 +    }
-+	printf("main: Loading of method '%s' succesful\n", method_name);
++    ET_LOG(Info, "Loading of method '%s' succesful", method_name);
 +
-+    printf("main: Preparing inputs...\n");
 +    auto inputs = torch::executor::util::PrepareInputTensors(*method);
 +
-+    printf("main: Starting the model execution...\n");
++    ET_LOG(Info, "Starting the model execution...");
 +    Error status = method->execute();
 +    if(status != Error::Ok){
-+        printf("main: Execution of method %s failed with status 0x%x\n", method_name, (int)status);
++        ET_LOG(Info, "Execution of method %s failed with status 0x%x", method_name, (int)status);
 +    } else {
-+        printf("main: Model executed successfully.\n");
++        ET_LOG(Info, "Model executed successfully.");
 +    }
 +
 +    // Print the outputs.
 +    std::vector<torch::executor::EValue> outputs(method->outputs_size());
-+    printf("main: %d outputs - ", outputs.size());
++    ET_LOG(Info, "%d outputs - ", outputs.size());
 +    status = method->get_outputs(outputs.data(), outputs.size());
 +    ET_CHECK(status == Error::Ok);
 +    for (size_t i = 0; i < outputs.size(); ++i)
-+	{
-+		printf("main: Output %d numel %d\n", i, outputs[i].toTensor().numel());
-+		for (size_t j = 0; j < outputs[i].toTensor().numel(); ++j)
-+		{
-+			printf("main:   Output[%d]: %d\n", j, outputs[i].toTensor().const_data_ptr<int>()[j]);
-+		}
++    {
++        ET_LOG(Info, "Output %d numel %d", i, outputs[i].toTensor().numel());
++        for (size_t j = 0; j < outputs[i].toTensor().numel(); ++j)
++        {
++            ET_LOG(Info, "   Output[%d]: %d", j, outputs[i].toTensor().const_data_ptr<int>()[j]);
++        }
 +    }
 +
-+	return 0;
++    return 0;
 +}
 +
 +