Commit 2b0f1790 authored by Daniel Flodin's avatar Daniel Flodin Committed by Dan Kalowsky
Browse files

cmake: assembler optimization options 

Commit f499ea0a made it so that the compiler optimization flags are also
passed to the assembler. However, this breaks for the IAR toolchain
since it uses the GNU assembler which does not have the same
optimization flags as the IAR compiler.

This commit separates the compiler and assembler optimizations to make
it possible to specify appropriate flags in a toolchains corresponding
`compiler_flags.cmake`

Signed-off-by: default avatarDaniel Flodin <daniel.flodin@iar.com>
(cherry picked from commit a4b66f92)
parent ff9fb454

CMakeLists.txt

+42 −13
Changes for CMakeLists.txt: 42 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -214,24 +214,53 @@ endif() 
#    1) Using EXTRA_CFLAGS which is applied regardless of kconfig choice, or

#    2) Rely on override support being implemented by your toolchain_cc_optimize_*()

#

get_property(OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG TARGET compiler PROPERTY no_optimization)

get_property(OPTIMIZE_FOR_DEBUG_FLAG TARGET compiler PROPERTY optimization_debug)

get_property(OPTIMIZE_FOR_SPEED_FLAG TARGET compiler PROPERTY optimization_speed)

get_property(OPTIMIZE_FOR_SIZE_FLAG  TARGET compiler PROPERTY optimization_size)

get_property(OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG TARGET compiler PROPERTY optimization_size_aggressive)

get_property(COMPILER_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG TARGET compiler PROPERTY no_optimization)

get_property(COMPILER_OPTIMIZE_FOR_DEBUG_FLAG TARGET compiler PROPERTY optimization_debug)

get_property(COMPILER_OPTIMIZE_FOR_SPEED_FLAG TARGET compiler PROPERTY optimization_speed)

get_property(COMPILER_OPTIMIZE_FOR_SIZE_FLAG  TARGET compiler PROPERTY optimization_size)

get_property(COMPILER_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG TARGET compiler PROPERTY optimization_size_aggressive)



get_property(ASM_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG TARGET asm PROPERTY no_optimization)

get_property(ASM_OPTIMIZE_FOR_DEBUG_FLAG TARGET asm PROPERTY optimization_debug)

get_property(ASM_OPTIMIZE_FOR_SPEED_FLAG TARGET asm PROPERTY optimization_speed)

get_property(ASM_OPTIMIZE_FOR_SIZE_FLAG  TARGET asm PROPERTY optimization_size)

get_property(ASM_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG TARGET asm PROPERTY optimization_size_aggressive)



# Let the assembler inherit the optimization flags of the compiler if it is

# not set explicitly.

if(NOT ASM_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG)

  set(ASM_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG ${COMPILER_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG})

endif()

if(NOT ASM_OPTIMIZE_FOR_DEBUG_FLAG)

  set(ASM_OPTIMIZE_FOR_DEBUG_FLAG ${COMPILER_OPTIMIZE_FOR_DEBUG_FLAG})

endif()

if(NOT ASM_OPTIMIZE_FOR_SPEED_FLAG)

  set(ASM_OPTIMIZE_FOR_SPEED_FLAG ${COMPILER_OPTIMIZE_FOR_SPEED_FLAG})

endif()

if(NOT ASM_OPTIMIZE_FOR_SIZE_FLAG)

  set(ASM_OPTIMIZE_FOR_SIZE_FLAG ${COMPILER_OPTIMIZE_FOR_SIZE_FLAG})

endif()

if(NOT ASM_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG)

  set(ASM_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG ${COMPILER_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG})

endif()



# From kconfig choice, pick the actual OPTIMIZATION_FLAG to use.

# Kconfig choice ensures only one of these CONFIG_*_OPTIMIZATIONS is set.

if(CONFIG_NO_OPTIMIZATIONS)

  set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG})

  set(COMPILER_OPTIMIZATION_FLAG ${COMPILER_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG})

  set(ASM_OPTIMIZATION_FLAG ${ASM_OPTIMIZE_FOR_NO_OPTIMIZATIONS_FLAG})

elseif(CONFIG_DEBUG_OPTIMIZATIONS)

  set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_DEBUG_FLAG})

  set(COMPILER_OPTIMIZATION_FLAG ${COMPILER_OPTIMIZE_FOR_DEBUG_FLAG})

  set(ASM_OPTIMIZATION_FLAG ${ASM_OPTIMIZE_FOR_DEBUG_FLAG})

elseif(CONFIG_SPEED_OPTIMIZATIONS)

  set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_SPEED_FLAG})

  set(COMPILER_OPTIMIZATION_FLAG ${COMPILER_OPTIMIZE_FOR_SPEED_FLAG})

  set(ASM_OPTIMIZATION_FLAG ${ASM_OPTIMIZE_FOR_SPEED_FLAG})

