Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ae61202 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf build: Rename PERF-FEATURES into FEATURE-DUMP 



Preparing for feature checks separation, moving related stuff under
'FEATURE*' namespace.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <david.ahern@oracle.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-v9oo22ra70rrk1dy495a7bjc@git.kernel.org


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

tools/perf/Makefile.perf

+1 −1
Original line number Original line Diff line number Diff line
@@ -528,7 +528,7 @@ clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean config-clean 
	$(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete

	$(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete

	$(Q)$(RM) .config-detected

	$(Q)$(RM) .config-detected

	$(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32

	$(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)PERF-FEATURES $(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-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex*

	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean

	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean

	$(python-clean)

	$(python-clean)

tools/perf/config/Makefile

+6 −6
Original line number Original line Diff line number Diff line
@@ -786,22 +786,22 @@ define feature_print_text_code 
    MSG = $(shell printf '...%30s: %s' $(1) $(2))

    MSG = $(shell printf '...%30s: %s' $(1) $(2))

endef

endef





PERF_FEATURES := $(foreach feat,$(FEATURE_DISPLAY),feature-$(feat)($(feature-$(feat))))

FEATURE_DUMP := $(foreach feat,$(FEATURE_DISPLAY),feature-$(feat)($(feature-$(feat))))

PERF_FEATURES_FILE := $(shell touch $(OUTPUT)PERF-FEATURES; cat $(OUTPUT)PERF-FEATURES)

FEATURE_DUMP_FILE := $(shell touch $(OUTPUT)FEATURE-DUMP; cat $(OUTPUT)FEATURE-DUMP)





ifeq ($(dwarf-post-unwind),1)

ifeq ($(dwarf-post-unwind),1)

  PERF_FEATURES += dwarf-post-unwind($(dwarf-post-unwind-text))

  FEATURE_DUMP += dwarf-post-unwind($(dwarf-post-unwind-text))

endif

endif





# The $(feature_display) controls the default detection message

# The $(feature_display) controls the default detection message

# output. It's set if:

# output. It's set if:

# - detected features differes from stored features from

# - detected features differes from stored features from

#   last build (in PERF-FEATURES file)

#   last build (in FEATURE-DUMP file)

# - one of the $(FEATURE_DISPLAY) is not detected

# - one of the $(FEATURE_DISPLAY) is not detected

# - VF is enabled

# - VF is enabled





ifneq ("$(PERF_FEATURES)","$(PERF_FEATURES_FILE)")

ifneq ("$(FEATURE_DUMP)","$(FEATURE_DUMP_FILE)")

  $(shell echo "$(PERF_FEATURES)" > $(OUTPUT)PERF-FEATURES)

  $(shell echo "$(FEATURE_DUMP)" > $(OUTPUT)FEATURE-DUMP)

  feature_display := 1

  feature_display := 1

endif

endif