rebase perf patches

arm-software/embedded/CMakeLists.txt

@@ -170,7 +170,7 @@ set(LLVM_TOOLCHAIN_C_LIBRARY
     "Which C library to use."
 )
 set_property(CACHE LLVM_TOOLCHAIN_C_LIBRARY
-    PROPERTY STRINGS picolibc newlib llvmlibc)
+    PROPERTY STRINGS picolibc newlib newlib-nano llvmlibc)
 
 option(
     SHORT_BUILD_PATHS
@@ -238,6 +238,8 @@ set(LLVM_TARGETS_TO_BUILD AArch64;ARM CACHE STRING "")
 set(LLVM_DEFAULT_TARGET_TRIPLE aarch64-linux-gnu CACHE STRING "")
 set(LLVM_APPEND_VC_REV OFF CACHE BOOL "")
 set(LLVM_ENABLE_TERMINFO OFF CACHE BOOL "")
+set(LLVM_ENABLE_ZLIB OFF CACHE BOOL "")
+set(LLVM_ENABLE_ZSTD OFF CACHE BOOL "")
 set(CLANG_DEFAULT_LINKER lld CACHE STRING "")
 
 # Default to a release build
@@ -286,7 +288,7 @@ include(ProcessorCount)
 if(LLVM_TOOLCHAIN_C_LIBRARY STREQUAL picolibc)
     include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/fetch_picolibc.cmake)
 endif()
-if(LLVM_TOOLCHAIN_C_LIBRARY STREQUAL newlib)
+if(LLVM_TOOLCHAIN_C_LIBRARY MATCHES "^newlib")
     include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/fetch_newlib.cmake)
 endif()
 
@@ -309,18 +311,18 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 endif()
 ##################################################################################################
 
-if(LLVM_TOOLCHAIN_C_LIBRARY STREQUAL newlib)
+if(LLVM_TOOLCHAIN_C_LIBRARY MATCHES "^newlib")
     install(
         FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/newlib.cfg
+        ${CMAKE_CURRENT_SOURCE_DIR}/${LLVM_TOOLCHAIN_C_LIBRARY}.cfg
         DESTINATION bin
-        COMPONENT llvm-toolchain-newlib-configs
+        COMPONENT llvm-toolchain-${LLVM_TOOLCHAIN_C_LIBRARY}-configs
     )
     install(
         DIRECTORY
         ${CMAKE_CURRENT_SOURCE_DIR}/newlib-samples/
         DESTINATION samples
-        COMPONENT llvm-toolchain-newlib-configs
+        COMPONENT llvm-toolchain-${LLVM_TOOLCHAIN_C_LIBRARY}-configs
     )
 endif()
 
@@ -731,7 +733,7 @@ if(LLVM_TOOLCHAIN_C_LIBRARY STREQUAL picolibc)
         ${picolibc_SOURCE_DIR}/COPYING.picolibc         COPYING.picolibc
     )
 endif()
