Skip to contentSkip to conversation

Speedup LTP compile time by ~20% on multi-machine

PATCH In review Andrea Cervesato 4 participants 10 messages Oct 21 – Nov 4 Kbuild

lore
Share & tools
lore
#0 lore raw

v3 cover Speedup LTP compile time by ~20% on multi-machine

The following results show how this optimization moves compile times really far from what we have now. With a single threaded build, LTP would take approximately 12 minutes to compile. With a multi-threaded build on 16 CPUs, this drops down to ~46 seconds.

time make -j16

Executed in   45.96 secs    fish           external
   usr time  519.11 secs    0.24 millis  519.11 secs
   sys time  167.13 secs    1.08 millis  167.13 secs

---
Changes in v3:
- added libs-all ordering to avoid races
- Link to v2: https://lore.kernel.org/[email protected]

Changes in v2:
- fix build race condition
- Link to v1: https://lore.kernel.org/[email protected]

---
Andrea Cervesato (3):
build: Fix library prerequisites in testcases.mk
build: Build shared libs once on subtree make
build: Parallelize subdirectory recursion in generic_trunk_target

 Makefile                            |  2 ++
 include/mk/generic_trunk_target.inc | 58 ++++++++++++++++++++++++++++++++-----
 include/mk/testcases.mk             | 14 +++++----
 testcases/kernel/Makefile           |  3 ++
 testcases/kernel/include/lib.mk     |  4 +--
 testcases/network/rpc/Makefile      |  3 ++
 6 files changed, 69 insertions(+), 15 deletions(-)

---
base-commit: 121876b3da3ff59b0dd17b4798b2e4699ba431d1
change-id: 20261020-build_system_optimize-6cd0343f08e1

Best regards,

Signature · 5 lines
Andrea Cervesato <[email protected]>


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#1 lore raw

PATCH v3 1/3 build: Fix library prerequisites in testcases.mk

From: Andrea Cervesato <[email protected]>

Fix LTPLIBS_FILES to match the actual libltp<name>.a archive names and only mark them .PHONY when MAKELEVEL == 0 so recursive leaf sub-makes do not redundantly rebuild them in parallel.

Also make directory prerequisites order-only so directory mtime updates do not trigger unnecessary archive rebuilds.

---
 include/mk/testcases.mk         | 14 ++++++++------
 testcases/kernel/include/lib.mk |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)
include/mk/testcases.mk +8 -6
index 2609535ce..5960d7485 100644
@@ -12,11 +12,11 @@ LIBLTP_DIR	:= $(abs_top_builddir)/lib
 
 LIBLTP		:= $(LIBLTP_DIR)/libltp.a
 
-$(APICMDS_DIR)/tst_kvercmp: $(APICMDS_DIR)
-	$(MAKE) -C "$^" -f "$(abs_top_srcdir)/tools/apicmds/Makefile" all
+$(APICMDS_DIR)/tst_kvercmp: | $(APICMDS_DIR)
+	$(MAKE) -C "$(APICMDS_DIR)" -f "$(abs_top_srcdir)/tools/apicmds/Makefile" all
 
-$(LIBLTP): $(LIBLTP_DIR)
-	$(MAKE) -C "$^" -f "$(abs_top_srcdir)/lib/Makefile" all
+$(LIBLTP): | $(LIBLTP_DIR)
+	$(MAKE) -C "$(LIBLTP_DIR)" -f "$(abs_top_srcdir)/lib/Makefile" all
 
 MAKE_DEPS	:= $(LIBLTP)
 
@@ -27,13 +27,15 @@ LDLIBS		+= -lltp
 ifdef LTPLIBS
 
 LTPLIBS_DIRS = $(addprefix $(abs_top_builddir)/libs/, $(LTPLIBS))
