Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1309865
| From | Wang Nan <wangnan0@huawei.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v3 1/9] perf build: Set parallel making options build-test |
| Date | 2016-01-15 05:10 +0100 |
| Message-ID | <qR3S2-Fo-17@gated-at.bofh.it> (permalink) |
| References | <qR3S1-Fo-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
'make build-test' is painful because of time consuming. In a full test, all test cases are built twice with tools/perf/Makefile and tools/perf/Makefile.perf. 'Makefile' automatically computes parallel options for make, but 'Makefile.perf' not, so all test cases is built with one job. It is very slow. This patch adds '-j' options to Makefile.perf testing. It computes parallel building options like what tools/perf/Makefile does, and pass '-j' option to Makefile.perf test. Signed-off-by: Wang Nan <wangnan0@huawei.com> Acked-by: Jiri Olsa <jolsa@kernel.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> --- tools/perf/tests/make | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/tools/perf/tests/make b/tools/perf/tests/make index df38dec..c0ee679 100644 --- a/tools/perf/tests/make +++ b/tools/perf/tests/make @@ -5,7 +5,7 @@ ifeq ($(MAKECMDGOALS),) # no target specified, trigger the whole suite all: @echo "Testing Makefile"; $(MAKE) -sf tests/make MK=Makefile - @echo "Testing Makefile.perf"; $(MAKE) -sf tests/make MK=Makefile.perf + @echo "Testing Makefile.perf"; $(MAKE) -sf tests/make MK=Makefile.perf SET_PARALLEL=1 else # run only specific test over 'Makefile' %: @@ -14,6 +14,15 @@ endif else PERF := . +PARALLEL_OPT= +ifeq ($(SET_PARALLEL),1) + cores := $(shell (getconf _NPROCESSORS_ONLN || egrep -c '^processor|^CPU[0-9]' /proc/cpuinfo) 2>/dev/null) + ifeq ($(cores),0) + cores := 1 + endif + PARALLEL_OPT="-j$(cores)" +endif + # As per kernel Makefile, avoid funny character set dependencies unexport LC_ALL LC_COLLATE=C @@ -252,7 +261,7 @@ clean := @(cd $(PERF); make -s -f $(MK) clean >/dev/null) $(run): $(call clean) @TMP_DEST=$$(mktemp -d); \ - cmd="cd $(PERF) && make -f $(MK) DESTDIR=$$TMP_DEST $($@)"; \ + cmd="cd $(PERF) && make -f $(MK) $(PARALLEL_OPT) DESTDIR=$$TMP_DEST $($@)"; \ echo "- $@: $$cmd" && echo $$cmd > $@ && \ ( eval $$cmd ) >> $@ 2>&1; \ echo " test: $(call test,$@)" >> $@ 2>&1; \ @@ -263,7 +272,7 @@ $(run_O): $(call clean) @TMP_O=$$(mktemp -d); \ TMP_DEST=$$(mktemp -d); \ - cmd="cd $(PERF) && make -f $(MK) O=$$TMP_O DESTDIR=$$TMP_DEST $($(patsubst %_O,%,$@))"; \ + cmd="cd $(PERF) && make -f $(MK) $(PARALLEL_OPT) O=$$TMP_O DESTDIR=$$TMP_DEST $($(patsubst %_O,%,$@))"; \ echo "- $@: $$cmd" && echo $$cmd > $@ && \ ( eval $$cmd ) >> $@ 2>&1 && \ echo " test: $(call test_O,$@)" >> $@ 2>&1; \ @@ -277,15 +286,15 @@ tarpkg: rm -f $@ make_kernelsrc: - @echo "- make -C <kernelsrc> tools/perf" + @echo "- make -C <kernelsrc> $(PARALLEL_OPT) tools/perf" $(call clean); \ - (make -C ../.. tools/perf) > $@ 2>&1 && \ + (make -C ../.. $(PARALLEL_OPT) tools/perf) > $@ 2>&1 && \ test -x perf && rm -f $@ || (cat $@ ; false) make_kernelsrc_tools: - @echo "- make -C <kernelsrc>/tools perf" + @echo "- make -C <kernelsrc>/tools $(PARALLEL_OPT) perf" $(call clean); \ - (make -C ../../tools perf) > $@ 2>&1 && \ + (make -C ../../tools $(PARALLEL_OPT) perf) > $@ 2>&1 && \ test -x perf && rm -f $@ || (cat $@ ; false) all: $(run) $(run_O) tarpkg make_kernelsrc make_kernelsrc_tools -- 1.8.3.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v3 0/9] perf build: Make build-test faster Wang Nan <wangnan0@huawei.com> - 2016-01-15 05:10 +0100
[PATCH v3 4/9] perf build: Pass O option to kernel makefile in build-test Wang Nan <wangnan0@huawei.com> - 2016-01-15 05:10 +0100
[tip:perf/urgent] perf build: Pass O option to kernel makefile in build-test tip-bot for Wang Nan <tipbot@zytor.com> - 2016-01-19 14:40 +0100
[PATCH v3 3/9] perf build: Test correct path of perf in build-test Wang Nan <wangnan0@huawei.com> - 2016-01-15 05:10 +0100
[tip:perf/urgent] perf build: Test correct path of perf in build-test tip-bot for Wang Nan <tipbot@zytor.com> - 2016-01-19 14:40 +0100
[PATCH v3 6/9] perf build: Introduce FEATURES_DUMP make variable Wang Nan <wangnan0@huawei.com> - 2016-01-15 05:10 +0100
[tip:perf/urgent] perf build: Introduce FEATURES_DUMP make variable tip-bot for Jiri Olsa <tipbot@zytor.com> - 2016-01-19 14:40 +0100
[PATCH v3 1/9] perf build: Set parallel making options build-test Wang Nan <wangnan0@huawei.com> - 2016-01-15 05:10 +0100
[PATCH v3 2/9] perf build: Pass O option to Makefile.perf in build-test Wang Nan <wangnan0@huawei.com> - 2016-01-15 05:10 +0100
[tip:perf/urgent] perf build: Pass O option to Makefile.perf in build-test tip-bot for Wang Nan <tipbot@zytor.com> - 2016-01-19 14:40 +0100
Re: [PATCH v3 0/9] perf build: Make build-test faster Jiri Olsa <jolsa@redhat.com> - 2016-01-15 11:30 +0100
Re: [PATCH v3 0/9] perf build: Make build-test faster Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-15 15:40 +0100
Re: [PATCH v3 0/9] perf build: Make build-test faster pi3orama <pi3orama@163.com> - 2016-01-15 16:00 +0100
Re: [PATCH v3 0/9] perf build: Make build-test faster Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-15 16:20 +0100
Re: [PATCH v3 0/9] perf build: Make build-test faster Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-15 17:40 +0100
Re: [PATCH v3 0/9] perf build: Make build-test faster Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-15 20:00 +0100
Re: [PATCH v3 0/9] perf build: Make build-test faster Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-15 20:10 +0100
Re: [PATCH v3 0/9] perf build: Make build-test faster Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-15 16:00 +0100
csiph-web