elseif(CONFIG_SIZE_OPTIMIZATIONS)

  set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_SIZE_FLAG}) # Default in kconfig

  set(COMPILER_OPTIMIZATION_FLAG ${COMPILER_OPTIMIZE_FOR_SIZE_FLAG}) # Default in kconfig

  set(ASM_OPTIMIZATION_FLAG ${ASM_OPTIMIZE_FOR_SIZE_FLAG})

elseif(CONFIG_SIZE_OPTIMIZATIONS_AGGRESSIVE)

  set(OPTIMIZATION_FLAG ${OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG})

  set(COMPILER_OPTIMIZATION_FLAG ${COMPILER_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG})

  set(ASM_OPTIMIZATION_FLAG ${ASM_OPTIMIZE_FOR_SIZE_AGGRESSIVE_FLAG})

else()

  message(FATAL_ERROR

    "Unreachable code. Expected optimization level to have been chosen. See Kconfig.zephyr")
@@ -245,9 +274,9 @@ SOC_* symbol.") 
endif()



# Apply the final optimization flag(s)

zephyr_compile_options($<$<COMPILE_LANGUAGE:ASM>:${OPTIMIZATION_FLAG}>)

zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:${OPTIMIZATION_FLAG}>)

zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:${OPTIMIZATION_FLAG}>)

zephyr_compile_options($<$<COMPILE_LANGUAGE:ASM>:${ASM_OPTIMIZATION_FLAG}>)

zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:${COMPILER_OPTIMIZATION_FLAG}>)

zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:${COMPILER_OPTIMIZATION_FLAG}>)



if(CONFIG_LTO)

  zephyr_compile_options($<TARGET_PROPERTY:compiler,optimization_lto>)

cmake/compiler/iar/compiler_flags.cmake

+8 −5
Changes for cmake/compiler/iar/compiler_flags.cmake: 8 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -8,17 +8,20 @@ 
# This section covers flags related to optimization #

#####################################################

set_compiler_property(PROPERTY no_optimization -On)



set_compiler_property(PROPERTY optimization_debug -Ol)



set_compiler_property(PROPERTY optimization_speed -Ohs)



set_compiler_property(PROPERTY optimization_size -Ohz)



set_compiler_property(PROPERTY optimization_size_aggressive -Ohz)



set_compiler_property(PROPERTY optimization_fast --no_size_constraints)



# IAR uses the GNU assembler so the options differ from the compiler

set_property(TARGET asm PROPERTY no_optimization -O0)

set_property(TARGET asm PROPERTY optimization_debug -Og)

set_property(TARGET asm PROPERTY optimization_speed -O2)

set_property(TARGET asm PROPERTY optimization_size -Os)

set_property(TARGET asm PROPERTY optimization_size_aggressive -Oz)

set_property(TARGET asm PROPERTY optimization_fast -Ofast)



#######################################################

# This section covers flags related to warning levels #

#######################################################

cmake/toolchain/xcc/generic.cmake

+1 −1
Changes for cmake/toolchain/xcc/generic.cmake: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
include(${ZEPHYR_BASE}/cmake/toolchain/xcc/common.cmake)



set(COMPILER xcc)

set(OPTIMIZE_FOR_DEBUG_FLAG "-O0")

set(COMPILER_OPTIMIZE_FOR_DEBUG_FLAG "-O0")

set(CC xcc)

set(C++ xc++)

set(LINKER xt-ld)

modules/mbedtls/CMakeLists.txt

+1 −1
Changes for modules/mbedtls/CMakeLists.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ zephyr_interface_library_named(mbedTLS) 
      # if address sanitizer is enabled, as such switch default optimization level

      # to speed

      set_property(SOURCE ${ZEPHYR_CURRENT_MODULE_DIR}/mbedtls/library/bignum.c APPEND PROPERTY COMPILE_OPTIONS

          "${OPTIMIZE_FOR_SPEED_FLAG}")

          "${COMPILER_OPTIMIZE_FOR_SPEED_FLAG}")

    endif ()



    zephyr_library_link_libraries(mbedTLS)

subsys/bluetooth/controller/CMakeLists.txt

+2 −2
Changes for subsys/bluetooth/controller/CMakeLists.txt: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -221,10 +221,10 @@ add_subdirectory_ifdef( 


zephyr_library_compile_options_ifdef(

  CONFIG_BT_CTLR_OPTIMIZE_FOR_SIZE

  ${OPTIMIZE_FOR_SIZE_FLAG}

  ${COMPILER_OPTIMIZE_FOR_SIZE_FLAG}

  )



zephyr_library_compile_options_ifdef(

  CONFIG_BT_CTLR_OPTIMIZE_FOR_SPEED

  ${OPTIMIZE_FOR_SPEED_FLAG}

  ${COMPILER_OPTIMIZE_FOR_SPEED_FLAG}

  )

CRA Git | Maintained and supported by SUSTech CRA and CCSE