-LTPLIBS_FILES = $(addsuffix .a, $(addprefix $(abs_top_builddir)/libs/, $(foreach LIB,$(LTPLIBS),$(LIB)/lib$(LIB))))
+LTPLIBS_FILES = $(addsuffix .a, $(addprefix $(abs_top_builddir)/libs/, $(foreach LIB,$(LTPLIBS),$(LIB)/libltp$(LIB))))
 
 MAKE_DEPS += $(LTPLIBS_FILES)
 
+ifeq ($(MAKELEVEL),0)
 .PHONY: $(LTPLIBS_FILES)
+endif
 
-$(LTPLIBS_FILES): $(LTPLIBS_DIRS)
+$(LTPLIBS_FILES): | $(LTPLIBS_DIRS)
 
 $(LTPLIBS_FILES): %:
 ifdef VERBOSE
testcases/kernel/include/lib.mk +2 -2
index 40a09b77e..c1a0c6d52 100644
@@ -29,8 +29,8 @@ LDFLAGS			+= -L$(LIBKERNTEST_DIR)
 $(LIBKERNTEST_DIR):
 	mkdir -p "$@"
 
-$(LIBKERNTEST): $(LIBKERNTEST_DIR)
-	$(MAKE) -C $^ -f "$(LIBKERNTEST_SRCDIR)/Makefile" all
+$(LIBKERNTEST): | $(LIBKERNTEST_DIR)
+	$(MAKE) -C "$(LIBKERNTEST_DIR)" -f "$(LIBKERNTEST_SRCDIR)/Makefile" all
 
 MAKE_DEPS		+= $(LIBKERNTEST)
 
Signature · 5 lines
2.51.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#2 lore raw

Re: [LTP] build: Fix library prerequisites in testcases.mk

Hi Andrea,

Quoted 1 line · Andrea Cervesato

build: Fix library prerequisites in testcases.mk

--- [PATCH 3/3] ---

include/mk/generic_trunk_target.inc

Quoted 2 lines
include/mk/generic_trunk_target.inc +1 -0
+$(addsuffix -all,$(SUBDIRS)): trunk-all | $(SUBDIRS) $(MAKE_DEPS)

Medium severity: make -C testcases/kernel/syscalls -j4 SUBDIRS=getuid now exits 2 because the shared-library sub-make inherits SUBDIRS=getuid and looks for libs/getuid/Makefile. The same command succeeds before this patch; keep the test-directory selection out of shared-library sub-makes.

Verdict - Needs revision

---
Note:

The agent can sometimes produce false positives although often its findings are genuine. If you find issues with the review, please comment this email or ignore the suggestions.

Regards,
LTP AI Reviewer

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#4 lore raw

PATCH v3 2/3 build: Build shared libs once on subtree make

In reply to Andrea Cervesato

From: Andrea Cervesato <[email protected]>

When make is invoked directly in a trunk subdirectory (MAKELEVEL == 0), build shared prerequisites (libltp.a, libs, and libkerntest.a) once via MAKE_DEPS before launching parallel subdirectory builds.

---
 include/mk/generic_trunk_target.inc | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
include/mk/generic_trunk_target.inc +23 -0
index f9db7896a..aa8e500e1 100644
@@ -36,6 +36,29 @@ RECURSIVE_TARGETS		?= all install check
 
 $(eval $(get_make_dirs))
 