-if(LLVM_TOOLCHAIN_C_LIBRARY STREQUAL newlib)
+if(LLVM_TOOLCHAIN_C_LIBRARY MATCHES "^newlib")
     list(APPEND third_party_license_files
         ${newlib_SOURCE_DIR}/COPYING.NEWLIB             COPYING.NEWLIB
         ${newlib_SOURCE_DIR}/COPYING.LIBGLOSS           COPYING.LIBGLOSS

arm-software/embedded/README.md

@@ -7,7 +7,7 @@ bare-metal LLVM based toolchain targeting Arm based on:
 * libc++abi
 * libc++
 * compiler-rt
-* picolibc, or optionally newlib or LLVM's libc
+* picolibc, or optionally newlib(-nano) or LLVM's libc
 
 ## Goal
 
@@ -191,7 +191,7 @@ relying on the Arm GNU Toolchain.
 > *Note:* `picolibc` provides excellent
 > [support for Arm GNU Toolchain](https://github.com/picolibc/picolibc/blob/main/doc/using.md),
 > so projects that require using both Arm GNU Toolchain and Arm Toolchain for Embedded
-> can choose either `picolibc` or `newlib`.
+> can choose either `picolibc` or `newlib`/`newlib-nano`.
 
 ## Building from source
 

arm-software/embedded/arm-multilib/CMakeLists.txt

@@ -23,7 +23,7 @@ set(llvmproject_src_dir ${TOOLCHAIN_SOURCE_DIR}/../..)
 set(MULTILIB_JSON "" CACHE STRING "JSON file to load library definitions from.")
 set(ENABLE_VARIANTS "all" CACHE STRING "Semicolon separated list of variants to build, or \"all\". Must match entries in the json.")
 set(C_LIBRARY "picolibc" CACHE STRING "Which C library to use.")
-set_property(CACHE C_LIBRARY PROPERTY STRINGS picolibc newlib llvmlibc)
+set_property(CACHE C_LIBRARY PROPERTY STRINGS picolibc newlib newlib-nano llvmlibc)
 set(PROJECT_PREFIX "${CMAKE_BINARY_DIR}/lib-builds" CACHE STRING "Directory to build subprojects in.")
 option(
     NUMERICAL_BUILD_NAMES
@@ -95,7 +95,7 @@ include(ExternalProject)
 if(C_LIBRARY STREQUAL picolibc)
     include(${TOOLCHAIN_SOURCE_DIR}/cmake/fetch_picolibc.cmake)
     list(APPEND passthrough_dirs "-DFETCHCONTENT_SOURCE_DIR_PICOLIBC=${FETCHCONTENT_SOURCE_DIR_PICOLIBC}")
-elseif(C_LIBRARY STREQUAL newlib)
+elseif(C_LIBRARY MATCHES "^newlib")
     include(${TOOLCHAIN_SOURCE_DIR}/cmake/fetch_newlib.cmake)
     list(APPEND passthrough_dirs "-DFETCHCONTENT_SOURCE_DIR_NEWLIB=${FETCHCONTENT_SOURCE_DIR_NEWLIB}")
 endif()

arm-software/embedded/arm-multilib/json/multilib.json

@@ -34,25 +34,91 @@
             "variant": "aarch64a_soft_nofp_exn_rtti",
             "json": "aarch64a_soft_nofp_exn_rtti.json",
             "flags": "--target=aarch64-unknown-none-elf -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft",
-            "libraries_supported": "picolibc,newlib"
+            "libraries_supported": "picolibc"
         },
         {
             "variant": "aarch64a_soft_nofp",
             "json": "aarch64a_soft_nofp.json",
             "flags": "--target=aarch64-unknown-none-elf -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft -fno-exceptions -fno-rtti",
-            "libraries_supported": "picolibc,newlib"
+            "libraries_supported": "picolibc"
         },
         {
             "variant": "aarch64a_be_soft_nofp_exn_rtti",
             "json": "aarch64a_be_soft_nofp_exn_rtti.json",
             "flags": "--target=aarch64_be-unknown-none-elf -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft",
-            "libraries_supported": "picolibc,newlib"
+            "libraries_supported": "picolibc"
         },
         {
             "variant": "aarch64a_be_soft_nofp",
             "json": "aarch64a_be_soft_nofp.json",
             "flags": "--target=aarch64_be-unknown-none-elf -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft -fno-exceptions -fno-rtti",
-            "libraries_supported": "picolibc,newlib"
+            "libraries_supported": "picolibc"
+        },
+        {
+            "variant": "aarch64r_exn_rtti_unaligned",
+            "json": "aarch64r_exn_rtti_unaligned.json",
+            "flags": "--target=aarch64-unknown-none-elf -march=armv8-r"
+        },
+        {
+            "variant": "aarch64r_unaligned",
+            "json": "aarch64r_unaligned.json",
+            "flags": "--target=aarch64-unknown-none-elf -march=armv8-r -fno-exceptions -fno-rtti"
+        },
+        {
+            "variant": "aarch64r_be_exn_rtti",
+            "json": "aarch64r_be_exn_rtti.json",
+            "flags": "--target=aarch64_be-unknown-none-elf -march=armv8-r"
+        },
+        {
+            "variant": "aarch64r_be",
+            "json": "aarch64r_be.json",
+            "flags": "--target=aarch64_be-unknown-none-elf -march=armv8-r -fno-exceptions -fno-rtti"
+        },
+        {
+            "variant": "aarch64r_exn_rtti",
+            "json": "aarch64r_exn_rtti.json",
+            "flags": "--target=aarch64-unknown-none-elf -march=armv8-r -mno-unaligned-access"
+        },
+        {
+            "variant": "aarch64r",
+            "json": "aarch64r.json",
+            "flags": "--target=aarch64-unknown-none-elf -march=armv8-r -fno-exceptions -fno-rtti -mno-unaligned-access"
+        },
+        {
+            "variant": "aarch64r_soft_nofp_exn_rtti_unaligned",
+            "json": "aarch64r_soft_nofp_exn_rtti_unaligned.json",
+            "flags": "--target=aarch64-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft",
+            "libraries_supported": "picolibc"
+        },
+        {
+            "variant": "aarch64r_soft_nofp_unaligned",
+            "json": "aarch64r_soft_nofp_unaligned.json",
+            "flags": "--target=aarch64-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -fno-exceptions -fno-rtti -mabi=aapcs-soft",
+            "libraries_supported": "picolibc"
+        },
+        {
+            "variant": "aarch64r_soft_nofp_exn_rtti",
+            "json": "aarch64r_soft_nofp_exn_rtti.json",
+            "flags": "--target=aarch64-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft -mno-unaligned-access",
+            "libraries_supported": "picolibc"
+        },
+        {
+            "variant": "aarch64r_soft_nofp",
+            "json": "aarch64r_soft_nofp.json",
+            "flags": "--target=aarch64-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -fno-exceptions -fno-rtti -mabi=aapcs-soft -mno-unaligned-access",
+            "libraries_supported": "picolibc"
+        },
+        {
+            "variant": "aarch64r_be_soft_nofp_exn_rtti",
+            "json": "aarch64r_be_soft_nofp_exn_rtti.json",
+            "flags": "--target=aarch64_be-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -mabi=aapcs-soft",
+            "libraries_supported": "picolibc"
+        },
+        {
+            "variant": "aarch64r_be_soft_nofp",
+            "json": "aarch64r_be_soft_nofp.json",
+            "flags": "--target=aarch64_be-unknown-none-elf -march=armv8-r -march=armvX+nofp -march=armvX+nosimd -fno-exceptions -fno-rtti -mabi=aapcs-soft",
+            "libraries_supported": "picolibc"
         },
         {
             "variant": "armv4t_exn_rtti",
@@ -124,6 +190,16 @@
             "json": "armv7a_soft_nofp.json",
             "flags": "--target=armv7-unknown-none-eabi -mfpu=none -fno-exceptions -fno-rtti -mno-unaligned-access"
         },
+        {
+            "variant": "armebv7a_soft_nofp_exn_rtti",
+            "json": "armebv7a_soft_nofp_exn_rtti.json",
+            "flags": "--target=armebv7-unknown-none-eabi -mfpu=none"
+        },
+        {
+            "variant": "armebv7a_soft_nofp",
+            "json": "armebv7a_soft_nofp.json",
+            "flags": "--target=armebv7-unknown-none-eabi -mfpu=none -fno-exceptions -fno-rtti"
+        },
         {
             "variant": "armv7a_hard_vfpv3_d16_exn_rtti_unaligned",
             "json": "armv7a_hard_vfpv3_d16_exn_rtti_unaligned.json",
@@ -144,6 +220,16 @@
             "json": "armv7a_hard_vfpv3_d16.json",
             "flags": "--target=armv7-unknown-none-eabihf -mfpu=vfpv3-d16 -fno-exceptions -fno-rtti -mno-unaligned-access"
         },
+        {
+            "variant": "armebv7a_hard_vfpv3_d16_exn_rtti",
+            "json": "armebv7a_hard_vfpv3_d16_exn_rtti.json",
+            "flags": "--target=armebv7-unknown-none-eabihf -mfpu=vfpv3-d16"
+        },
+        {
+            "variant": "armebv7a_hard_vfpv3_d16",
+            "json": "armebv7a_hard_vfpv3_d16.json",
+            "flags": "--target=armebv7-unknown-none-eabihf -mfpu=vfpv3-d16 -fno-exceptions -fno-rtti"
+        },
         {
             "variant": "armv7a_soft_vfpv3_d16_exn_rtti_unaligned",
             "json": "armv7a_soft_vfpv3_d16_exn_rtti_unaligned.json",
@@ -164,6 +250,16 @@
             "json": "armv7a_soft_vfpv3_d16.json",
             "flags": "--target=armv7-unknown-none-eabi -mfpu=vfpv3-d16 -fno-exceptions -fno-rtti -mno-unaligned-access"
         },
+        {
+            "variant": "armebv7a_soft_vfpv3_d16_exn_rtti",
+            "json": "armebv7a_soft_vfpv3_d16_exn_rtti.json",
+            "flags": "--target=armebv7-unknown-none-eabi -mfpu=vfpv3-d16"
+        },
+        {
+            "variant": "armebv7a_soft_vfpv3_d16",
+            "json": "armebv7a_soft_vfpv3_d16.json",
+            "flags": "--target=armebv7-unknown-none-eabi -mfpu=vfpv3-d16 -fno-exceptions -fno-rtti"
+        },
         {
             "variant": "armv7r_soft_nofp_exn_rtti_unaligned",
             "json": "armv7r_soft_nofp_exn_rtti_unaligned.json",
@@ -264,6 +360,16 @@
             "json": "armv7m_soft_fpv4_sp_d16.json",
             "flags": "--target=thumbv7m-unknown-none-eabi -mfpu=fpv4-sp-d16 -fno-exceptions -fno-rtti -mno-unaligned-access"
         },
+        {
+            "variant": "armebv7m_soft_fpv4_sp_d16_exn_rtti",
+            "json": "armebv7m_soft_fpv4_sp_d16_exn_rtti.json",
+            "flags": "--target=thumbebv7m-unknown-none-eabi -mfpu=fpv4-sp-d16"
+        },
+        {
+            "variant": "armebv7m_soft_fpv4_sp_d16",
+            "json": "armebv7m_soft_fpv4_sp_d16.json",
+            "flags": "--target=thumbebv7m-unknown-none-eabi -mfpu=fpv4-sp-d16 -fno-exceptions -fno-rtti"
+         },
         {
             "variant": "armv7m_hard_fpv4_sp_d16_exn_rtti_unaligned",
             "json": "armv7m_hard_fpv4_sp_d16_exn_rtti_unaligned.json",
@@ -324,6 +430,16 @@
             "json": "armv7m_soft_nofp.json",
             "flags": "--target=thumbv7m-unknown-none-eabi -mfpu=none -fno-exceptions -fno-rtti -mno-unaligned-access"
         },
+        {
+            "variant": "armebv7m_soft_nofp_exn_rtti",
+            "json": "armebv7m_soft_nofp_exn_rtti.json",
+            "flags": "--target=thumbebv7m-unknown-none-eabi -mfpu=none"
+        },
+        {
+            "variant": "armebv7m_soft_nofp",
+            "json": "armebv7m_soft_nofp.json",
+            "flags": "--target=thumbebv7m-unknown-none-eabi -mfpu=none -fno-exceptions -fno-rtti"
+        },
         {
             "variant": "armv8m.main_soft_nofp_exn_rtti",
             "json": "armv8m.main_soft_nofp_exn_rtti.json",

arm-software/embedded/arm-multilib/json/variants/aarch64r.json

@@ -0,0 +1,40 @@
+{
+    "args": {
+        "common": {
+            "TARGET_ARCH": "aarch64r",
+            "VARIANT": "aarch64r",
+            "COMPILE_FLAGS": "-march=armv8-r -mno-unaligned-access",
+            "ENABLE_EXCEPTIONS": "OFF",
+            "ENABLE_RTTI": "OFF",
+            "TEST_EXECUTOR": "fvp",
+            "FVP_MODEL": "aem-r",
+            "FVP_CONFIG": "v8r-aarch64",
+            "BOOT_FLASH_ADDRESS": "0x0",
+            "BOOT_FLASH_SIZE": "0x1000",
+            "FLASH_ADDRESS": "0x1000",
+            "FLASH_SIZE": "0xfff000",
+            "RAM_ADDRESS": "0x1000000",
+            "RAM_SIZE": "0x1000000",
+            "STACK_SIZE": "8K"
+        },
+        "picolibc": {
+            "PICOLIBC_BUILD_TYPE": "release",
+            "ENABLE_CXX_LIBS": "ON",
+            "ENABLE_LIBC_TESTS": "ON",
+            "ENABLE_COMPILER_RT_TESTS": "OFF",
+            "ENABLE_LIBCXX_TESTS": "OFF"
+        },
+        "newlib": {
+            "ENABLE_CXX_LIBS": "ON",
+            "ENABLE_LIBC_TESTS": "OFF",
+            "ENABLE_COMPILER_RT_TESTS": "OFF",
+            "ENABLE_LIBCXX_TESTS": "OFF"
+        },
+        "llvmlibc": {
+            "ENABLE_CXX_LIBS": "OFF",
+            "ENABLE_LIBC_TESTS": "OFF",
+            "ENABLE_COMPILER_RT_TESTS": "OFF",
+            "ENABLE_LIBCXX_TESTS": "OFF"
+        }
+    }
+}

arm-software/embedded/arm-multilib/json/variants/aarch64r_be.json

@@ -0,0 +1,40 @@
+{
+    "args": {
+        "common": {
+            "TARGET_ARCH": "aarch64r",
+            "VARIANT": "aarch64r_be",
+            "COMPILE_FLAGS": "-march=armv8-r -mbig-endian -mno-unaligned-access",
+            "ENABLE_EXCEPTIONS": "OFF",
+            "ENABLE_RTTI": "OFF",
+            "TEST_EXECUTOR": "fvp",
+            "FVP_MODEL": "aem-r",
+            "FVP_CONFIG": "v8r-aarch64 big-endian",
+            "BOOT_FLASH_ADDRESS": "0x0",
+            "BOOT_FLASH_SIZE": "0x1000",
+            "FLASH_ADDRESS": "0x1000",
+            "FLASH_SIZE": "0xfff000",
+            "RAM_ADDRESS": "0x1000000",
+            "RAM_SIZE": "0x1000000",
+            "STACK_SIZE": "8K"
+        },
+        "picolibc": {
+            "PICOLIBC_BUILD_TYPE": "release",
+            "ENABLE_CXX_LIBS": "ON",
+            "ENABLE_LIBC_TESTS": "ON",
+            "ENABLE_COMPILER_RT_TESTS": "OFF",
+            "ENABLE_LIBCXX_TESTS": "OFF"
+        },
+        "newlib": {
+            "ENABLE_CXX_LIBS": "ON",
+            "ENABLE_LIBC_TESTS": "OFF",
+            "ENABLE_COMPILER_RT_TESTS": "OFF",
+            "ENABLE_LIBCXX_TESTS": "OFF"
+        },
+        "llvmlibc": {
+            "ENABLE_CXX_LIBS": "OFF",
+            "ENABLE_LIBC_TESTS": "OFF",
+            "ENABLE_COMPILER_RT_TESTS": "OFF",
+            "ENABLE_LIBCXX_TESTS": "OFF"
+        }
+    }
+}

arm-software/embedded/arm-multilib/json/variants/aarch64r_be_exn_rtti.json

@@ -0,0 +1,40 @@
+{
+    "args": {
+        "common": {
+            "TARGET_ARCH": "aarch64r",
+            "VARIANT": "aarch64r_be_exn_rtti",
+            "COMPILE_FLAGS": "-march=armv8-r -mbig-endian -mno-unaligned-access",
+            "ENABLE_EXCEPTIONS": "ON",
+            "ENABLE_RTTI": "ON",
+            "TEST_EXECUTOR": "fvp",
+            "FVP_MODEL": "aem-r",
+            "FVP_CONFIG": "v8r-aarch64 big-endian",
+            "BOOT_FLASH_ADDRESS": "0x0",
+            "BOOT_FLASH_SIZE": "0x1000",
+            "FLASH_ADDRESS": "0x1000",
+            "FLASH_SIZE": "0xfff000",
+            "RAM_ADDRESS": "0x1000000",
+            "RAM_SIZE": "0x1000000",
+            "STACK_SIZE": "8K"
+        },
+        "picolibc": {
+            "PICOLIBC_BUILD_TYPE": "release",
+            "ENABLE_CXX_LIBS": "ON",
+            "ENABLE_LIBC_TESTS": "ON",
+            "ENABLE_COMPILER_RT_TESTS": "OFF",
+            "ENABLE_LIBCXX_TESTS": "OFF"
+        },
+        "newlib": {
+            "ENABLE_CXX_LIBS": "ON",
+            "ENABLE_LIBC_TESTS": "OFF",
+            "ENABLE_COMPILER_RT_TESTS": "OFF",
+            "ENABLE_LIBCXX_TESTS": "OFF"
+        },
+        "llvmlibc": {
+            "ENABLE_CXX_LIBS": "OFF",
+            "ENABLE_LIBC_TESTS": "OFF",
+            "ENABLE_COMPILER_RT_TESTS": "OFF",
+            "ENABLE_LIBCXX_TESTS": "OFF"
+        }
+    }
+}