Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-23 16:25:26 +03:00
Code Issues Wiki Activity

Allow for different optimization profiles depending on file and target in Makefile

Browse source
This commit is contained in:
Pawel Spychalski (DzikuVx) 2020-03-10 20:06:26 +01:00
parent 6753c410c6
commit 0da14f5ad5
3 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Makefile
View file

@ -301,14 +301,18 @@ $(TARGET_ELF): $(TARGET_OBJS)
$(V0) $(SIZE) $(TARGET_ELF) $(V0) $(SIZE) $(TARGET_ELF)
define compile_file define compile_file
echo "%% ($(1)) $<" "$(STDOUT)" && \ echo "%% $(1) $<" "$(STDOUT)" && \
$(CROSS_CC) -c -o $@ $(CFLAGS) $(2) $< $(CROSS_CC) -c -o $@ $(CFLAGS) $(2) $<
endef endef
ifneq ($(TARGET),$(filter $(TARGET),$(F3_TARGETS))) ifneq ($(TARGET),$(filter $(TARGET),$(F3_TARGETS)))
OPTIMIZE_FLAG_SPEED = -Ofast
OPTIMIZE_FLAG_SIZE = -Os
OPTIMIZE_FLAG_NORMAL = -O2
else else
OPTIMIZE_FLAG_SPEED = -Os
OPTIMIZE_FLAG_SIZE = -Os
OPTIMIZE_FLAG_NORMAL = -Os
endif endif
# Compile # Compile
@ -316,12 +320,12 @@ $(TARGET_OBJ_DIR)/%.o: %.c
$(V1) mkdir -p $(dir $@) $(V1) mkdir -p $(dir $@)
$(V1) $(if $(findstring $<,$(SIZE_OPTIMISED_SRC)), \ $(V1) $(if $(findstring $<,$(SIZE_OPTIMISED_SRC)), \
$(call compile_file,(size),$(CC_NO_OPTIMISATION)) \ $(call compile_file,(size),$(OPTIMIZE_FLAG_SIZE)) \
, \ , \
$(if $(findstring $(subst ./src/main/,,$<),$(SPEED_OPTIMISED_SRC)), \ $(if $(findstring $<,$(SPEED_OPTIMISED_SRC)), \
$(call compile_file,(speed)),$(CC_SPEED_OPTIMISATION)) \ $(call compile_file,(speed),$(OPTIMIZE_FLAG_SPEED)) \
, \ , \
$(call compile_file,,$(CC_SIZE_OPTIMISATION)) \ $(call compile_file,,$(OPTIMIZE_FLAG_NORMAL)) \
) \ ) \
) )
ifeq ($(GENERATE_ASM), 1) ifeq ($(GENERATE_ASM), 1)

4
make/source.mk
View file

@ -281,9 +281,9 @@ SIZE_OPTIMISED_SRC := ""
SPEED_OPTIMISED_SRC := "" SPEED_OPTIMISED_SRC := ""
ifneq ($(TARGET),$(filter $(TARGET),$(F3_TARGETS))) ifneq ($(TARGET),$(filter $(TARGET),$(F3_TARGETS)))
# SIZE_OPTIMISED_SRC := $(SIZE_OPTIMISED_SRC) \ # SIZE_OPTIMISED_SRC := $(SIZE_OPTIMISED_SRC) \
# ./src/main/common/filter.c \ # ./src/main/common/filter.c \
# SPEED_OPTIMISED_SRC := $(SPEED_OPTIMISED_SRC) \ # SPEED_OPTIMISED_SRC := $(SPEED_OPTIMISED_SRC) \
# ./src/main/common/filter.c \ # ./src/main/common/maths.c \
endif #!F3 endif #!F3

4
src/main/target/common_post.h
View file

@ -65,14 +65,14 @@
#ifndef STM32F3 #ifndef STM32F3
#define FUNCTION_COMPILE_FOR_SIZE __attribute__((optimize("-Os"))) #define FUNCTION_COMPILE_FOR_SIZE __attribute__((optimize("-Os")))
#define FUNCTION_COMPILE_NORMAL __attribute__((optimize("-O2"))) #define FUNCTION_COMPILE_NORMAL __attribute__((optimize("-O2")))
#define FUNCTION_COMPILE_FOR_SIZE __attribute__((optimize("-Ofast"))) #define FUNCTION_COMPILE_FOR_SPEED __attribute__((optimize("-Ofast")))
#define FILE_COMPILE_FOR_SIZE _Pragma("GCC optimize(\"Os\")") #define FILE_COMPILE_FOR_SIZE _Pragma("GCC optimize(\"Os\")")
#define FILE_COMPILE_NORMAL _Pragma("GCC optimize(\"O2\")") #define FILE_COMPILE_NORMAL _Pragma("GCC optimize(\"O2\")")
#define FILE_COMPILE_FOR_SPEED _Pragma("GCC optimize(\"Ofast\")") #define FILE_COMPILE_FOR_SPEED _Pragma("GCC optimize(\"Ofast\")")
#else #else
#define FUNCTION_COMPILE_FOR_SIZE #define FUNCTION_COMPILE_FOR_SIZE
#define FUNCTION_COMPILE_NORMAL #define FUNCTION_COMPILE_NORMAL
#define FUNCTION_COMPILE_FOR_SIZE #define FUNCTION_COMPILE_FOR_SPEED
#define FILE_COMPILE_FOR_SIZE #define FILE_COMPILE_FOR_SIZE
#define FILE_COMPILE_NORMAL #define FILE_COMPILE_NORMAL
#define FILE_COMPILE_FOR_SPEED #define FILE_COMPILE_FOR_SPEED