+ifeq ($(MAKELEVEL),0)
+ifneq ($(filter $(abs_top_builddir)/testcases%,$(CURDIR)),)
+MAKE_DEPS += $(abs_top_builddir)/lib/libltp.a $(abs_top_builddir)/libs-all
+
+$(abs_top_builddir)/lib/libltp.a:
+	mkdir -m 00755 -p "$(abs_top_builddir)/lib"
+	$(MAKE) -C "$(abs_top_builddir)/lib" -f "$(abs_top_srcdir)/lib/Makefile" all
+
+.PHONY: $(abs_top_builddir)/libs-all
+$(abs_top_builddir)/libs-all: $(LTPLIBS_FILES)
+	mkdir -m 00755 -p "$(abs_top_builddir)/libs"
+	$(MAKE) -C "$(abs_top_builddir)/libs" -f "$(abs_top_srcdir)/libs/Makefile" all
+endif
+
+ifneq ($(filter $(abs_top_builddir)/testcases/kernel/%,$(CURDIR)),)
+MAKE_DEPS += $(abs_top_builddir)/testcases/kernel/lib/libkerntest.a
+
+$(abs_top_builddir)/testcases/kernel/lib/libkerntest.a:
+	mkdir -m 00755 -p "$(abs_top_builddir)/testcases/kernel/lib"
+	$(MAKE) -C "$(abs_top_builddir)/testcases/kernel/lib" -f "$(abs_top_srcdir)/testcases/kernel/lib/Makefile" all
+endif
+endif
+
 .PHONY: $(RECURSIVE_TARGETS) $(addprefix trunk-,$(RECURSIVE_TARGETS))
 
 $(SUBDIRS): %:
Signature · 5 lines
2.51.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#5 lore raw

Re: [LTP] [PATCH v3 2/3] build: Build shared libs once on subtree make

Quoted 35 lines · Andrea Cervesato

From: Andrea Cervesato <[email protected]>

When make is invoked directly in a trunk subdirectory (MAKELEVEL == 0), build shared prerequisites (libltp.a, libs, and libkerntest.a) once via MAKE_DEPS before launching parallel subdirectory builds.

---
 include/mk/generic_trunk_target.inc | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
include/mk/generic_trunk_target.inc +16 -0
index f9db7896a..aa8e500e1 100644
@@ -36,6 +36,29 @@ RECURSIVE_TARGETS		?= all install check
 
 $(eval $(get_make_dirs))
 
+ifeq ($(MAKELEVEL),0)
+ifneq ($(filter $(abs_top_builddir)/testcases%,$(CURDIR)),)
+MAKE_DEPS += $(abs_top_builddir)/lib/libltp.a $(abs_top_builddir)/libs-all
+
+$(abs_top_builddir)/lib/libltp.a:
+	mkdir -m 00755 -p "$(abs_top_builddir)/lib"
+	$(MAKE) -C "$(abs_top_builddir)/lib" -f "$(abs_top_srcdir)/lib/Makefile" all
+
+.PHONY: $(abs_top_builddir)/libs-all
+$(abs_top_builddir)/libs-all: $(LTPLIBS_FILES)
+	mkdir -m 00755 -p "$(abs_top_builddir)/libs"
+	$(MAKE) -C "$(abs_top_builddir)/libs" -f "$(abs_top_srcdir)/libs/Makefile" all
+endif
+
+ifneq ($(filter $(abs_top_builddir)/testcases/kernel/%,$(CURDIR)),)
+MAKE_DEPS += $(abs_top_builddir)/testcases/kernel/lib/libkerntest.a

include/mk/generic_trunk_target.inc RECURSIVE_TARGETS ?= all install check · line 64

Quoted 10 lines
include/mk/generic_trunk_target.inc +7 -0
+
+$(abs_top_builddir)/testcases/kernel/lib/libkerntest.a:
+	mkdir -m 00755 -p "$(abs_top_builddir)/testcases/kernel/lib"
+	$(MAKE) -C "$(abs_top_builddir)/testcases/kernel/lib" -f "$(abs_top_srcdir)/testcases/kernel/lib/Makefile" all
+endif
+endif
+
 .PHONY: $(RECURSIVE_TARGETS) $(addprefix trunk-,$(RECURSIVE_TARGETS))
 
 $(SUBDIRS): %:

This code works but isn't elegant. How about refactoring it as follows:

-------------------

ifeq ($(MAKELEVEL),0)

ifneq ($(filter $(abs_top_builddir)/testcases%,$(CURDIR)),)

MAKE_DEPS += $(abs_top_builddir)/lib/libltp.a
MAKE_DEPS += $(abs_top_builddir)/libs-all

