diff options
author | Cisco Cervellera <cisco.cervellera@arm.com> | 2021-08-02 09:32:07 +0100 |
---|---|---|
committer | Isabella Gottardi <isabella.gottardi@arm.com> | 2021-08-03 16:10:16 +0100 |
commit | f085fa5a2859178741f39563b4d9d68ca41d916a (patch) | |
tree | 62fd8411c63a853be4c32683a3ada0b6affb0399 /source | |
parent | 81c4c9178598e5c26af7373eca67842a8fe4179f (diff) | |
download | ml-embedded-evaluation-kit-f085fa5a2859178741f39563b4d9d68ca41d916a.tar.gz |
MLECO-2051: Work with Corstone-300 + Ethos-U65
Change-Id: I64ab930a1de5210f435f91bed7600a700581946f
Signed-off-by: Isabella Gottardi <isabella.gottardi@arm.com>
Reviewed-on: https://eu-gerrit-2.euhpc.arm.com/c/ml/ecosystem/ml-embedded-evaluation-kit/+/459126
Tested-by: mlecosys <mlecosys@arm.com>
Tested-by: George Gekov <george.gekov@arm.com>
Reviewed-by: George Gekov <george.gekov@arm.com>
Reviewed-by: Kshitij Sisodia <kshitij.sisodia@arm.com>
Diffstat (limited to 'source')
-rw-r--r-- | source/application/hal/hal.c | 32 | ||||
-rw-r--r-- | source/use_case/ad/usecase.cmake | 2 | ||||
-rw-r--r-- | source/use_case/asr/usecase.cmake | 2 | ||||
-rw-r--r-- | source/use_case/img_class/usecase.cmake | 2 | ||||
-rw-r--r-- | source/use_case/inference_runner/usecase.cmake | 2 | ||||
-rw-r--r-- | source/use_case/kws/usecase.cmake | 2 | ||||
-rw-r--r-- | source/use_case/kws_asr/usecase.cmake | 2 |
7 files changed, 22 insertions, 22 deletions
diff --git a/source/application/hal/hal.c b/source/application/hal/hal.c index 2ce2684..1515697 100644 --- a/source/application/hal/hal.c +++ b/source/application/hal/hal.c @@ -24,14 +24,14 @@ #if defined(ARM_NPU) -#include "ethosu_driver.h" /* Arm Ethos-U55 driver header */ -#include "timing_adapter.h" /* Arm Ethos-U55 timing adapter driver header */ -#include "timing_adapter_settings.h" /* Arm Ethos-U55 timing adapter settings */ +#include "ethosu_driver.h" /* Arm Ethos-U driver header */ +#include "timing_adapter.h" /* Arm Ethos-U timing adapter driver header */ +#include "timing_adapter_settings.h" /* Arm Ethos-U timing adapter settings */ -extern struct ethosu_driver ethosu_drv; /* Default Ethos-U55 device driver */ +extern struct ethosu_driver ethosu_drv; /* Default Ethos-U device driver */ /** - * @brief Initialises the Arm Ethos-U55 NPU + * @brief Initialises the Arm Ethos-U NPU * @return 0 if successful, error code otherwise **/ static int arm_npu_init(void); @@ -95,7 +95,7 @@ int hal_platform_init(hal_platform* platform) #if defined(ARM_NPU) - /* If Arm Ethos-U55 NPU is to be used, we initialise it here */ + /* If Arm Ethos-U NPU is to be used, we initialise it here */ if (0 != (state = arm_npu_init())) { return state; } @@ -219,7 +219,7 @@ static int arm_npu_init(void) { int err = 0; - /* If the platform has timing adapter blocks along with Ethos-U55 core + /* If the platform has timing adapter blocks along with Ethos-U core * block, initialise them here. */ if (0 != (err = _arm_npu_timing_adapter_init())) { return err; @@ -228,30 +228,30 @@ static int arm_npu_init(void) /* Initialise the IRQ */ arm_npu_irq_init(); - /* Initialise Ethos-U55 device */ - const void * ethosu_base_address = (void *)(SEC_ETHOS_U55_BASE); + /* Initialise Ethos-U device */ + const void * ethosu_base_address = (void *)(SEC_ETHOS_U_NPU_BASE); if (0 != (err = ethosu_init( - ðosu_drv, /* Ethos-U55 driver device pointer */ - ethosu_base_address, /* Ethos-U55's base address. */ + ðosu_drv, /* Ethos-U driver device pointer */ + ethosu_base_address, /* Ethos-U NPU's base address. */ NULL, /* Pointer to fast mem area - NULL for U55. */ 0, /* Fast mem region size. */ 1, /* Security enable. */ 1))) { /* Privilege enable. */ - printf_err("failed to initalise Ethos-U55 device\n"); + printf_err("failed to initalise Ethos-U device\n"); return err; } - info("Ethos-U55 device initialised\n"); + info("Ethos-U device initialised\n"); - /* Get Ethos-U55 version */ + /* Get Ethos-U version */ struct ethosu_version version; if (0 != (err = ethosu_get_version(ðosu_drv, &version))) { - printf_err("failed to fetch Ethos-U55 version info\n"); + printf_err("failed to fetch Ethos-U version info\n"); return err; } - info("Ethos-U55 version info:\n"); + info("Ethos-U version info:\n"); info("\tArch: v%u.%u.%u\n", version.id.arch_major_rev, version.id.arch_minor_rev, version.id.arch_patch_rev); diff --git a/source/use_case/ad/usecase.cmake b/source/use_case/ad/usecase.cmake index 4291dad..72683d1 100644 --- a/source/use_case/ad/usecase.cmake +++ b/source/use_case/ad/usecase.cmake @@ -60,7 +60,7 @@ USER_OPTION(${use_case}_ACTIVATION_BUF_SZ "Activation buffer size for the chosen 0x00200000 STRING) -if (ETHOS_U55_ENABLED) +if (ETHOS_U_NPU_ENABLED) set(DEFAULT_MODEL_PATH ${DEFAULT_MODEL_DIR}/ad_medium_int8_vela_H128.tflite) else() set(DEFAULT_MODEL_PATH ${DEFAULT_MODEL_DIR}/ad_medium_int8.tflite) diff --git a/source/use_case/asr/usecase.cmake b/source/use_case/asr/usecase.cmake index 3417c06..21fc80d 100644 --- a/source/use_case/asr/usecase.cmake +++ b/source/use_case/asr/usecase.cmake @@ -74,7 +74,7 @@ USER_OPTION(${use_case}_ACTIVATION_BUF_SZ "Activation buffer size for the chosen 0x00400000 STRING) -if (ETHOS_U55_ENABLED) +if (ETHOS_U_NPU_ENABLED) set(DEFAULT_MODEL_PATH ${DEFAULT_MODEL_DIR}/wav2letter_pruned_int8_vela_H128.tflite) else() set(DEFAULT_MODEL_PATH ${DEFAULT_MODEL_DIR}/wav2letter_pruned_int8.tflite) diff --git a/source/use_case/img_class/usecase.cmake b/source/use_case/img_class/usecase.cmake index 545697d..63a4c2a 100644 --- a/source/use_case/img_class/usecase.cmake +++ b/source/use_case/img_class/usecase.cmake @@ -46,7 +46,7 @@ USER_OPTION(${use_case}_ACTIVATION_BUF_SZ "Activation buffer size for the chosen 0x00200000 STRING) -if (ETHOS_U55_ENABLED) +if (ETHOS_U_NPU_ENABLED) set(DEFAULT_MODEL_PATH ${DEFAULT_MODEL_DIR}/mobilenet_v2_1.0_224_quantized_1_default_1_vela_H128.tflite) else() set(DEFAULT_MODEL_PATH ${DEFAULT_MODEL_DIR}/mobilenet_v2_1.0_224_quantized_1_default_1.tflite) diff --git a/source/use_case/inference_runner/usecase.cmake b/source/use_case/inference_runner/usecase.cmake index d66026f..79bec23 100644 --- a/source/use_case/inference_runner/usecase.cmake +++ b/source/use_case/inference_runner/usecase.cmake @@ -21,7 +21,7 @@ USER_OPTION(${use_case}_ACTIVATION_BUF_SZ "Activation buffer size for the chosen generate_default_input_code(${INC_GEN_DIR}) -if (ETHOS_U55_ENABLED) +if (ETHOS_U_NPU_ENABLED) set(DEFAULT_MODEL_PATH ${DEFAULT_MODEL_DIR}/dnn_s_quantized_vela_H128.tflite) else() set(DEFAULT_MODEL_PATH ${DEFAULT_MODEL_DIR}/dnn_s_quantized.tflite) diff --git a/source/use_case/kws/usecase.cmake b/source/use_case/kws/usecase.cmake index 560f5a8..6d0ad7e 100644 --- a/source/use_case/kws/usecase.cmake +++ b/source/use_case/kws/usecase.cmake @@ -73,7 +73,7 @@ USER_OPTION(${use_case}_ACTIVATION_BUF_SZ "Activation buffer size for the chosen 0x00100000 STRING) -if (ETHOS_U55_ENABLED) +if (ETHOS_U_NPU_ENABLED) set(DEFAULT_MODEL_PATH ${DEFAULT_MODEL_DIR}/ds_cnn_clustered_int8_vela_H128.tflite) else() set(DEFAULT_MODEL_PATH ${DEFAULT_MODEL_DIR}/ds_cnn_clustered_int8.tflite) diff --git a/source/use_case/kws_asr/usecase.cmake b/source/use_case/kws_asr/usecase.cmake index 8d2d6d1..716a8c8 100644 --- a/source/use_case/kws_asr/usecase.cmake +++ b/source/use_case/kws_asr/usecase.cmake @@ -66,7 +66,7 @@ USER_OPTION(${use_case}_MODEL_SCORE_THRESHOLD_ASR "Specify the score threshold [ 0.5 STRING) -if (ETHOS_U55_ENABLED) +if (ETHOS_U_NPU_ENABLED) set(DEFAULT_MODEL_PATH_KWS ${DEFAULT_MODEL_DIR}/ds_cnn_clustered_int8_vela_H128.tflite) set(DEFAULT_MODEL_PATH_ASR ${DEFAULT_MODEL_DIR}/wav2letter_pruned_int8_vela_H128.tflite) else() |