| Message ID | 1449485338-62100-1-git-send-email-wangnan0@huawei.com |
|---|---|
| State | New |
| Headers | show |
On 2015/12/7 21:52, Jiri Olsa wrote: > On Mon, Dec 07, 2015 at 10:48:58AM +0000, Wang Nan wrote: >> Jiri introduces a FEATURE-INCLUDE file for feature checking. It >> contains same information with FEATURE-DUMP, so we can avoid generating >> FEATURE-DUMP. >> >> Following modification should ensure FEATURE_TESTS contains >> FEATURE_DISPLAY. >> >> Signed-off-by: Wang Nan <wangnan0@huawei.com> >> Cc: Jiri Olsa <jolsa@kernel.org> >> --- >> >> I haven't thoroughly tested this patch, just want to show the >> possibility of removing FEATURE-DUMP. I don't insist on this. Jiri, if >> you find this patch is not good please simply ignore it. >> >> Thank you. >> >> --- >> >> tools/build/Makefile.feature | 8 +++----- >> tools/lib/bpf/.gitignore | 1 - >> tools/lib/bpf/Makefile | 2 +- >> tools/perf/.gitignore | 1 - >> tools/perf/Makefile.perf | 2 +- >> 5 files changed, 5 insertions(+), 9 deletions(-) >> >> diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature >> index 51f8d59..98a13bd 100644 >> --- a/tools/build/Makefile.feature >> +++ b/tools/build/Makefile.feature >> @@ -123,10 +123,6 @@ define feature_print_text_code >> MSG = $(shell printf '...%30s: %s' $(1) $(2)) >> endef >> >> -FEATURE_DUMP_FILENAME = $(OUTPUT)FEATURE-DUMP$(FEATURE_USER) >> -FEATURE_DUMP := $(foreach feat,$(FEATURE_DISPLAY),feature-$(feat)($(feature-$(feat)))) >> -FEATURE_DUMP_FILE := $(shell touch $(FEATURE_DUMP_FILENAME); cat $(FEATURE_DUMP_FILENAME)) >> - >> ifeq ($(dwarf-post-unwind),1) >> FEATURE_DUMP += dwarf-post-unwind($(dwarf-post-unwind-text)) >> endif >> @@ -141,6 +137,9 @@ endif >> # features detection state. >> FEATURE_INCLUDE_FILENAME = $(OUTPUT)FEATURE-INCLUDE$(FEATURE_USER) >> >> +FEATURE_DUMP := $(foreach feat,$(FEATURE_DISPLAY),feature-$(feat)=$(feature-$(feat))) >> +FEATURE_DUMP_FILE := $(foreach feat,$(FEATURE_DISPLAY),$(shell touch $(FEATURE_INCLUDE_FILENAME); cat $(FEATURE_INCLUDE_FILENAME) | grep 'feature-$(feat)=')) > hum, this ignores dwarf-post-unwind setup, I think it needs more changes > I'll post new version Hi Jiri, What the current status of this patch and 'tools build: Introduce features dump include makefile'? They are in my local tree for a long time. Thank you. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature index 51f8d59..98a13bd 100644 --- a/tools/build/Makefile.feature +++ b/tools/build/Makefile.feature @@ -123,10 +123,6 @@ define feature_print_text_code MSG = $(shell printf '...%30s: %s' $(1) $(2)) endef -FEATURE_DUMP_FILENAME = $(OUTPUT)FEATURE-DUMP$(FEATURE_USER) -FEATURE_DUMP := $(foreach feat,$(FEATURE_DISPLAY),feature-$(feat)($(feature-$(feat)))) -FEATURE_DUMP_FILE := $(shell touch $(FEATURE_DUMP_FILENAME); cat $(FEATURE_DUMP_FILENAME)) - ifeq ($(dwarf-post-unwind),1) FEATURE_DUMP += dwarf-post-unwind($(dwarf-post-unwind-text)) endif @@ -141,6 +137,9 @@ endif # features detection state. FEATURE_INCLUDE_FILENAME = $(OUTPUT)FEATURE-INCLUDE$(FEATURE_USER) +FEATURE_DUMP := $(foreach feat,$(FEATURE_DISPLAY),feature-$(feat)=$(feature-$(feat))) +FEATURE_DUMP_FILE := $(foreach feat,$(FEATURE_DISPLAY),$(shell touch $(FEATURE_INCLUDE_FILENAME); cat $(FEATURE_INCLUDE_FILENAME) | grep 'feature-$(feat)=')) + # The $(feature_display) controls the default detection message # output. It's set if: # - detected features differes from stored features from @@ -149,7 +148,6 @@ FEATURE_INCLUDE_FILENAME = $(OUTPUT)FEATURE-INCLUDE$(FEATURE_USER) # - VF is enabled ifneq ("$(FEATURE_DUMP)","$(FEATURE_DUMP_FILE)") - $(shell echo "$(FEATURE_DUMP)" > $(FEATURE_DUMP_FILENAME)) $(shell rm -f $(FEATURE_INCLUDE_FILENAME)) $(foreach feat,$(FEATURE_TESTS),$(shell echo "feature-$(feat)=$(feature-$(feat))" >> $(FEATURE_INCLUDE_FILENAME))) feature_display := 1 diff --git a/tools/lib/bpf/.gitignore b/tools/lib/bpf/.gitignore index 4019b8e..c4cc003 100644 --- a/tools/lib/bpf/.gitignore +++ b/tools/lib/bpf/.gitignore @@ -1,3 +1,2 @@ libbpf_version.h -FEATURE-DUMP.libbpf FEATURE-INCLUDE.libbpf diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index 6b9af77..6bc3cb5 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -194,7 +194,7 @@ config-clean: clean: $(call QUIET_CLEAN, libbpf) $(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d \ $(RM) LIBBPF-CFLAGS - $(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP.libbpf $(OUTPUT)FEATURE-INCLUDE.libbpf + $(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-INCLUDE.libbpf diff --git a/tools/perf/.gitignore b/tools/perf/.gitignore index 4a3eb8d..5e93718 100644 --- a/tools/perf/.gitignore +++ b/tools/perf/.gitignore @@ -1,7 +1,6 @@ PERF-CFLAGS PERF-GUI-VARS PERF-VERSION-FILE -FEATURE-DUMP FEATURE-INCLUDE perf perf-read-vdso32 diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 7338a7e..7cccf11 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -589,7 +589,7 @@ clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean config-clean $(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete $(Q)$(RM) $(OUTPUT).config-detected $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32 - $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-DUMP $(OUTPUT)FEATURE-INCLUDE $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \ + $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-INCLUDE $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \ $(OUTPUT)util/intel-pt-decoder/inat-tables.c $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean $(python-clean)
Jiri introduces a FEATURE-INCLUDE file for feature checking. It contains same information with FEATURE-DUMP, so we can avoid generating FEATURE-DUMP. Following modification should ensure FEATURE_TESTS contains FEATURE_DISPLAY. Signed-off-by: Wang Nan <wangnan0@huawei.com> Cc: Jiri Olsa <jolsa@kernel.org> --- I haven't thoroughly tested this patch, just want to show the possibility of removing FEATURE-DUMP. I don't insist on this. Jiri, if you find this patch is not good please simply ignore it. Thank you. --- tools/build/Makefile.feature | 8 +++----- tools/lib/bpf/.gitignore | 1 - tools/lib/bpf/Makefile | 2 +- tools/perf/.gitignore | 1 - tools/perf/Makefile.perf | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) -- 1.8.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/