From 9d8ef5c2e8a0aa0b9c27034a1dde0051a385220a Mon Sep 17 00:00:00 2001 From: George Hahn Date: Fri, 29 Apr 2022 22:55:36 -0600 Subject: [PATCH 1/5] Parallelize builds --- movement/make/make_alternate_fw.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/movement/make/make_alternate_fw.sh b/movement/make/make_alternate_fw.sh index 575c9e52..bd8154ef 100755 --- a/movement/make/make_alternate_fw.sh +++ b/movement/make/make_alternate_fw.sh @@ -22,11 +22,11 @@ do do COLOR=$(echo "$color" | tr '[:lower:]' '[:upper:]') make clean - make LED=$COLOR FIRMWARE=$VARIANT + make LED=$COLOR FIRMWARE=$VARIANT -j `nproc` mv "build/watch.uf2" "$fw_dir/$variant-$color.uf2" done make clean - emmake make FIRMWARE=$VARIANT + emmake make FIRMWARE=$VARIANT -j `nproc` mkdir "$sim_dir/$variant/" mv "build/watch.wasm" "$sim_dir/$variant/" mv "build/watch.js" "$sim_dir/$variant/" From 0269681ac323bf09f130132454258d279c92f89f Mon Sep 17 00:00:00 2001 From: George Hahn Date: Tue, 10 May 2022 00:37:02 -0600 Subject: [PATCH 2/5] Perform OS detection in makefile --- make.mk | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/make.mk b/make.mk index ac5be775..d7fecd20 100644 --- a/make.mk +++ b/make.mk @@ -9,7 +9,21 @@ endif ############################################################################## .PHONY: all directory clean size -ifeq ($(OS), Windows_NT) +# OS detection, adapted from https://gist.github.com/sighingnow/deee806603ec9274fd47 +DETECTED_OS := +ifeq ($(OS),Windows_NT) + DETECTED_OS = WINDOWS +else + UNAME_S := $(shell uname -s) + ifeq ($(UNAME_S),Linux) + DETECTED_OS = LINUX + endif + ifeq ($(UNAME_S),Darwin) + DETECTED_OS = OSX + endif +endif +$(if ${VERBOSE},$(info OS detected: $(DETECTED_OS))) + MKDIR = gmkdir else MKDIR = mkdir From 0ab63691f20eafe5544787b7c7d867925bae4eb8 Mon Sep 17 00:00:00 2001 From: George Hahn Date: Tue, 10 May 2022 00:37:37 -0600 Subject: [PATCH 3/5] Move parallel flag into makefile with crossplatform support --- make.mk | 11 +++++++++++ movement/make/make_alternate_fw.sh | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/make.mk b/make.mk index d7fecd20..3424f9c9 100644 --- a/make.mk +++ b/make.mk @@ -29,6 +29,17 @@ else MKDIR = mkdir endif +ifeq ($(DETECTED_OS), LINUX) + MAKEFLAGS += -j `nproc` +endif +ifeq ($(DETECTED_OS), OSX) + NPROCS = $(shell sysctl hw.ncpu | grep -o '[0-9]\+') + MAKEFLAGS += -j $(NPROCS) +endif +ifeq ($(DETECTED_OS), WINDOWS) + MAKEFLAGS += -j $(NUMBER_OF_PROCESSORS) +endif + ifndef EMSCRIPTEN CC = arm-none-eabi-gcc OBJCOPY = arm-none-eabi-objcopy diff --git a/movement/make/make_alternate_fw.sh b/movement/make/make_alternate_fw.sh index bd8154ef..575c9e52 100755 --- a/movement/make/make_alternate_fw.sh +++ b/movement/make/make_alternate_fw.sh @@ -22,11 +22,11 @@ do do COLOR=$(echo "$color" | tr '[:lower:]' '[:upper:]') make clean - make LED=$COLOR FIRMWARE=$VARIANT -j `nproc` + make LED=$COLOR FIRMWARE=$VARIANT mv "build/watch.uf2" "$fw_dir/$variant-$color.uf2" done make clean - emmake make FIRMWARE=$VARIANT -j `nproc` + emmake make FIRMWARE=$VARIANT mkdir "$sim_dir/$variant/" mv "build/watch.wasm" "$sim_dir/$variant/" mv "build/watch.js" "$sim_dir/$variant/" From 190dca0a777a8961460faaf993c9e34f921a9a1a Mon Sep 17 00:00:00 2001 From: George Hahn Date: Tue, 10 May 2022 00:42:43 -0600 Subject: [PATCH 4/5] fixup: restore deleted line --- make.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/make.mk b/make.mk index 3424f9c9..d8e2bf8a 100644 --- a/make.mk +++ b/make.mk @@ -24,6 +24,7 @@ else endif $(if ${VERBOSE},$(info OS detected: $(DETECTED_OS))) +ifeq ($(OS), Windows_NT) MKDIR = gmkdir else MKDIR = mkdir From c40d75b8765a2972bb6a80a7c6f56865b52063e4 Mon Sep 17 00:00:00 2001 From: George Hahn Date: Thu, 19 May 2022 00:33:31 -0600 Subject: [PATCH 5/5] Make submodule and directory rules order-only prerequisites on objects This instructs make to run the tinyusb and directory rules before building any objects. Docs: [1]. After this change, `make clean` started running the tinyusb submodule rule before cleaning. This appears to have been caused by one of the `build/*.d` files overlapping with the `tinyusb` name, triggering that rule. I didn't trace this all the way down to a root cause, but switching the include to something less broad solved the issue. Roughly guided by [2]. 1: https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html 2: http://make.mad-scientist.net/papers/advanced-auto-dependency-generation/ --- rules.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/rules.mk b/rules.mk index 2f2f3922..8de3fc1e 100644 --- a/rules.mk +++ b/rules.mk @@ -7,9 +7,9 @@ SUBMODULES = tinyusb COBRA = cobra -f ifndef EMSCRIPTEN -all: directory $(SUBMODULES) $(BUILD)/$(BIN).elf $(BUILD)/$(BIN).hex $(BUILD)/$(BIN).bin $(BUILD)/$(BIN).uf2 size +all: $(BUILD)/$(BIN).elf $(BUILD)/$(BIN).hex $(BUILD)/$(BIN).bin $(BUILD)/$(BIN).uf2 size else -all: directory $(SUBMODULES) $(BUILD)/$(BIN).html +all: $(BUILD)/$(BIN).html endif $(BUILD)/$(BIN).html: $(OBJS) @@ -35,13 +35,14 @@ $(BUILD)/$(BIN).uf2: $(BUILD)/$(BIN).bin @echo UF2CONV $@ @$(UF2) $^ -co $@ +.phony: $(SUBMODULES) $(SUBMODULES): git submodule update --init install: @$(UF2) -D $(BUILD)/$(BIN).uf2 -%.o: +$(BUILD)/%.o: | $(SUBMODULES) directory @echo CC $@ @$(CC) $(CFLAGS) $(filter %/$(subst .o,.c,$(notdir $@)), $(SRCS)) -c -o $@ @@ -59,4 +60,6 @@ clean: analyze: @$(COBRA) basic $(INCLUDES) $(DEFINES) $(SRCS) --include $(wildcard $(BUILD)/*.d) +DEPFILES := $(SRCS:%.c=$(BUILD)/%.d) + +-include $(wildcard $(DEPFILES))