mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
7bc15acee2
Goals:
- Untangle dependency resolution and feature checking for better maintainability
- Improve performance of "make info-boards-supported"
Changes:
- Makefile.dep
- Dropped handling of default modules and recursion
- Now only dependencies of the current set of used modules and pkgs are
added
==> External recursion is needed to catch transient dependencies
- Changed Makefile.features:
- Dropped checking of provided features
- Dropped populating FEATURES_USED with provided features that are required
or optional
- Dropped populating FEATURES_MISSING with required but not provided
features
- Dropped adding modules implementing used features to USE_MODULE
==> This now only populates FEATURES_PROVIDED, nothing more
- Added makefiles/features_check.inc.mk:
- This performs the population of FEATURES_USED and FEATURES_MISSING now
- Added makefiles/features_modules.inc.mk:
- This performs now the addition of modules implementing used features
- Added makefiles/dependency_resolution.inc.mk:
- This now performs the recursion required to catch transient dependencies
- Also the feature check is performed recursively to handle also required
and optional features of the transient dependencies
- DEFAULT_MODULES are added repeatedly to allow it to be extended based on
used features and modules
==> This allows modules to have optional dependencies, as these
dependencies can be blacklisted
- Use simply expanded variables instead of recursively expended variables
(`foo := $(bar)` instead `foo = $(bar)`) for internal variables during feature
resolution. This improves performance significantly for
`make info-boards-supported`.
- Reduce dependency resolution steps in `make info-boards-supported`
- Globally resolve dependencies without any features (including arch)
provided
==> This results in the common subset of feature requirements and modules
used
- But for individual boards additional modules might be used on top due
to architecture specific dependencies or optional features
- Boards not supporting this subset of commonly required features are not
supported, so no additional dependency resolution is needed for them
- For each board supporting the common set of requirements a complete
dependency resolution is still needed to also catch architecture specific
hacks
- But this resolution is seeded with the common set of dependencies to
speed this up
134 lines
5.2 KiB
Makefile
134 lines
5.2 KiB
Makefile
.PHONY: info-buildsizes info-buildsizes-diff info-features-missing \
|
|
info-boards-features-missing
|
|
|
|
# Perform dependency resolution without having included
|
|
# $(RIOTBASE)/Makefile.features for now. This results in no optional modules and
|
|
# no architecture specific handling being done. The result will be a subset of
|
|
# used modules and requirements that is present in for *all* boards, so this can
|
|
# be cached to speed up individual dependency checks
|
|
include $(RIOTMAKE)/defaultmodules.inc.mk
|
|
# add default modules
|
|
USEMODULE += $(filter-out $(DISABLE_MODULE),$(DEFAULT_MODULE))
|
|
include $(RIOTMAKE)/dependency_resolution.inc.mk
|
|
|
|
BOARDSDIR_GLOBAL := $(BOARDSDIR)
|
|
USEMODULE_GLOBAL := $(USEMODULE)
|
|
USEPKG_GLOBAL := $(USEPKG)
|
|
FEATURES_REQUIRED_GLOBAL := $(FEATURES_REQUIRED)
|
|
FEATURES_OPTIONAL_GLOBAL := $(FEATURES_OPTIONAL)
|
|
FEATURES_CONFLICT_GLOBAL := $(FEATURES_CONFLICT)
|
|
FEATURES_CONFLICT_MSG_GLOBAL := $(FEATURES_MSG_CONFLICT)
|
|
DISABLE_MODULE_GLOBAL := $(DISABLE_MODULE)
|
|
DEFAULT_MODULE_GLOBAL := $(DEFAULT_MODULE)
|
|
FEATURES_BLACKLIST_GLOBAL := $(FEATURES_BLACKLIST)
|
|
|
|
define board_unsatisfied_features
|
|
BOARD := $(1)
|
|
BOARDSDIR := $(BOARDSDIR_GLOBAL)
|
|
USEMODULE := $(USEMODULE_GLOBAL)
|
|
USEPKG := $(USEPKG_GLOBAL)
|
|
DISABLE_MODULE := $(DISABLE_MODULE_GLOBAL)
|
|
DEFAULT_MODULE := $(DEFAULT_MODULE_GLOBAL)
|
|
FEATURES_REQUIRED := $(FEATURES_REQUIRED_GLOBAL)
|
|
FEATURES_OPTIONAL := $(FEATURES_OPTIONAL_GLOBAL)
|
|
FEATURES_CONFLICT := $(FEATURES_CONFLICT_GLOBAL)
|
|
FEATURES_CONFLICT_MSG := $(FEATURES_CONFLICT_MSG_GLOBAL)
|
|
FEATURES_BLACKLIST:= $(FEATURES_BLACKLIST_GLOBAL)
|
|
|
|
# Remove board specific variables set by Makefile.features/Makefile.dep
|
|
FEATURES_PROVIDED :=
|
|
FEATURES_USED :=
|
|
|
|
# Undefine variables that must not be defined when starting.
|
|
# Some are sometime set as `?=`
|
|
undefine CPU
|
|
undefine CPU_MODEL
|
|
|
|
# Replicate Makefile.include handling that sets BOARDSDIR to RIOTBOARD
|
|
# when BOARD is not found in BOARDSDIR
|
|
ifeq (,$(wildcard $(BOARDSDIR_GLOBAL)/$(BOARD)/.))
|
|
BOARDSDIR = $(RIOTBOARD)
|
|
endif
|
|
|
|
include $(RIOTBASE)/Makefile.features
|
|
# FEATURES_USED must be populated first in this case so that dependency
|
|
# resolution can take optional features into account during the first pass.
|
|
# Also: This allows us to skip resolution if already a missing feature is
|
|
# detected
|
|
include $(RIOTMAKE)/features_check.inc.mk
|
|
ifneq (,$$(FEATURES_MISSING))
|
|
# Skip full dependency resolution, as even without optional modules features
|
|
# and architecture specific limitations already some features are missing
|
|
BOARDS_FEATURES_MISSING += "$(1) $$(FEATURES_MISSING)"
|
|
BOARDS_WITH_MISSING_FEATURES += $(1)
|
|
else
|
|
include $(RIOTMAKE)/dependency_resolution.inc.mk
|
|
|
|
ifneq (,$$(FEATURES_MISSING))
|
|
BOARDS_FEATURES_MISSING += "$(1) $$(FEATURES_MISSING)"
|
|
BOARDS_WITH_MISSING_FEATURES += $(1)
|
|
endif
|
|
|
|
ifneq (,$$(FEATURES_USED_BLACKLISTED))
|
|
BOARDS_FEATURES_USED_BLACKLISTED += "$(1) $$(FEATURES_USED_BLACKLISTED)"
|
|
BOARDS_WITH_BLACKLISTED_FEATURES += $(1)
|
|
endif
|
|
endif
|
|
|
|
ifneq (,$$(DEPENDENCY_DEBUG))
|
|
$$(call file_save_dependencies_variables,dependencies_info-boards-supported)
|
|
endif
|
|
endef
|
|
|
|
BOARDS := $(filter $(if $(BOARD_WHITELIST), $(BOARD_WHITELIST), %), $(BOARDS))
|
|
BOARDS := $(filter-out $(BOARD_BLACKLIST), $(BOARDS))
|
|
|
|
BOARDS_WITH_MISSING_FEATURES :=
|
|
BOARDS_FEATURES_MISSING :=
|
|
BOARDS_WITH_BLACKLISTED_FEATURES :=
|
|
BOARDS_FEATURES_USED_BLACKLISTED :=
|
|
|
|
$(foreach BOARD, $(BOARDS), $(eval $(call board_unsatisfied_features,$(BOARD))))
|
|
BOARDS := $(filter-out $(BOARDS_WITH_MISSING_FEATURES) $(BOARDS_WITH_BLACKLISTED_FEATURES), $(BOARDS))
|
|
|
|
info-buildsizes: SHELL=bash
|
|
info-buildsizes:
|
|
@echo -e " text\t data\t bss\t dec\tboard"; \
|
|
for board in $(BOARDS); do \
|
|
echo "$$(BOARD=$${board} $(MAKE) --no-print-directory info-buildsize 2>/dev/null | tail -n-1 | cut -f-4)" "$${board}"; \
|
|
done;
|
|
|
|
info-buildsizes-diff: SHELL=bash
|
|
info-buildsizes-diff:
|
|
@echo -e "text\tdata\tbss\tdec\tBOARD/BINDIRBASE\n"; \
|
|
for board in $(BOARDS); do \
|
|
for BINDIRBASE in $${OLDBIN} $${NEWBIN}; do \
|
|
BINDIRBASE=$${BINDIRBASE} BOARD=$${board} $(MAKE) info-buildsize --no-print-directory 2>/dev/null | tail -n-1 | cut -f-4; \
|
|
done | \
|
|
while read -a OLD && read -a NEW; do \
|
|
for I in 0 1 2 3; do \
|
|
if [[ -n "$${NEW[I]}" && -n "$${OLD[I]}" ]]; then \
|
|
DIFF=$$(($${NEW[I]} - $${OLD[I]})); \
|
|
if [[ "$${DIFF}" -gt 0 ]]; then $(COLOR_ECHO) -n "$(COLOR_RED)"; fi; \
|
|
if [[ "$${DIFF}" -lt 0 ]]; then $(COLOR_ECHO) -n "$(COLOR_GREEN)"; fi; \
|
|
else \
|
|
DIFF="$(COLOR_RED)ERR"; \
|
|
fi; \
|
|
echo -ne "$${DIFF}\t$(COLOR_RESET)"; \
|
|
done; \
|
|
echo "$${board}"; \
|
|
for I in 0 1 2 3; do echo -ne "$${OLD[I]-$(COLOR_RED)ERR$(COLOR_RESET)}\t"; done; echo -e "$${OLDBIN}"; \
|
|
for I in 0 1 2 3; do echo -ne "$${NEW[I]-$(COLOR_RED)ERR$(COLOR_RESET)}\t"; done; echo -e "$${NEWBIN}\n"; \
|
|
done; \
|
|
done;
|
|
|
|
info-boards-supported:
|
|
@echo $(BOARDS)
|
|
|
|
info-boards-features-missing:
|
|
@for f in $(BOARDS_FEATURES_MISSING); do echo $${f}; done | column -t
|
|
|
|
# Reset BOARDSDIR so unchanged for makefiles included after, for now only
|
|
# needed for buildtests.inc.mk
|
|
BOARDSDIR := $(BOARDSDIR_GLOBAL)
|