Commit 7be43dfb authored by Wang Nan's avatar Wang Nan Committed by Arnaldo Carvalho de Melo
Browse files

perf build: Set parallel making options build-test 



'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: default avatarWang Nan <wangnan0@huawei.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1452687442-6186-2-git-send-email-wangnan0@huawei.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 40c4a0f9

tools/perf/tests/make

+16 −7
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE