Corstone-310 FVP update
Updating scripts to support next release of Corstone-310 FVP.
Change-Id: Idb13d8caa9954524d11aa0aa14c812e3c4d6b89d
diff --git a/scripts/run_ctest.py b/scripts/run_ctest.py
index c2ba672..aa6292f 100755
--- a/scripts/run_ctest.py
+++ b/scripts/run_ctest.py
@@ -116,14 +116,14 @@
def run_corstone_310(args):
# Verify supported FVP version
- version = subprocess.check_output(['FVP_Corstone_SSE-310', '--version']).decode()
- supported_version = ['11.17']
+ version = subprocess.check_output(['FVP_Corstone_SSE-310_Ethos-U65', '--version']).decode()
+ supported_version = ['11.18']
if not [s for s in supported_version if s in version]:
raise Exception("Incorrect FVP version. Supported versions are '{}'.".format(supported_version))
# FVP executable
- cmd = ['FVP_Corstone_SSE-310']
+ cmd = ['FVP_Corstone_SSE-310_Ethos-U65']
# NPU configuration
cmd += ['-C', 'ethosu.num_macs=' + str(args.macs)]
diff --git a/targets/corstone-310/CMakeLists.txt b/targets/corstone-310/CMakeLists.txt
index ec0a57a..d943797 100644
--- a/targets/corstone-310/CMakeLists.txt
+++ b/targets/corstone-310/CMakeLists.txt
@@ -26,7 +26,7 @@
set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/toolchain/armclang.cmake")
endif()
-set(ETHOSU_TARGET_NPU_CONFIG "ethos-u55-256" CACHE STRING "NPU configuration")
+set(ETHOSU_TARGET_NPU_CONFIG "ethos-u65-256" CACHE STRING "NPU configuration")
set(ETHOSU_TARGET_NPU_COUNT 1 CACHE INTERNAL "Number of NPUs")
set(ETHOSU_TARGET_NPU_TA_COUNT 0 CACHE INTERNAL "Number of timing adapters per NPU")
@@ -54,7 +54,7 @@
cmake_minimum_required(VERSION 3.21)
-project(ethos-u-corstone-polaris VERSION 0.0.1)
+project(ethos-u-corstone-310 VERSION 0.0.1)
include(${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/helpers.cmake)