Arm backend: Enable building for Corstone-300_U65 (pytorch#20067)

Tested with two tests in test_arm_backend.sh

Author: Erik-Lundell

backends/arm/scripts/corstone_utils.cmake

@@ -79,7 +79,7 @@ function(fetch_ethos_u_content ETHOS_SDK_PATH ET_DIR_PATH)
 endfunction()
 
 function(add_corstone_subdirectory SYSTEM_CONFIG ETHOS_SDK_PATH)
-  if(SYSTEM_CONFIG MATCHES "Ethos_U55")
+  if(SYSTEM_CONFIG MATCHES "Ethos_U55" OR SYSTEM_CONFIG MATCHES "Ethos_U65")
     add_subdirectory(
       ${ETHOS_SDK_PATH}/core_platform/targets/corstone-300 target
     )
@@ -101,7 +101,7 @@ function(add_corstone_subdirectory SYSTEM_CONFIG ETHOS_SDK_PATH)
   else()
     message(
       FATAL_ERROR
-        "Unsupported MEMORY_MODE ${MEMORY_MODE}. Memory_mode can be Shared_Sram, Sram_Only or Dedicated_Sram(applicable for the Ethos-U85)"
+        "Unsupported MEMORY_MODE ${MEMORY_MODE}. Memory_mode can be Shared_Sram, Sram_Only or Dedicated_Sram(applicable for the Ethos-U65 and Ethos-U85)"
     )
   endif()
 endfunction()
@@ -268,6 +268,85 @@ function(configure_timing_adapters SYSTEM_CONFIG MEMORY_MODE)
           "Unsupported memory_mode ${MEMORY_MODE} for the Ethos-U55. The Ethos-U55 supports only Shared_Sram and Sram_Only."
       )
     endif()