$(abs_top_builddir)/lib/libltp.a:

	$(MKDIR_P) "$(@D)"
	$(MAKE) -C "$(@D)" -f "$(abs_top_srcdir)/lib/Makefile" all

.PHONY: $(abs_top_builddir)/libs-all
$(abs_top_builddir)/libs-all: $(LTPLIBS_FILES)

	$(MKDIR_P) "$(@D)"
	$(MAKE) -C "$(@D)" -f "$(abs_top_srcdir)/libs/Makefile" all

endif

ifneq ($(filter $(abs_top_builddir)/testcases/kernel/%,$(CURDIR)),)

MAKE_DEPS += $(abs_top_builddir)/testcases/kernel/lib/libkerntest.a

$(abs_top_builddir)/testcases/kernel/lib/libkerntest.a:

	$(MKDIR_P) "$(@D)"
	$(MAKE) -C "$(@D)" -f "$(abs_top_srcdir)/testcases/kernel/lib/Makefile" all

endif

endif

Signature · 5 lines
Regards,
Li Wang

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#6 lore raw

Re: [LTP] [PATCH v3 2/3] build: Build shared libs once on subtree make

Quoted 9 lines

ifeq ($(MAKELEVEL),0)

ifneq ($(filter $(abs_top_builddir)/testcases%,$(CURDIR)),)

MAKE_DEPS += $(abs_top_builddir)/lib/libltp.a
MAKE_DEPS += $(abs_top_builddir)/libs-all

$(abs_top_builddir)/lib/libltp.a:

	$(MKDIR_P) "$(@D)"

Sorry, LTP doesn't define MKDIR_P, then just:

mkdir -m 00755 -p "$(@D)"

Quoted 5 lines
	$(MAKE) -C "$(@D)" -f "$(abs_top_srcdir)/lib/Makefile" all

.PHONY: $(abs_top_builddir)/libs-all
$(abs_top_builddir)/libs-all: $(LTPLIBS_FILES)

	$(MKDIR_P) "$(@D)"

mkdir -m 00755 -p "$(@D)"

Quoted 10 lines
	$(MAKE) -C "$(@D)" -f "$(abs_top_srcdir)/libs/Makefile" all

endif

ifneq ($(filter $(abs_top_builddir)/testcases/kernel/%,$(CURDIR)),)

MAKE_DEPS += $(abs_top_builddir)/testcases/kernel/lib/libkerntest.a

$(abs_top_builddir)/testcases/kernel/lib/libkerntest.a:

	$(MKDIR_P) "$(@D)"

mkdir -m 00755 -p "$(@D)"

Signature · 5 lines
Regards,
Li Wang

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#7 lore raw

PATCH v3 3/3 build: Parallelize subdirectory recursion in generic_trunk_target

In reply to Andrea Cervesato

From: Andrea Cervesato <[email protected]>

Currently, generic_trunk_target traverses $(SUBDIRS) using a serial shell 'for' loop. This serializes directory traversal and prevents 'make -jN' from building sibling directories in parallel.

Replace the shell loop with target-based recursion:
1. Map each subdirectory to a phony target: <dir>-all, <dir>-install, and <dir>-check.
2. Make 'all', 'install', and 'check' depend on these targets so GNU Make can dispatch them concurrently across available job slots.
3. In each recipe, strip the suffix with $(patsubst %-<action>,%,$@) to extract the directory name and invoke $(MAKE) -C <dir>.
4. Add explicit ordering dependencies where subdirectories produce libraries required by sibling directories (tools before testcases, kernel/lib before syscalls and mem, rpc-tirpc before basic_tests).

This cuts full build time by over 20% on multi-core systems.

---
 Makefile                            |  2 ++
 include/mk/generic_trunk_target.inc | 35 ++++++++++++++++++++++++++++-------
 testcases/kernel/Makefile           |  3 +++
 testcases/network/rpc/Makefile      |  3 +++
 4 files changed, 36 insertions(+), 7 deletions(-)
