Commit 79191c89 authored by Wang Nan's avatar Wang Nan Committed by Arnaldo Carvalho de Melo
Browse files

perf build: Use feature dump file for build-test 



To prevent the feature check tests to run repeately, one time per
'tests/make' target/test, this patch utilizes the previously introduced
'feature-dump' make target and FEATURES_DUMP variable, making sure that
the feature checkers run only once when doing build-test for normal test
cases.

However, since standard users doesn't reuse features dump result, we'd
better give an option to check their behaviors. The above feature
should be used to make build-test faster only. Only utilize it for
build-test.

Signed-off-by: default avatarWang Nan <wangnan0@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1454068269-235999-1-git-send-email-wangnan0@huawei.com


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

tools/perf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ clean: 
# The build-test target is not really parallel, don't print the jobs info:

#

build-test:

	@$(MAKE) SHUF=1 -f tests/make --no-print-directory

	@$(MAKE) SHUF=1 -f tests/make REUSE_FEATURES_DUMP=1 --no-print-directory



#

# All other targets get passed through:

tools/perf/tests/make

+33 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ else 
PERF := .

PERF_O := $(PERF)

O_OPT :=

FULL_O := $(shell readlink -f $(PERF_O) || echo $(PERF_O))



ifneq ($(O),)

  FULL_O := $(shell readlink -f $(O) || echo $(O))
@@ -313,11 +314,43 @@ make_kernelsrc_tools: 
	(make -C ../../tools $(PARALLEL_OPT) $(K_O_OPT) perf) > $@ 2>&1 && \

	test -x $(KERNEL_O)/tools/perf/perf && rm -f $@ || (cat $@ ; false)



FEATURES_DUMP_FILE := $(FULL_O)/BUILD_TEST_FEATURE_DUMP

FEATURES_DUMP_FILE_STATIC := $(FULL_O)/BUILD_TEST_FEATURE_DUMP_STATIC



all: $(run) $(run_O) tarpkg make_kernelsrc make_kernelsrc_tools

	@echo OK

	@rm -f $(FEATURES_DUMP_FILE) $(FEATURES_DUMP_FILE_STATIC)



out: $(run_O)

	@echo OK

	@rm -f $(FEATURES_DUMP_FILE) $(FEATURES_DUMP_FILE_STATIC)



ifeq ($(REUSE_FEATURES_DUMP),1)

$(FEATURES_DUMP_FILE):

	$(call clean)

	@cmd="cd $(PERF) && make FEATURE_DUMP_COPY=$@ $(O_OPT) feature-dump"; \

	echo "- $@: $$cmd" && echo $$cmd && \

	( eval $$cmd ) > /dev/null 2>&1



$(FEATURES_DUMP_FILE_STATIC):

	$(call clean)

	@cmd="cd $(PERF) && make FEATURE_DUMP_COPY=$@ $(O_OPT) LDFLAGS='-static' feature-dump"; \

	echo "- $@: $$cmd" && echo $$cmd && \

	( eval $$cmd ) > /dev/null 2>&1



# Add feature dump dependency for run/run_O targets

$(foreach t,$(run) $(run_O),$(eval \

	$(t): $(if $(findstring make_static,$(t)),\

		$(FEATURES_DUMP_FILE_STATIC),\

		$(FEATURES_DUMP_FILE))))



# Append 'FEATURES_DUMP=' option to all test cases. For example:

# make_no_libbpf: NO_LIBBPF=1  --> NO_LIBBPF=1 FEATURES_DUMP=/a/b/BUILD_TEST_FEATURE_DUMP

# make_static: LDFLAGS=-static --> LDFLAGS=-static FEATURES_DUMP=/a/b/BUILD_TEST_FEATURE_DUMP_STATIC

$(foreach t,$(run),$(if $(findstring make_static,$(t)),\

			$(eval $(t) := $($(t)) FEATURES_DUMP=$(FEATURES_DUMP_FILE_STATIC)),\

			$(eval $(t) := $($(t)) FEATURES_DUMP=$(FEATURES_DUMP_FILE))))

endif



.PHONY: all $(run) $(run_O) tarpkg clean make_kernelsrc make_kernelsrc_tools

endif # ifndef MK

CRA Git | Maintained and supported by SUSTech CRA and CCSE