Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1321709 > unrolled thread

[PATCH update] perf build: Use feature dump file for build-test

Started byWang Nan <wangnan0@huawei.com>
First post2016-01-29 13:00 +0100
Last post2016-02-03 11:20 +0100
Articles 4 — 4 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH update] perf build: Use feature dump file for build-test Wang Nan <wangnan0@huawei.com> - 2016-01-29 13:00 +0100
    Re: [PATCH update] perf build: Use feature dump file for build-test "Wangnan (F)" <wangnan0@huawei.com> - 2016-01-29 14:10 +0100
      Re: [PATCH update] perf build: Use feature dump file for build-test Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-01-29 16:00 +0100
    [tip:perf/core] perf build: Use feature dump file for build-test tip-bot for Wang Nan <tipbot@zytor.com> - 2016-02-03 11:20 +0100

#1321709 — [PATCH update] perf build: Use feature dump file for build-test

FromWang Nan <wangnan0@huawei.com>
Date2016-01-29 13:00 +0100
Subject[PATCH update] perf build: Use feature dump file for build-test
Message-ID<qWfSy-2qQ-3@gated-at.bofh.it>
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.

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: Wang Nan <wangnan0@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/Makefile   |  2 +-
 tools/perf/tests/make | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index dcd9a70..e4ff0bd 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -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:
diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index f918015..7f663f4 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -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
-- 
1.8.3.4

[toc] | [next] | [standalone]

#1321741

From"Wangnan (F)" <wangnan0@huawei.com>
Date2016-01-29 14:10 +0100
Message-ID<qWgYi-3wY-13@gated-at.bofh.it>
In reply to#1321709
I tested this patch in my platform with

  $ make build-test
  $ make -f ./tests/make

All test cases passed for me.

Thank you.

On 2016/1/29 19:51, 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.
>
> 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: Wang Nan <wangnan0@huawei.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> Cc: Namhyung Kim <namhyung@kernel.org>
> ---
>   tools/perf/Makefile   |  2 +-
>   tools/perf/tests/make | 33 +++++++++++++++++++++++++++++++++
>   2 files changed, 34 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/Makefile b/tools/perf/Makefile
> index dcd9a70..e4ff0bd 100644
> --- a/tools/perf/Makefile
> +++ b/tools/perf/Makefile
> @@ -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:
> diff --git a/tools/perf/tests/make b/tools/perf/tests/make
> index f918015..7f663f4 100644
> --- a/tools/perf/tests/make
> +++ b/tools/perf/tests/make
> @@ -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

[toc] | [prev] | [next] | [standalone]

#1321813

FromArnaldo Carvalho de Melo <acme@kernel.org>
Date2016-01-29 16:00 +0100
Message-ID<qWiGL-4DM-31@gated-at.bofh.it>
In reply to#1321741
Em Fri, Jan 29, 2016 at 09:02:19PM +0800, Wangnan (F) escreveu:
> I tested this patch in my platform with
> 
>  $ make build-test
>  $ make -f ./tests/make
> 
> All test cases passed for me.

Thanks, I've testing this now,

- Arnaldo
 
> Thank you.
> 
> On 2016/1/29 19:51, 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.
> >
> >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: Wang Nan <wangnan0@huawei.com>
> >Cc: Jiri Olsa <jolsa@kernel.org>
> >Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> >Cc: Namhyung Kim <namhyung@kernel.org>
> >---
> >  tools/perf/Makefile   |  2 +-
> >  tools/perf/tests/make | 33 +++++++++++++++++++++++++++++++++
> >  2 files changed, 34 insertions(+), 1 deletion(-)
> >
> >diff --git a/tools/perf/Makefile b/tools/perf/Makefile
> >index dcd9a70..e4ff0bd 100644
> >--- a/tools/perf/Makefile
> >+++ b/tools/perf/Makefile
> >@@ -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:
> >diff --git a/tools/perf/tests/make b/tools/perf/tests/make
> >index f918015..7f663f4 100644
> >--- a/tools/perf/tests/make
> >+++ b/tools/perf/tests/make
> >@@ -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
>

[toc] | [prev] | [next] | [standalone]

#1325133 — [tip:perf/core] perf build: Use feature dump file for build-test

Fromtip-bot for Wang Nan <tipbot@zytor.com>
Date2016-02-03 11:20 +0100
Subject[tip:perf/core] perf build: Use feature dump file for build-test
Message-ID<qY2Hw-DD-23@gated-at.bofh.it>
In reply to#1321709
Commit-ID:  79191c89a049a9c525ce22a7d1e5674699c58818
Gitweb:     http://git.kernel.org/tip/79191c89a049a9c525ce22a7d1e5674699c58818
Author:     Wang Nan <wangnan0@huawei.com>
AuthorDate: Fri, 29 Jan 2016 11:51:09 +0000
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 29 Jan 2016 14:47:52 -0300

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: Wang 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: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/Makefile   |  2 +-
 tools/perf/tests/make | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index dcd9a70..e4ff0bd 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -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:
diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index f918015..7f663f4 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web