+  elseif(SYSTEM_CONFIG STREQUAL "Ethos_U65_High_End")
+    set(TARGET_BOARD
+        "corstone-300"
+        PARENT_SCOPE
+    )
+    if(MEMORY_MODE MATCHES "Shared_Sram")
+      target_compile_definitions(
+        ethosu_target_common
+        INTERFACE # Configure NPU architecture timing adapters This is just
+                  # example numbers and you should make this match your hardware
+                  # SRAM
+                  ETHOSU_TA_MAXR_0=16
+                  ETHOSU_TA_MAXW_0=16
+                  ETHOSU_TA_MAXRW_0=0
+                  ETHOSU_TA_RLATENCY_0=32
+                  ETHOSU_TA_WLATENCY_0=32
+                  ETHOSU_TA_PULSE_ON_0=15999
+                  ETHOSU_TA_PULSE_OFF_0=1
+                  ETHOSU_TA_BWCAP_0=16000
+                  ETHOSU_TA_PERFCTRL_0=0
+                  ETHOSU_TA_PERFCNT_0=0
+                  ETHOSU_TA_MODE_0=1
+                  ETHOSU_TA_HISTBIN_0=0
+                  ETHOSU_TA_HISTCNT_0=0
+                  # DRAM
+                  ETHOSU_TA_MAXR_1=24
+                  ETHOSU_TA_MAXW_1=12
+                  ETHOSU_TA_MAXRW_1=0
+                  ETHOSU_TA_RLATENCY_1=500
+                  ETHOSU_TA_WLATENCY_1=250
+                  ETHOSU_TA_PULSE_ON_1=4000
+                  ETHOSU_TA_PULSE_OFF_1=1000
+                  ETHOSU_TA_BWCAP_1=3750
+                  ETHOSU_TA_PERFCTRL_1=0
+                  ETHOSU_TA_PERFCNT_1=0
+                  ETHOSU_TA_MODE_1=1
+                  ETHOSU_TA_HISTBIN_1=0
+                  ETHOSU_TA_HISTCNT_1=0
+      )
+    elseif(MEMORY_MODE MATCHES "Sram_Only")
+      target_compile_definitions(
+        ethosu_target_common
+        INTERFACE # Configure NPU architecture timing adapters This is just
+                  # example numbers and you should make this match your hardware
+                  # SRAM
+                  ETHOSU_TA_MAXR_0=16
+                  ETHOSU_TA_MAXW_0=16
+                  ETHOSU_TA_MAXRW_0=0
+                  ETHOSU_TA_RLATENCY_0=32
+                  ETHOSU_TA_WLATENCY_0=32
+                  ETHOSU_TA_PULSE_ON_0=15999
+                  ETHOSU_TA_PULSE_OFF_0=1
+                  ETHOSU_TA_BWCAP_0=16000
+                  ETHOSU_TA_PERFCTRL_0=0
+                  ETHOSU_TA_PERFCNT_0=0
+                  ETHOSU_TA_MODE_0=1
+                  ETHOSU_TA_HISTBIN_0=0
+                  ETHOSU_TA_HISTCNT_0=0
+                  # Set the second Timing Adapter to SRAM latency & bandwidth
+                  ETHOSU_TA_MAXR_1=16
+                  ETHOSU_TA_MAXW_1=16
+                  ETHOSU_TA_MAXRW_1=0
+                  ETHOSU_TA_RLATENCY_1=32
+                  ETHOSU_TA_WLATENCY_1=32
+                  ETHOSU_TA_PULSE_ON_1=15999
+                  ETHOSU_TA_PULSE_OFF_1=1
+                  ETHOSU_TA_BWCAP_1=16000
+                  ETHOSU_TA_PERFCTRL_1=0
+                  ETHOSU_TA_PERFCNT_1=0
+                  ETHOSU_TA_MODE_1=1
+                  ETHOSU_TA_HISTBIN_1=0
+                  ETHOSU_TA_HISTCNT_1=0
+      )
+    else()
+      message(
+        FATAL_ERROR
+          "Unsupported memory_mode ${MEMORY_MODE} for the Ethos-U65. The Ethos-U65 supports Shared_Sram and Sram_Only in this runner."
+      )
+    endif()
   elseif(SYSTEM_CONFIG MATCHES "Ethos_U85_SYS_DRAM_Low")
     add_subdirectory(
       ${ETHOS_SDK_PATH}/core_platform/targets/corstone-320 target

backends/arm/scripts/run_fvp.sh

@@ -59,6 +59,8 @@ elf_file=$(realpath ${elf_file})
 # the Corstone-300 M55 (ISA superset).
 if [[ ${target} == *"ethos-u55"* || ${target} == cortex-m* && ${target} != cortex-m85* ]]; then
     fvp_model=FVP_Corstone_SSE-300_Ethos-U55
+elif [[ ${target} == *"ethos-u65"* ]]; then
+    fvp_model=FVP_Corstone_SSE-300_Ethos-U65
 else
     fvp_model=FVP_Corstone_SSE-320
 fi
@@ -144,7 +146,7 @@ if [[ ${target} == cortex-m* ]]; then
         rm "${log_file}"
         exit 1
     fi
-elif [[ ${target} == *"ethos-u55"*  ]]; then
+elif [[ ${target} == *"ethos-u55"* || ${target} == *"ethos-u65"* ]]; then
     ${nobuf} ${fvp_model}                                   \
         -C ethosu.num_macs=${num_macs}                      \
         -C mps3_board.visualisation.disable-visualisation=1 \

backends/arm/test/test_arm_backend.sh

@@ -167,6 +167,10 @@ test_run_ethos_u55() {
     examples/arm/run.sh --et_build_root=arm_test/test_run --target=ethos-u55-128 --model_name=examples/arm/example_modules/add.py
     examples/arm/run.sh --et_build_root=arm_test/test_run --target=ethos-u55-128 --model_name=examples/arm/example_modules/add.py --bundleio
 
+    echo "${TEST_SUITE_NAME}: Test target Ethos-U65"
+    examples/arm/run.sh --et_build_root=arm_test/test_run --target=ethos-u65-256 --model_name=examples/arm/example_modules/add.py
+    examples/arm/run.sh --et_build_root=arm_test/test_run --target=ethos-u65-256 --model_name=examples/arm/example_modules/add.py --bundleio
+
     # Cortex-M op tests
     echo "${TEST_SUITE_NAME}: Test target Cortex-M55 (on Ethos-U55)"
     examples/arm/run.sh --et_build_root=arm_test/test_run --target=ethos-u55-128 --model_name=add --bundleio --no_delegate --select_ops_list="aten::add.out"

examples/arm/executor_runner/CMakeLists.txt

@@ -249,14 +249,20 @@ target_sources(
 # Check for "U55" in SYSTEM_CONFIG
 string(FIND "${SYSTEM_CONFIG}" "U55" U55_FOUND)
 
+# Check for "U65" in SYSTEM_CONFIG
+string(FIND "${SYSTEM_CONFIG}" "U65" U65_FOUND)
+
 # Check for "U85" in SYSTEM_CONFIG
 string(FIND "${SYSTEM_CONFIG}" "U85" U85_FOUND)
 
-# Check if neither "U55" nor "U85" was found
-if(U55_FOUND EQUAL -1 AND U85_FOUND EQUAL -1)
+# Check if neither "U55", "U65" nor "U85" was found
+if(U55_FOUND EQUAL -1
+   AND U65_FOUND EQUAL -1
+   AND U85_FOUND EQUAL -1
+)
   message(
     FATAL_ERROR
-      "SYSTEM_CONFIG does not contain 'U55' or 'U85'. Configuration aborting."
+      "SYSTEM_CONFIG does not contain 'U55', 'U65' or 'U85'. Configuration aborting."
   )
 endif()
 
@@ -266,6 +272,11 @@ if(NOT U55_FOUND EQUAL -1)
   set(LINK_FILE_IN "${CMAKE_CURRENT_LIST_DIR}/Corstone-300.ld")
 endif()
 
+if(NOT U65_FOUND EQUAL -1)
+  message(STATUS "SYSTEM_CONFIG contains 'U65'.")
+  set(LINK_FILE_IN "${CMAKE_CURRENT_LIST_DIR}/Corstone-300.ld")
+endif()
+
 if(NOT U85_FOUND EQUAL -1)
   message(STATUS "SYSTEM_CONFIG contains 'U85'.")
   set(LINK_FILE_IN "${CMAKE_CURRENT_LIST_DIR}/Corstone-320.ld")

examples/arm/run.sh

@@ -77,10 +77,10 @@ function help() {
     echo "  --build_only                           Only build, don't run"
     echo "  --extra_build_flags=\"<FLAGS>\"         Extra -D style flags to pass to cmake when run.sh auto-configures the build"
     echo "  --toolchain=<arm-none-eabi-gcc|arm-zephyr-eabi-gcc>  Toolchain preset to use when run.sh auto-configures the build. Default: ${toolchain}"
-    echo "  --system_config=<CONFIG>               Ethos-U: System configuration to select from the Vela configuration file (see vela.ini). Default: Ethos_U55_High_End_Embedded for EthosU55 targets, Ethos_U85_SYS_DRAM_Mid for EthosU85 targets."
+    echo "  --system_config=<CONFIG>               Ethos-U: System configuration to select from the Vela configuration file (see vela.ini). Default: Ethos_U55_High_End_Embedded for EthosU55 targets, Ethos_U65_High_End for EthosU65 targets, Ethos_U85_SYS_DRAM_Mid for EthosU85 targets."
     echo "                                            NOTE: If given, this option must match the given target. This option also sets timing adapter values customized for specific hardware, see ./executor_runner/CMakeLists.txt."
     echo "  --config=<FILEPATH>                    Ethos-U: System configuration file that specifies system configurations (vela.ini)"
-    echo "  --memory_mode=<MODE>                   Ethos-U: Memory mode to select from the Vela configuration file (see vela.ini), e.g. Shared_Sram/Sram_Only. Default: 'Shared_Sram' for Ethos-U55 targets, 'Sram_Only' for Ethos-U85 targets"
+    echo "  --memory_mode=<MODE>                   Ethos-U: Memory mode to select from the Vela configuration file (see vela.ini), e.g. Shared_Sram/Sram_Only. Default: 'Shared_Sram' for Ethos-U55 targets, 'Sram_Only' for Ethos-U65 targets and 'Dedicated_Sram_384KB' for Ethos-U85 targets"
     echo "  --pte_placement=<elf|ADDR>             Ethos-U: Control if runtime has PTE baked into the elf or if its placed in memory outside of the elf, defaults to ${pte_placement}"
     echo "  --specify_ethosu_scratch               Use actual Ethos-U scratch size for given model to size temp allocator"
     echo "  --et_build_root=<FOLDER>               Executorch build output root folder to use, defaults to ${et_build_root}"
@@ -187,6 +187,10 @@ esac
 if [[ ${system_config} == "" ]]
 then
     system_config="Ethos_U55_High_End_Embedded"
+    if [[ ${target} =~ "ethos-u65" ]]
+    then
+        system_config="Ethos_U65_High_End"
+    fi
     if [[ ${target} =~ "ethos-u85" ]]
     then
         system_config="Ethos_U85_SYS_DRAM_Mid"
@@ -196,6 +200,10 @@ fi
 if [[ ${memory_mode} == "" ]]
 then
     memory_mode="Shared_Sram"
+    if [[ ${target} =~ "ethos-u65" ]]
+    then
+        memory_mode="Sram_Only"
+    fi
     if [[ ${target} =~ "ethos-u85" ]]
     then
         memory_mode="Dedicated_Sram_384KB"
@@ -208,7 +216,7 @@ then
 fi
 
 target_cpu="cortex-m85"
-if [[ ${target} =~ "ethos-u55" ]]
+if [[ ${target} =~ "ethos-u55" || ${target} =~ "ethos-u65" ]]
 then
     target_cpu="cortex-m55"
 fi