From 341a0dfea1fe2a186a1c9130425a20e28e811568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonny=20Sv=C3=A4rd?= Date: Wed, 20 May 2020 17:56:37 +0200 Subject: MLBEDSW-2288: Set default/configurable AXI values Change-Id: I2e72d26699e07b12b42832b59e23b3083c59d1d8 --- CMakeLists.txt | 68 ++++++++++++++++++++++++++++++++++---------------- src/ethosu_config.h.in | 44 ++++++++++++++++++++++++++++++++ src/ethosu_driver.c | 48 ++++++++++++++++++++++++----------- 3 files changed, 123 insertions(+), 37 deletions(-) create mode 100644 src/ethosu_config.h.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a5b813..91dc9d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,33 +65,57 @@ include_directories(${CMSIS_PATH}/CMSIS/Core/Include) # Build driver library add_library(ethosu_core_driver STATIC) target_include_directories(ethosu_core_driver PUBLIC include) +target_include_directories(ethosu_core_driver PRIVATE "${PROJECT_BINARY_DIR}/src") target_sources(ethosu_core_driver PRIVATE src/ethosu_driver.c src/ethosu_device.c src/ethosu_pmu.c) -# Build PMU +# Configurables +set(NPU_QCONFIG "2" CACHE STRING "Default QCONFIG") +set(NPU_REGIONCFG_0 "3" CACHE STRING "Default region config 0") +set(NPU_REGIONCFG_1 "0" CACHE STRING "Default region config 1") +set(NPU_REGIONCFG_2 "1" CACHE STRING "Default region config 2") +set(NPU_REGIONCFG_3 "1" CACHE STRING "Default region config 3") +set(NPU_REGIONCFG_4 "1" CACHE STRING "Default region config 4") +set(NPU_REGIONCFG_5 "1" CACHE STRING "Default region config 5") +set(NPU_REGIONCFG_6 "1" CACHE STRING "Default region config 6") +set(NPU_REGIONCFG_7 "1" CACHE STRING "Default region config 7") + +set(AXI_LIMIT0_MAX_BEATS_BYTES "0x0" CACHE STRING "Default AXI_LIMIT0_MAX_BEATS_BYTES ") +set(AXI_LIMIT0_MEM_TYPE "0x0" CACHE STRING "Default AXI_LIMIT0_MEM_TYPE ") +set(AXI_LIMIT0_MAX_OUTSTANDING_READS "32" CACHE STRING "Default AXI_LIMIT0_MAX_OUTSTANDING_READS ") +set(AXI_LIMIT0_MAX_OUTSTANDING_WRITES "16" CACHE STRING "Default AXI_LIMIT0_MAX_OUTSTANDING_WRITES ") +set(AXI_LIMIT1_MAX_BEATS_BYTES "0x0" CACHE STRING "Default AXI_LIMIT1_MAX_BEATS_BYTES ") +set(AXI_LIMIT1_MEM_TYPE "0x0" CACHE STRING "Default AXI_LIMIT1_MEM_TYPE ") +set(AXI_LIMIT1_MAX_OUTSTANDING_READS "32" CACHE STRING "Default AXI_LIMIT1_MAX_OUTSTANDING_READS ") +set(AXI_LIMIT1_MAX_OUTSTANDING_WRITES "16" CACHE STRING "Default AXI_LIMIT1_MAX_OUTSTANDING_WRITES ") +set(AXI_LIMIT2_MAX_BEATS_BYTES "0x0" CACHE STRING "Default AXI_LIMIT2_MAX_BEATS_BYTES ") +set(AXI_LIMIT2_MEM_TYPE "0x0" CACHE STRING "Default AXI_LIMIT2_MEM_TYPE ") +set(AXI_LIMIT2_MAX_OUTSTANDING_READS "32" CACHE STRING "Default AXI_LIMIT2_MAX_OUTSTANDING_READS ") +set(AXI_LIMIT2_MAX_OUTSTANDING_WRITES "16" CACHE STRING "Default AXI_LIMIT2_MAX_OUTSTANDING_WRITES ") +set(AXI_LIMIT3_MAX_BEATS_BYTES "0x0" CACHE STRING "Default AXI_LIMIT3_MAX_BEATS_BYTES ") +set(AXI_LIMIT3_MEM_TYPE "0x0" CACHE STRING "Default AXI_LIMIT3_MEM_TYPE ") +set(AXI_LIMIT3_MAX_OUTSTANDING_READS "32" CACHE STRING "Default AXI_LIMIT3_MAX_OUTSTANDING_READS ") +set(AXI_LIMIT3_MAX_OUTSTANDING_WRITES "16" CACHE STRING "Default AXI_LIMIT3_MAX_OUTSTANDING_WRITES ") + + +# PMU if(DRIVER_PMU_AUTOINIT) - set(NPU_PMCR "0x0" CACHE STRING "Register control b0 = CNT_EN = Enable counters (RW), b1 = EVENT_CNT_RST = Reset event counters (WO), b2 = CYCLE_CNT_RST = Reset cycle counter (WO), b[15:11] = Number of event counters (RO)") - set(NPU_PMCNTENSET "0x0" CACHE STRING "Bit k enables event counter k. k=31 enables the cycle counter. Read value is current status.") - set(NPU_PMCNTENCLR "0x0" CACHE STRING "Bit k disables event counter k. k=31 disables the cycle counter. Reda value is current status.") - set(NPU_PMOVSSET "0x0" CACHE STRING "Overflow detection set. Bit k is for counter k. k=31 is cycle counter.") - set(NPU_PMOVSCLR "0x0" CACHE STRING "Overflow detection clear. Bit k is for counter k. k=31 is cycle counter.") - set(NPU_PMINTSET "0x0" CACHE STRING "Interrupt set. Bit k is for counter k. k=31 is cycle counter.") - set(NPU_PMINTCLR "0x8003" CACHE STRING "Interrupt clear. Bit k is for counter k. k=31 is cycle counter.") - set(NPU_PMCCNTR "0x0" CACHE STRING "Cycle counter, 48 bits value") - set(NPU_PMCCNTR_CFG "0x0" CACHE STRING "b[9:0] Start Event – this event number starts the cycle counter b[25:16] Stop Event – this event number stops the cycle counter") - - target_compile_definitions(ethosu_core_driver PRIVATE - PMU_AUTOINIT - INIT_PMCR=${NPU_PMCR} - INIT_PMCNTENSET=${NPU_PMCNTENSET} - INIT_PMCNTENCLR=${NPU_PMCNTENCLR} - INIT_PMOVSSET=${NPU_PMOVSSET} - INIT_PMOVSCLR=${NPU_PMOVSCLR} - INIT_PMINTSET=${NPU_PMINTSET} - INIT_PMINTCLR=${NPU_PMINTCLR} - INIT_PMCCNTR=${NPU_PMCCNTR} - INIT_PMCCNTR_CFG=${NPU_PMCCNTR_CFG}) + set(PMU_AUTOINIT TRUE) + set(INIT_PMCR "0x0" CACHE STRING "Register control b0 = CNT_EN = Enable counters (RW), b1 = EVENT_CNT_RST = Reset event counters (WO), b2 = CYCLE_CNT_RST = Reset cycle counter (WO), b[15:11] = Number of event counters (RO)") + set(INIT_PMCNTENSET "0x0" CACHE STRING "Bit k enables event counter k. k=31 enables the cycle counter. Read value is current status.") + set(INIT_PMCNTENCLR "0x0" CACHE STRING "Bit k disables event counter k. k=31 disables the cycle counter. Reda value is current status.") + set(INIT_PMOVSSET "0x0" CACHE STRING "Overflow detection set. Bit k is for counter k. k=31 is cycle counter.") + set(INIT_PMOVSCLR "0x0" CACHE STRING "Overflow detection clear. Bit k is for counter k. k=31 is cycle counter.") + set(INIT_PMINTSET "0x0" CACHE STRING "Interrupt set. Bit k is for counter k. k=31 is cycle counter.") + set(INIT_PMINTCLR "0x8003" CACHE STRING "Interrupt clear. Bit k is for counter k. k=31 is cycle counter.") + set(INIT_PMCCNTR "0x0" CACHE STRING "Cycle counter, 48 bits value") + set(INIT_PMCCNTR_CFG "0x0" CACHE STRING "b[9:0] Start Event – this event number starts the cycle counter b[25:16] Stop Event – this event number stops the cycle counter") endif() +configure_file ( + "${PROJECT_SOURCE_DIR}/src/ethosu_config.h.in" + "${PROJECT_BINARY_DIR}/src/ethosu_config.h" +) + # # Print build status # diff --git a/src/ethosu_config.h.in b/src/ethosu_config.h.in new file mode 100644 index 0000000..61cd591 --- /dev/null +++ b/src/ethosu_config.h.in @@ -0,0 +1,44 @@ +#ifndef ethosu_config_h +#define ethosu_config_h +#include + +#define NPU_QCONFIG (@NPU_QCONFIG@) +#define NPU_REGIONCFG_0 (@NPU_REGIONCFG_0@) +#define NPU_REGIONCFG_1 (@NPU_REGIONCFG_1@) +#define NPU_REGIONCFG_2 (@NPU_REGIONCFG_2@) +#define NPU_REGIONCFG_3 (@NPU_REGIONCFG_3@) +#define NPU_REGIONCFG_4 (@NPU_REGIONCFG_4@) +#define NPU_REGIONCFG_5 (@NPU_REGIONCFG_5@) +#define NPU_REGIONCFG_6 (@NPU_REGIONCFG_6@) +#define NPU_REGIONCFG_7 (@NPU_REGIONCFG_7@) + +#define AXI_LIMIT0_MAX_BEATS_BYTES (@AXI_LIMIT0_MAX_BEATS_BYTES@) +#define AXI_LIMIT0_MEM_TYPE (@AXI_LIMIT0_MEM_TYPE@) +#define AXI_LIMIT0_MAX_OUTSTANDING_READS ((uint8_t)@AXI_LIMIT0_MAX_OUTSTANDING_READS@) +#define AXI_LIMIT0_MAX_OUTSTANDING_WRITES ((uint8_t)@AXI_LIMIT0_MAX_OUTSTANDING_WRITES@) +#define AXI_LIMIT1_MAX_BEATS_BYTES (@AXI_LIMIT1_MAX_BEATS_BYTES@) +#define AXI_LIMIT1_MEM_TYPE (@AXI_LIMIT1_MEM_TYPE@) +#define AXI_LIMIT1_MAX_OUTSTANDING_READS ((uint8_t)@AXI_LIMIT1_MAX_OUTSTANDING_READS@) +#define AXI_LIMIT1_MAX_OUTSTANDING_WRITES ((uint8_t)@AXI_LIMIT1_MAX_OUTSTANDING_WRITES@) +#define AXI_LIMIT2_MAX_BEATS_BYTES (@AXI_LIMIT2_MAX_BEATS_BYTES@) +#define AXI_LIMIT2_MEM_TYPE (@AXI_LIMIT2_MEM_TYPE@) +#define AXI_LIMIT2_MAX_OUTSTANDING_READS ((uint8_t)@AXI_LIMIT2_MAX_OUTSTANDING_READS@) +#define AXI_LIMIT2_MAX_OUTSTANDING_WRITES ((uint8_t)@AXI_LIMIT2_MAX_OUTSTANDING_WRITES@) +#define AXI_LIMIT3_MAX_BEATS_BYTES (@AXI_LIMIT3_MAX_BEATS_BYTES@) +#define AXI_LIMIT3_MEM_TYPE (@AXI_LIMIT3_MEM_TYPE@) +#define AXI_LIMIT3_MAX_OUTSTANDING_READS ((uint8_t)@AXI_LIMIT3_MAX_OUTSTANDING_READS@) +#define AXI_LIMIT3_MAX_OUTSTANDING_WRITES ((uint8_t)@AXI_LIMIT3_MAX_OUTSTANDING_WRITES@) + + +#cmakedefine PMU_AUTOINIT +#cmakedefine INIT_PMCR (@INIT_PMCR@) +#cmakedefine INIT_PMCNTENSET (@INIT_PMCNTENSET@) +#cmakedefine INIT_PMCNTENCLR (@INIT_PMCNTENCLR@) +#cmakedefine INIT_PMOVSSET (@INIT_PMOVSSET@) +#cmakedefine INIT_PMOVSCLR (@INIT_PMOVSCLR@) +#cmakedefine INIT_PMINTSET (@INIT_PMINTSET@) +#cmakedefine INIT_PMINTCLR (@INIT_PMINTCLR@) +#cmakedefine INIT_PMCCNTR (@INIT_PMCCNTR@) +#cmakedefine INIT_PMCCNTR_CFG (@INIT_PMCCNTR_CFG@) + +#endif diff --git a/src/ethosu_driver.c b/src/ethosu_driver.c index 01ec389..8384ebe 100644 --- a/src/ethosu_driver.c +++ b/src/ethosu_driver.c @@ -16,6 +16,7 @@ * limitations under the License. */ +#include "ethosu_config.h" #include "ethosu_driver.h" #include "ethosu_common.h" @@ -397,22 +398,39 @@ static int handle_optimizer_config(struct opt_cfg_s *opt_cfg_p) return return_code; } -void __attribute__((weak)) npu_axi_init() +void npu_axi_init() { - // TODO Power on - - // TODO Set qconfig - ethosu_set_qconfig(0); - - // TODO Set region config - ethosu_set_regioncfg(0, 0); - ethosu_set_regioncfg(1, 0); - ethosu_set_regioncfg(2, 0); - ethosu_set_regioncfg(3, 0); - ethosu_set_regioncfg(4, 0); - ethosu_set_regioncfg(5, 0); - ethosu_set_regioncfg(6, 0); - ethosu_set_regioncfg(7, 0); + ethosu_set_qconfig(NPU_QCONFIG); + + ethosu_set_regioncfg(0, NPU_REGIONCFG_0); + ethosu_set_regioncfg(1, NPU_REGIONCFG_1); + ethosu_set_regioncfg(2, NPU_REGIONCFG_2); + ethosu_set_regioncfg(3, NPU_REGIONCFG_3); + ethosu_set_regioncfg(4, NPU_REGIONCFG_4); + ethosu_set_regioncfg(5, NPU_REGIONCFG_5); + ethosu_set_regioncfg(6, NPU_REGIONCFG_6); + ethosu_set_regioncfg(7, NPU_REGIONCFG_7); + + (void)ethosu_set_axi_limit0( + AXI_LIMIT0_MAX_BEATS_BYTES, + AXI_LIMIT0_MEM_TYPE, + AXI_LIMIT0_MAX_OUTSTANDING_READS, + AXI_LIMIT0_MAX_OUTSTANDING_WRITES); + (void)ethosu_set_axi_limit1( + AXI_LIMIT1_MAX_BEATS_BYTES, + AXI_LIMIT1_MEM_TYPE, + AXI_LIMIT1_MAX_OUTSTANDING_READS, + AXI_LIMIT1_MAX_OUTSTANDING_WRITES); + (void)ethosu_set_axi_limit2( + AXI_LIMIT2_MAX_BEATS_BYTES, + AXI_LIMIT2_MEM_TYPE, + AXI_LIMIT2_MAX_OUTSTANDING_READS, + AXI_LIMIT2_MAX_OUTSTANDING_WRITES); + (void)ethosu_set_axi_limit3( + AXI_LIMIT3_MAX_BEATS_BYTES, + AXI_LIMIT3_MEM_TYPE, + AXI_LIMIT3_MAX_OUTSTANDING_READS, + AXI_LIMIT3_MAX_OUTSTANDING_WRITES); } static int handle_command_stream(const uint8_t *cmd_stream, -- cgit v1.2.1