* [PATCH] selftests: use "$(MAKE)" instead of "make"
@ 2019-08-16 16:06 Ilya Leoshkevich
2019-08-19 20:07 ` shuah
0 siblings, 1 reply; 2+ messages in thread
From: Ilya Leoshkevich @ 2019-08-16 16:06 UTC (permalink / raw)
To: Shuah Khan
Cc: linux-kselftest, bpf, Kees Cook, Heiko Carstens, Vasily Gorbik,
Ilya Leoshkevich
When doing "make kselftest TARGETS=bpf -j12", bpf progs end up being
compiled sequentially and thus slowly.
The reason is that parent make (tools/testing/selftests/Makefile) does
not share its jobserver with child make
(tools/testing/selftests/bpf/Makefile), therefore the latter runs with
-j1.
Change all instances of "make" to "$(MAKE)", so that the whole make
hierarchy runs using a single jobserver.
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
I tested this with:
make kselftest
make -C tools/testing/selftests
make -C tools/testing/selftests/bpf
Unfortunately, in my setup a lot of tests fail for a number of reasons.
However, this change does not make it worse.
tools/testing/selftests/Makefile | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
index 25b43a8c2b15..c3feccb99ff5 100644
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@ -126,9 +126,9 @@ endif
# in the default INSTALL_HDR_PATH usr/include.
khdr:
ifeq (1,$(DEFAULT_INSTALL_HDR_PATH))
- make --no-builtin-rules ARCH=$(ARCH) -C $(top_srcdir) headers_install
+ $(MAKE) --no-builtin-rules ARCH=$(ARCH) -C $(top_srcdir) headers_install
else
- make --no-builtin-rules INSTALL_HDR_PATH=$$BUILD/usr \
+ $(MAKE) --no-builtin-rules INSTALL_HDR_PATH=$$BUILD/usr \
ARCH=$(ARCH) -C $(top_srcdir) headers_install
endif
@@ -136,35 +136,35 @@ all: khdr
@for TARGET in $(TARGETS); do \
BUILD_TARGET=$$BUILD/$$TARGET; \
mkdir $$BUILD_TARGET -p; \
- make OUTPUT=$$BUILD_TARGET -C $$TARGET;\
+ $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET;\
done;
run_tests: all
@for TARGET in $(TARGETS); do \
BUILD_TARGET=$$BUILD/$$TARGET; \
- make OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests;\
+ $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests;\
done;
hotplug:
@for TARGET in $(TARGETS_HOTPLUG); do \
BUILD_TARGET=$$BUILD/$$TARGET; \
- make OUTPUT=$$BUILD_TARGET -C $$TARGET;\
+ $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET;\
done;
run_hotplug: hotplug
@for TARGET in $(TARGETS_HOTPLUG); do \
BUILD_TARGET=$$BUILD/$$TARGET; \
- make OUTPUT=$$BUILD_TARGET -C $$TARGET run_full_test;\
+ $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_full_test;\
done;
clean_hotplug:
@for TARGET in $(TARGETS_HOTPLUG); do \
BUILD_TARGET=$$BUILD/$$TARGET; \
- make OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\
+ $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\
done;
run_pstore_crash:
- make -C pstore run_crash
+ $(MAKE) -C pstore run_crash
# Use $BUILD as the default install root. $BUILD points to the
# right output location for the following cases:
@@ -184,7 +184,7 @@ ifdef INSTALL_PATH
install -m 744 kselftest/prefix.pl $(INSTALL_PATH)/kselftest/
@for TARGET in $(TARGETS); do \
BUILD_TARGET=$$BUILD/$$TARGET; \
- make OUTPUT=$$BUILD_TARGET -C $$TARGET INSTALL_PATH=$(INSTALL_PATH)/$$TARGET install; \
+ $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET INSTALL_PATH=$(INSTALL_PATH)/$$TARGET install; \
done;
@# Ask all targets to emit their test scripts
@@ -203,7 +203,7 @@ ifdef INSTALL_PATH
echo "[ -w /dev/kmsg ] && echo \"kselftest: Running tests in $$TARGET\" >> /dev/kmsg" >> $(ALL_SCRIPT); \
echo "cd $$TARGET" >> $(ALL_SCRIPT); \
echo -n "run_many" >> $(ALL_SCRIPT); \
- make -s --no-print-directory OUTPUT=$$BUILD_TARGET -C $$TARGET emit_tests >> $(ALL_SCRIPT); \
+ $(MAKE) -s --no-print-directory OUTPUT=$$BUILD_TARGET -C $$TARGET emit_tests >> $(ALL_SCRIPT); \
echo "" >> $(ALL_SCRIPT); \
echo "cd \$$ROOT" >> $(ALL_SCRIPT); \
done;
@@ -216,7 +216,7 @@ endif
clean:
@for TARGET in $(TARGETS); do \
BUILD_TARGET=$$BUILD/$$TARGET; \
- make OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\
+ $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\
done;
.PHONY: khdr all run_tests hotplug run_hotplug clean_hotplug run_pstore_crash install clean
--
2.21.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] selftests: use "$(MAKE)" instead of "make"
2019-08-16 16:06 [PATCH] selftests: use "$(MAKE)" instead of "make" Ilya Leoshkevich
@ 2019-08-19 20:07 ` shuah
0 siblings, 0 replies; 2+ messages in thread
From: shuah @ 2019-08-19 20:07 UTC (permalink / raw)
To: Ilya Leoshkevich
Cc: linux-kselftest, bpf, Kees Cook, Heiko Carstens, Vasily Gorbik, shuah
On 8/16/19 10:06 AM, Ilya Leoshkevich wrote:
> When doing "make kselftest TARGETS=bpf -j12", bpf progs end up being
> compiled sequentially and thus slowly.
>
> The reason is that parent make (tools/testing/selftests/Makefile) does
> not share its jobserver with child make
> (tools/testing/selftests/bpf/Makefile), therefore the latter runs with
> -j1.
>
> Change all instances of "make" to "$(MAKE)", so that the whole make
> hierarchy runs using a single jobserver.
>
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
> ---
> I tested this with:
>
> make kselftest
> make -C tools/testing/selftests
> make -C tools/testing/selftests/bpf
>
> Unfortunately, in my setup a lot of tests fail for a number of reasons.
> However, this change does not make it worse.
>
> tools/testing/selftests/Makefile | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
> index 25b43a8c2b15..c3feccb99ff5 100644
> --- a/tools/testing/selftests/Makefile
> +++ b/tools/testing/selftests/Makefile
> @@ -126,9 +126,9 @@ endif
> # in the default INSTALL_HDR_PATH usr/include.
> khdr:
> ifeq (1,$(DEFAULT_INSTALL_HDR_PATH))
> - make --no-builtin-rules ARCH=$(ARCH) -C $(top_srcdir) headers_install
> + $(MAKE) --no-builtin-rules ARCH=$(ARCH) -C $(top_srcdir) headers_install
> else
> - make --no-builtin-rules INSTALL_HDR_PATH=$$BUILD/usr \
> + $(MAKE) --no-builtin-rules INSTALL_HDR_PATH=$$BUILD/usr \
> ARCH=$(ARCH) -C $(top_srcdir) headers_install
> endif
>
> @@ -136,35 +136,35 @@ all: khdr
> @for TARGET in $(TARGETS); do \
> BUILD_TARGET=$$BUILD/$$TARGET; \
> mkdir $$BUILD_TARGET -p; \
> - make OUTPUT=$$BUILD_TARGET -C $$TARGET;\
> + $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET;\
> done;
>
> run_tests: all
> @for TARGET in $(TARGETS); do \
> BUILD_TARGET=$$BUILD/$$TARGET; \
> - make OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests;\
> + $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests;\
> done;
>
> hotplug:
> @for TARGET in $(TARGETS_HOTPLUG); do \
> BUILD_TARGET=$$BUILD/$$TARGET; \
> - make OUTPUT=$$BUILD_TARGET -C $$TARGET;\
> + $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET;\
> done;
>
> run_hotplug: hotplug
> @for TARGET in $(TARGETS_HOTPLUG); do \
> BUILD_TARGET=$$BUILD/$$TARGET; \
> - make OUTPUT=$$BUILD_TARGET -C $$TARGET run_full_test;\
> + $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_full_test;\
> done;
>
> clean_hotplug:
> @for TARGET in $(TARGETS_HOTPLUG); do \
> BUILD_TARGET=$$BUILD/$$TARGET; \
> - make OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\
> + $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\
> done;
>
> run_pstore_crash:
> - make -C pstore run_crash
> + $(MAKE) -C pstore run_crash
>
> # Use $BUILD as the default install root. $BUILD points to the
> # right output location for the following cases:
> @@ -184,7 +184,7 @@ ifdef INSTALL_PATH
> install -m 744 kselftest/prefix.pl $(INSTALL_PATH)/kselftest/
> @for TARGET in $(TARGETS); do \
> BUILD_TARGET=$$BUILD/$$TARGET; \
> - make OUTPUT=$$BUILD_TARGET -C $$TARGET INSTALL_PATH=$(INSTALL_PATH)/$$TARGET install; \
> + $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET INSTALL_PATH=$(INSTALL_PATH)/$$TARGET install; \
> done;
>
> @# Ask all targets to emit their test scripts
> @@ -203,7 +203,7 @@ ifdef INSTALL_PATH
> echo "[ -w /dev/kmsg ] && echo \"kselftest: Running tests in $$TARGET\" >> /dev/kmsg" >> $(ALL_SCRIPT); \
> echo "cd $$TARGET" >> $(ALL_SCRIPT); \
> echo -n "run_many" >> $(ALL_SCRIPT); \
> - make -s --no-print-directory OUTPUT=$$BUILD_TARGET -C $$TARGET emit_tests >> $(ALL_SCRIPT); \
> + $(MAKE) -s --no-print-directory OUTPUT=$$BUILD_TARGET -C $$TARGET emit_tests >> $(ALL_SCRIPT); \
> echo "" >> $(ALL_SCRIPT); \
> echo "cd \$$ROOT" >> $(ALL_SCRIPT); \
> done;
> @@ -216,7 +216,7 @@ endif
> clean:
> @for TARGET in $(TARGETS); do \
> BUILD_TARGET=$$BUILD/$$TARGET; \
> - make OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\
> + $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\
> done;
>
> .PHONY: khdr all run_tests hotplug run_hotplug clean_hotplug run_pstore_crash install clean
>
Thanks. I will apply this for 5.4-rc1
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-08-19 20:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-16 16:06 [PATCH] selftests: use "$(MAKE)" instead of "make" Ilya Leoshkevich
2019-08-19 20:07 ` shuah
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).