Arm backend: Move the rodata to the DDR and bring the ITCM limit back…

… to 512KB This allows us to deploy models on the MPS3 FPGA board running the Corstone-300 design Change-Id: I0bd673c129f82418b962ad608b061de1b36a96df
kirklandsign · Nov 26, 2024 · a64ed1b · a64ed1b
1 parent dc8b6d7
commit a64ed1b
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 99 deletions.
diff --git a/backends/arm/test/runner_utils.py b/backends/arm/test/runner_utils.py
@@ -266,8 +266,6 @@ def run_corstone(
                 "-C",
                 "mps3_board.uart0.out_file='-'",
                 "-C",
-                "cpu0.CFGITCMSZ=11",
-                "-C",
                 "cpu0.semihosting-enable=1",
                 "-C",
                 "cpu0.semihosting-stack_base=0",

diff --git a/docs/source/executorch-arm-delegate-tutorial.md b/docs/source/executorch-arm-delegate-tutorial.md
@@ -322,7 +322,6 @@ ethos_u_build_dir=examples/arm/executor_runner/
 elf=$(find ${ethos_u_build_dir} -name "arm_executor_runner")
 
 FVP_Corstone_SSE-320_Ethos-U85                          \
-    -C mps4_board.subsystem.cpu0.CFGITCMSZ=11           \
     -C mps4_board.subsystem.ethosu.num_macs=${num_macs} \
     -C mps4_board.visualisation.disable-visualisation=1 \
     -C vis_hdlcd.disable_visualisation=1                \

diff --git a/...les/arm/ethos-u-setup/core_platform/patches/0001-Add-.data-fixup-from-Corestone-300.patch b/...les/arm/ethos-u-setup/core_platform/patches/0001-Add-.data-fixup-from-Corestone-300.patch
diff --git a/examples/arm/ethos-u-setup/core_platform/patches/0001-Move-rodata-to-the-DDR.patch b/examples/arm/ethos-u-setup/core_platform/patches/0001-Move-rodata-to-the-DDR.patch
@@ -0,0 +1,34 @@
+From 0fb46c2fe4a072546f87c6cb9202d5001f1eb9c5 Mon Sep 17 00:00:00 2001
+From: George Gekov <[email protected]>
+Date: Mon, 18 Nov 2024 11:24:11 +0000
+Subject: [PATCH] Move rodata to the DDR
+
+---
+ targets/corstone-300/platform.ld | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/targets/corstone-300/platform.ld b/targets/corstone-300/platform.ld
+index b458fc6..8d4bc73 100644
+--- a/targets/corstone-300/platform.ld
++++ b/targets/corstone-300/platform.ld
+@@ -154,7 +154,7 @@ SECTIONS
+     *(SORT(.dtors.*))
+     *(.dtors)
+
+-    *(.rodata*)
++
+
+     KEEP(*(.eh_frame*))
+   } > ITCM :rom_exec
+@@ -280,7 +280,7 @@ SECTIONS
+ #endif
+     * (expected_output_data_sec)
+     * (sec_command_stream, sec_weight_data, sec_input_data)
+-
++    *(.rodata*)
+     * (ethosu_core_in_queue)
+     * (ethosu_core_out_queue)
+     . = ALIGN(4);
+-- 
+2.25.1
+
diff --git a/examples/arm/ethos-u-setup/core_platform/patches/0001-New-phdr-for-.data-section.patch b/examples/arm/ethos-u-setup/core_platform/patches/0001-New-phdr-for-.data-section.patch
diff --git a/examples/arm/ethos-u-setup/core_platform/patches/0003-Make-ITCM-1MB.patch b/examples/arm/ethos-u-setup/core_platform/patches/0003-Make-ITCM-1MB.patch
diff --git a/examples/arm/executor_runner/CMakeLists.txt b/examples/arm/executor_runner/CMakeLists.txt
@@ -234,6 +234,7 @@ target_link_libraries(
   quantized_kernels
   portable_kernels
   "-Wl,--no-whole-archive"
+  -Xlinker -Map=arm_executor_runner.map
 )
 
 # ET headers and generated headers includes

diff --git a/examples/arm/run.sh b/examples/arm/run.sh
@@ -229,7 +229,6 @@ function run_fvp() {
     if [[ ${target} == *"ethos-u55"*  ]]; then
         echo "Running ${elf} for ${target} run with FVP:${fvp_model} num_macs:${num_macs}"
         ${fvp_model}                                            \
-            -C cpu0.CFGITCMSZ=11                                \
             -C ethosu.num_macs=${num_macs}                      \
             -C mps3_board.visualisation.disable-visualisation=1 \
             -C mps3_board.telnetterminal0.start_telnet=0        \
@@ -241,7 +240,6 @@ function run_fvp() {
     elif [[ ${target} == *"ethos-u85"*  ]]; then
         echo "Running ${elf} for ${target} run with FVP:${fvp_model} num_macs:${num_macs}"
     	${fvp_model}                                            \
-            -C mps4_board.subsystem.cpu0.CFGITCMSZ=11           \
             -C mps4_board.subsystem.ethosu.num_macs=${num_macs} \
             -C mps4_board.visualisation.disable-visualisation=1 \
             -C vis_hdlcd.disable_visualisation=1                \