From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753679AbcANKXu (ORCPT ); Thu, 14 Jan 2016 05:23:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52165 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753462AbcANKXs (ORCPT ); Thu, 14 Jan 2016 05:23:48 -0500 Date: Thu, 14 Jan 2016 11:23:45 +0100 From: Jiri Olsa To: Wang Nan Cc: acme@kernel.org, linux-kernel@vger.kernel.org, pi3orama@163.com, lizefan@huawei.com, Jiri Olsa , Arnaldo Carvalho de Melo , Namhyung Kim Subject: Re: [PATCH 9/9] perf build: Use feature dump file for build-test Message-ID: <20160114102345.GC3540@krava.brq.redhat.com> References: <1452687442-6186-1-git-send-email-wangnan0@huawei.com> <1452687442-6186-10-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1452687442-6186-10-git-send-email-wangnan0@huawei.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jan 13, 2016 at 12:17:22PM +0000, Wang Nan wrote: > To prevent feature check run too many times, this patch utilizes > previous introduced feature-dump make target and FEATURES_DUMP > variable, makes sure the feature checkers run only once when doing > build-test for normal test cases. > > Signed-off-by: Wang Nan > Cc: Jiri Olsa > Cc: Arnaldo Carvalho de Melo > Cc: Namhyung Kim > --- > tools/perf/tests/make | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/tools/perf/tests/make b/tools/perf/tests/make > index 336a6a6..10493ab 100644 > --- a/tools/perf/tests/make > +++ b/tools/perf/tests/make > @@ -15,6 +15,7 @@ else > PERF := . > PERF_OUT := $(PERF) > O_OPT := > +FULL_O := $(shell readlink -f $(PERF_OUT) || echo $(PERF_OUT)) > > ifneq ($(O),) > FULL_O := $(shell readlink -f $(O) || echo $(O)) > @@ -319,5 +320,29 @@ all: $(run) $(run_O) tarpkg make_kernelsrc make_kernelsrc_tools > out: $(run_O) > @echo OK > > +FEATURES_DUMP_FILE := $(FULL_O)/BUILD_TEST_FEATURE_DUMP > +FEATURES_DUMP_FILE_STATIC := $(FULL_O)/BUILD_TEST_FEATURE_DUMP_STATIC > + > +$(FEATURES_DUMP_FILE): > + $(call clean) > + @cmd="cd $(PERF) && make FEATURE_DUMP_COPY=$@ $(O_OPT) feature-dump"; \ > + echo "- $@: $$cmd" && echo $$cmd && \ > + ( eval $$cmd ) 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 ) 2>&1 > + > +$(foreach t,$(run) $(run_O),$(eval \ > + $(t): $(if $(findstring make_static,$(t)),\ > + $(FEATURES_DUMP_FILE_STATIC),\ > + $(FEATURES_DUMP_FILE)))) could you please put comment in here.. it's not too obvious ;-) like saying it's just adding proper feature dump dependency for run/run_O targets.. or something like that > + > +$(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)))) > + ditto thanks, jirka