Makefile +2 -0
index 2efbe8c6c..0abb5c6b4 100644
@@ -63,6 +63,8 @@ CHECK_TARGETS		:= $(addsuffix -check,testcases lib)
 all: $(addsuffix -all,$(COMMON_TARGETS)) Version
 
 $(MAKE_TARGETS): lib-all libs-all
+# tools contains apicmds/tst_kvercmp required by some testcases
+testcases-all: tools-all
 
 .PHONY: include-all include-install
 include-install: $(top_builddir)/include/config.h include/mk/config.mk include-all
include/mk/generic_trunk_target.inc +28 -7
index aa8e500e1..8ba0c7494 100644
@@ -106,15 +106,36 @@ ifeq ($(strip $(SUBDIRS)),)
 	$(warning CURDIR is: $(CURDIR))
 	$(error SUBDIRS empty -- did you want generic_leaf_target instead?)
 else
-$(RECURSIVE_TARGETS): %: | $(SUBDIRS)
+# Recurse into subdirectories in parallel instead of using a serial shell loop.
+# Each subdirectory is mapped to a phony target (<dir>-all, <dir>-install, etc.).
+# GNU Make can then schedule sibling directories concurrently under -jN.
+all:     $(addsuffix -all,$(SUBDIRS))
+install: $(addsuffix -install,$(SUBDIRS))
+check:   $(addsuffix -check,$(SUBDIRS))
+
+.PHONY: $(addsuffix -all,$(SUBDIRS)) $(addsuffix -install,$(SUBDIRS)) $(addsuffix -check,$(SUBDIRS))
+
+# For each target (e.g. 'open-all'), strip the suffix to get the directory name,
+# build trunk-local targets first, and ensure the subdirectory exists.
+$(addsuffix -all,$(SUBDIRS)): trunk-all | $(SUBDIRS) $(MAKE_DEPS)
 ifdef VERBOSE
-	@set -e; for dir in $(SUBDIRS); do \
-	    $(MAKE) -C $$dir -f "$(abs_srcdir)/$$dir/Makefile" $@; \
-	done
+	$(MAKE) -C "$(patsubst %-all,%,$@)" -f "$(abs_srcdir)/$(patsubst %-all,%,$@)/Makefile" all
 else
-	@set -e; for dir in $(SUBDIRS); do \
-	    $(MAKE) --no-print-directory -C $$dir -f "$(abs_srcdir)/$$dir/Makefile" $@; \
-	done
+	@$(MAKE) --no-print-directory -C "$(patsubst %-all,%,$@)" -f "$(abs_srcdir)/$(patsubst %-all,%,$@)/Makefile" all
+endif
+
+$(addsuffix -install,$(SUBDIRS)): trunk-install | $(SUBDIRS) $(MAKE_DEPS)
+ifdef VERBOSE
+	$(MAKE) -C "$(patsubst %-install,%,$@)" -f "$(abs_srcdir)/$(patsubst %-install,%,$@)/Makefile" install
+else
+	@$(MAKE) --no-print-directory -C "$(patsubst %-install,%,$@)" -f "$(abs_srcdir)/$(patsubst %-install,%,$@)/Makefile" install
+endif
+
+$(addsuffix -check,$(SUBDIRS)): trunk-check | $(SUBDIRS) $(MAKE_DEPS)
+ifdef VERBOSE
+	$(MAKE) -C "$(patsubst %-check,%,$@)" -f "$(abs_srcdir)/$(patsubst %-check,%,$@)/Makefile" check
+else
+	@$(MAKE) --no-print-directory -C "$(patsubst %-check,%,$@)" -f "$(abs_srcdir)/$(patsubst %-check,%,$@)/Makefile" check
 endif
 endif
 
