From 9263b519eef9aea86dcd795b16acd1ae53e19b9c Mon Sep 17 00:00:00 2001 From: Nina Drozd Date: Tue, 5 Sep 2023 17:38:30 +0100 Subject: MLECO-4074: bump up version of armclang to 6.19 * issues identified with armclang 6.17 and 6.18 * updates in cmake for minimum version * updates in release notes and documentation Change-Id: Iffa711d9d95a509f5c07cd55f59a49bdcf3e9d6a --- docs/documentation.md | 2 +- docs/sections/building.md | 8 +++----- release_notes.txt | 1 + scripts/cmake/toolchains/bare-metal-armclang.cmake | 9 ++------- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/docs/documentation.md b/docs/documentation.md index 7d8fc4a..570541a 100644 --- a/docs/documentation.md +++ b/docs/documentation.md @@ -36,7 +36,7 @@ Before starting the setup process, please make sure that you have: - At least one of the following toolchains: - GNU Arm Embedded toolchain (version 10.2.1 or above) - [GNU Arm Embedded toolchain downloads](https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads) - - Arm Compiler (version 6.16 or above) with a valid license - + - Arm Compiler (version 6.19 or above) with a valid license - [Arm Compiler download Page](https://developer.arm.com/tools-and-software/embedded/arm-compiler/downloads) - An Arm® MPS3 FPGA prototyping board and components for FPGA evaluation or a `Fixed Virtual Platform` binary: diff --git a/docs/sections/building.md b/docs/sections/building.md index 84ce271..776117f 100644 --- a/docs/sections/building.md +++ b/docs/sections/building.md @@ -34,7 +34,7 @@ This section assumes that you are using an **x86_64 Linux** build machine. Before proceeding, it is *essential* to ensure that the following prerequisites have been fulfilled: -- GNU Arm embedded toolchain 10.2.1 (or higher) or the Arm Compiler version 6.16, or higher, is installed and available +- GNU Arm embedded toolchain 10.2.1 (or higher) or the Arm Compiler version 6.19, or higher, is installed and available on the path. > **Note**: There is a known issue with Arm GNU Embedded Toolchain version 12.2.Rel1. See @@ -47,12 +47,10 @@ Before proceeding, it is *essential* to ensure that the following prerequisites ``` ```log - Product: ARM Compiler 6.16 Professional - Component: ARM Compiler 6.16 + Product: Keil MDK Community + Component: ARM Compiler for Embedded 6.19 ``` -> **Note:** To compile for Arm® Cortex™-M85 CPU (default CPU for Arm® Corstone-310), 6.18 is the minimum version required. - Alternatively, use: ```commandline diff --git a/release_notes.txt b/release_notes.txt index 7296739..76072d6 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,6 +1,7 @@ Changes in 23.08 * Support for 23.08 NPU components and dependencies (core-driver, core-platform, Vela 3.9.0, CMSIS, CMSIS-NN and TensorFlow Lite Micro). * Update Python package requirements for compatibility reasons. + * Increase minimum requirements of Armclang to 6.19 Changes in 23.05 * Support for 23.05 NPU components and dependencies (core-driver, core-platform, Vela 3.8.0, CMSIS, CMSIS-NN and TensorFlow Lite Micro). diff --git a/scripts/cmake/toolchains/bare-metal-armclang.cmake b/scripts/cmake/toolchains/bare-metal-armclang.cmake index f829762..fcea118 100644 --- a/scripts/cmake/toolchains/bare-metal-armclang.cmake +++ b/scripts/cmake/toolchains/bare-metal-armclang.cmake @@ -29,13 +29,14 @@ set(CMAKE_SYSTEM_NAME Generic) set(CMAKE_C_COMPILER_WORKS 1) set(CMAKE_CXX_COMPILER_WORKS 1) +set(MIN_ARM_CLANG_VERSION 6.19) + if (NOT DEFINED CMAKE_SYSTEM_PROCESSOR AND NOT DEFINED CMAKE_SYSTEM_ARCH) set(CMAKE_SYSTEM_PROCESSOR cortex-m55 CACHE STRING "Cortex-M CPU to use") endif() if (CMAKE_SYSTEM_PROCESSOR STREQUAL cortex-m55) # Flags for cortex-m55 - set(MIN_ARM_CLANG_VERSION 6.16) set(CPU_ID M55) set(CPU_COMPILE_DEF CPU_CORTEX_${CPU_ID}) set(ARM_CPU "ARMC${CPU_ID}") @@ -45,7 +46,6 @@ if (CMAKE_SYSTEM_PROCESSOR STREQUAL cortex-m55) set(CPU_LINK_OPT "--cpu=Cortex-${CPU_ID}") elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL cortex-m85) # Flags for cortex-m85 - set(MIN_ARM_CLANG_VERSION 6.18) set(CPU_ID M85) set(CPU_COMPILE_DEF CPU_CORTEX_${CPU_ID}) set(ARM_CPU "ARMC${CPU_ID}") @@ -55,7 +55,6 @@ elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL cortex-m85) set(CPU_LINK_OPT "--cpu=Cortex-${CPU_ID}") elseif (CMAKE_SYSTEM_ARCH STREQUAL armv8.1-m.main) # Flags for generic armv8.1-m profile - set(MIN_ARM_CLANG_VERSION 6.16) set(CPU_ID ARMv81MML_DSP_DP_MVE_FP) set(ARM_CPU "ARMv81MML") set(CPU_COMPILE_DEF ${CPU_ID}) @@ -70,10 +69,6 @@ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL cortex-m33) # Flags for cortex-m33 to go here endif() -if (NOT DEFINED MIN_ARM_CLANG_VERSION) - set(MIN_ARM_CLANG_VERSION 6.16) -endif() - set(${CPU_COMPILE_DEF} 1) # Warning options -- cgit v1.2.1