testcases/kernel/Makefile +3 -0
index 29e26742d..3bf5e433e 100644
@@ -54,3 +54,6 @@ FILTER_OUT_DIRS		+= containers controllers device-drivers fs io ipc mem \
 endif
 
 include $(top_srcdir)/include/mk/generic_trunk_target.mk
+
+# libkerntest.a in lib/ must be built before syscalls and mem consumers
+syscalls-all mem-all: lib-all
testcases/network/rpc/Makefile +3 -0
index 6ecb1a665..8d12bdf1e 100644
@@ -9,3 +9,6 @@ include $(top_srcdir)/include/mk/env_pre.mk
 INSTALL_TARGETS		:= *.sh
 
 include $(top_srcdir)/include/mk/generic_trunk_target.mk
+
+# librpc-tirpc.a in rpc-tirpc/ must be built before basic_tests
+basic_tests-all: rpc-tirpc-all
Signature · 5 lines
2.51.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#8 lore raw

Re: [LTP] [PATCH v3 3/3] build: Parallelize subdirectory recursion in generic_trunk_target

Quoted 15 lines

ifdef VERBOSE

include/mk/generic_trunk_target.inc +7 -6
-	@set -e; for dir in $(SUBDIRS); do \
-	    $(MAKE) -C $$dir -f "$(abs_srcdir)/$$dir/Makefile" $@; \
-	done
+	$(MAKE) -C "$(patsubst %-all,%,$@)" -f "$(abs_srcdir)/$(patsubst %-all,%,$@)/Makefile" all
 else
-	@set -e; for dir in $(SUBDIRS); do \
-	    $(MAKE) --no-print-directory -C $$dir -f "$(abs_srcdir)/$$dir/Makefile" $@; \
-	done
+	@$(MAKE) --no-print-directory -C "$(patsubst %-all,%,$@)" -f "$(abs_srcdir)/$(patsubst %-all,%,$@)/Makefile" all
+endif
+
+$(addsuffix -install,$(SUBDIRS)): trunk-install | $(SUBDIRS) $(MAKE_DEPS)
+ifdef VERBOSE
+	$(MAKE) -C "$(patsubst %-install,%,$@)" -f "$(abs_srcdir)/$(patsubst %-install,%,$@)/Makefile" install

include/mk/generic_trunk_target.inc ifeq ($(strip $(SUBDIRS)),) · line 139

Quoted 10 lines
include/mk/generic_trunk_target.inc +9 -0
+else
+	@$(MAKE) --no-print-directory -C "$(patsubst %-install,%,$@)" -f "$(abs_srcdir)/$(patsubst %-install,%,$@)/Makefile" install
+endif
+
+$(addsuffix -check,$(SUBDIRS)): trunk-check | $(SUBDIRS) $(MAKE_DEPS)
+ifdef VERBOSE
+	$(MAKE) -C "$(patsubst %-check,%,$@)" -f "$(abs_srcdir)/$(patsubst %-check,%,$@)/Makefile" check
+else
+	@$(MAKE) --no-print-directory -C "$(patsubst %-check,%,$@)" -f "$(abs_srcdir)/$(patsubst %-check,%,$@)/Makefile" check
 endif

Maybe we could refactor those lines to something like this:

ifdef VERBOSE
Q :=
SUBMAKE := $(MAKE)
else
Q := @
SUBMAKE := $(MAKE) --no-print-directory
endif

all:     $(addsuffix -all,$(SUBDIRS))
install: $(addsuffix -install,$(SUBDIRS))
check:   $(addsuffix -check,$(SUBDIRS))

.PHONY: $(addsuffix -all,$(SUBDIRS)) $(addsuffix -install,$(SUBDIRS)) $(addsuffix -check,$(SUBDIRS))

$(addsuffix -all,$(SUBDIRS)): %-all: trunk-all | $(SUBDIRS) $(MAKE_DEPS)

	$(Q)$(SUBMAKE) -C "$*" -f "$(abs_srcdir)/$*/Makefile" all

$(addsuffix -install,$(SUBDIRS)): %-install: trunk-install | $(SUBDIRS) $(MAKE_DEPS)

	$(Q)$(SUBMAKE) -C "$*" -f "$(abs_srcdir)/$*/Makefile" install

$(addsuffix -check,$(SUBDIRS)): %-check: trunk-check | $(SUBDIRS) $(MAKE_DEPS)

	$(Q)$(SUBMAKE) -C "$*" -f "$(abs_srcdir)/$*/Makefile" check
Signature · 5 lines
Regards,
Li Wang

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
Reviewed-by
#9 lore raw

Re: [LTP] [PATCH v3 3/3] build: Parallelize subdirectory recursion in generic_trunk_target

Hi Li, Andrea,

Quoted 42 lines
Quoted 15 lines

ifdef VERBOSE

(quoted diff) +7 -6
-	@set -e; for dir in $(SUBDIRS); do \
-	    $(MAKE) -C $$dir -f "$(abs_srcdir)/$$dir/Makefile" $@; \
-	done
+	$(MAKE) -C "$(patsubst %-all,%,$@)" -f "$(abs_srcdir)/$(patsubst %-all,%,$@)/Makefile" all
 else
-	@set -e; for dir in $(SUBDIRS); do \
-	    $(MAKE) --no-print-directory -C $$dir -f "$(abs_srcdir)/$$dir/Makefile" $@; \
-	done
+	@$(MAKE) --no-print-directory -C "$(patsubst %-all,%,$@)" -f "$(abs_srcdir)/$(patsubst %-all,%,$@)/Makefile" all
+endif
+
+$(addsuffix -install,$(SUBDIRS)): trunk-install | $(SUBDIRS) $(MAKE_DEPS)
+ifdef VERBOSE
+	$(MAKE) -C "$(patsubst %-install,%,$@)" -f "$(abs_srcdir)/$(patsubst %-install,%,$@)/Makefile" install

Review

Quoted 10 lines
(quoted diff) +9 -0
+else
+	@$(MAKE) --no-print-directory -C "$(patsubst %-install,%,$@)" -f "$(abs_srcdir)/$(patsubst %-install,%,$@)/Makefile" install
+endif
+
+$(addsuffix -check,$(SUBDIRS)): trunk-check | $(SUBDIRS) $(MAKE_DEPS)
+ifdef VERBOSE
+	$(MAKE) -C "$(patsubst %-check,%,$@)" -f "$(abs_srcdir)/$(patsubst %-check,%,$@)/Makefile" check
+else
+	@$(MAKE) --no-print-directory -C "$(patsubst %-check,%,$@)" -f "$(abs_srcdir)/$(patsubst %-check,%,$@)/Makefile" check
 endif

Maybe we could refactor those lines to something like this:

ifdef VERBOSE
Q :=
SUBMAKE := $(MAKE)
else
Q := @
SUBMAKE := $(MAKE) --no-print-directory
endif

all:     $(addsuffix -all,$(SUBDIRS))
install: $(addsuffix -install,$(SUBDIRS))
check:   $(addsuffix -check,$(SUBDIRS))

.PHONY: $(addsuffix -all,$(SUBDIRS)) $(addsuffix -install,$(SUBDIRS)) $(addsuffix -check,$(SUBDIRS))

Quoted 8 lines

$(addsuffix -all,$(SUBDIRS)): %-all: trunk-all | $(SUBDIRS) $(MAKE_DEPS)

	$(Q)$(SUBMAKE) -C "$*" -f "$(abs_srcdir)/$*/Makefile" all

$(addsuffix -install,$(SUBDIRS)): %-install: trunk-install | $(SUBDIRS) $(MAKE_DEPS)

	$(Q)$(SUBMAKE) -C "$*" -f "$(abs_srcdir)/$*/Makefile" install

$(addsuffix -check,$(SUBDIRS)): %-check: trunk-check | $(SUBDIRS) $(MAKE_DEPS)

	$(Q)$(SUBMAKE) -C "$*" -f "$(abs_srcdir)/$*/Makefile" check

Very good point.
BTW similar cleanup with variable could be done in include/mk/rules.mk.

I try to test the patch once github works again.
https://www.githubstatus.com/

Kind regards,
Petr

mk/generic_trunk_target.inc +13 -23
index 6975507e81..8ed8ee89c0 100644
@@ -78,11 +78,14 @@ endif
 
 install: trunk-install
 
-# Print out CURDIR to check for a recursion issue.
-ifeq ($(strip $(SUBDIRS)),)
-	$(warning CURDIR is: $(CURDIR))
-	$(error SUBDIRS empty -- did you want generic_leaf_target instead?)
+ifdef VERBOSE
+Q :=
+SUBMAKE := $(MAKE)
 else
+Q := @
+SUBMAKE := $(MAKE) --no-print-directory
+endif
+
 # Recurse into subdirectories in parallel instead of using a serial shell loop.
 # Each subdirectory is mapped to a phony target (<dir>-all, <dir>-install, etc.).
 # GNU Make can then schedule sibling directories concurrently under -jN.
@@ -94,27 +97,14 @@ check:   $(addsuffix -check,$(SUBDIRS))
 
 # For each target (e.g. 'open-all'), strip the suffix to get the directory name,
 # build trunk-local targets first, and ensure the subdirectory exists.
-$(addsuffix -all,$(SUBDIRS)): trunk-all | $(SUBDIRS) $(MAKE_DEPS)
-ifdef VERBOSE
-	$(MAKE) -C "$(patsubst %-all,%,$@)" -f "$(abs_srcdir)/$(patsubst %-all,%,$@)/Makefile" all
-else
-	@$(MAKE) --no-print-directory -C "$(patsubst %-all,%,$@)" -f "$(abs_srcdir)/$(patsubst %-all,%,$@)/Makefile" all
-endif
+$(addsuffix -all,$(SUBDIRS)): %-all: trunk-all | $(SUBDIRS) $(MAKE_DEPS)
+	$(Q)$(SUBMAKE) -C "$*" -f "$(abs_srcdir)/$*/Makefile" all
 
-$(addsuffix -install,$(SUBDIRS)): trunk-install | $(SUBDIRS) $(MAKE_DEPS)
-ifdef VERBOSE
-	$(MAKE) -C "$(patsubst %-install,%,$@)" -f "$(abs_srcdir)/$(patsubst %-install,%,$@)/Makefile" install
-else
-	@$(MAKE) --no-print-directory -C "$(patsubst %-install,%,$@)" -f "$(abs_srcdir)/$(patsubst %-install,%,$@)/Makefile" install
-endif
+$(addsuffix -install,$(SUBDIRS)): %-install: trunk-install | $(SUBDIRS) $(MAKE_DEPS)
+	$(Q)$(SUBMAKE) -C "$*" -f "$(abs_srcdir)/$*/Makefile" install
 
-$(addsuffix -check,$(SUBDIRS)): trunk-check | $(SUBDIRS) $(MAKE_DEPS)
-ifdef VERBOSE
-	$(MAKE) -C "$(patsubst %-check,%,$@)" -f "$(abs_srcdir)/$(patsubst %-check,%,$@)/Makefile" check
-else
-	@$(MAKE) --no-print-directory -C "$(patsubst %-check,%,$@)" -f "$(abs_srcdir)/$(patsubst %-check,%,$@)/Makefile" check
-endif
-endif
+$(addsuffix -check,$(SUBDIRS)): %-check: trunk-check | $(SUBDIRS) $(MAKE_DEPS)
+	$(Q)$(SUBMAKE) -C "$*" -f "$(abs_srcdir)/$*/Makefile" check
 
 check: trunk-check
 
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp