Commit 661e5915 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo' of... 

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

. Check for flex and bison before continuing building, from Borislav Petkov.

. Make event_copy local to mmaps, fixing buffer wrap around problems, from
  David Ahern.

. Add option for runtime switching perf data file in perf report, just press
  's' and a menu with the valid files found in the current directory will be
  presented, from Feng Tang.

. Add support to display whole group data for raw columns, from Jiri Olsa.

. Fix SIGALRM and pipe read race for the rwtop perl script. from Jiri Olsa.

. Fix perf_evsel::exclude_GH handling and add a test to catch regressions, from
  Jiri Olsa.

. Error checking fixes, from Namhyung Kim.

. Fix calloc argument ordering, from Paul Gortmaker.

. Fix set event list leader, from Stephane Eranian.

. Add per processor socket count aggregation in perf stat, from Stephane Eranian.

. Fix perf python binding breakage.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 0fbdad07 88fd2b6a

tools/perf/Documentation/perf-stat.txt

+8 −1
Original line number Diff line number Diff line
@@ -116,9 +116,16 @@ perf stat --repeat 10 --null --sync --pre 'make -s O=defconfig-build/clean' -- m 


-I msecs::

--interval-print msecs::

	print count deltas every N milliseconds (minimum: 100ms)

	Print count deltas every N milliseconds (minimum: 100ms)

	example: perf stat -I 1000 -e cycles -a sleep 5



--aggr-socket::

Aggregate counts per processor socket for system-wide mode measurements.  This

is a useful mode to detect imbalance between sockets.  To enable this mode,

use --aggr-socket in addition to -a. (system-wide).  The output includes the

socket number and the number of online processors on that socket. This is

useful to gauge the amount of aggregation.



EXAMPLES

--------

tools/perf/Makefile

+10 −3
Original line number Diff line number Diff line
@@ -149,6 +149,8 @@ RM = rm -f 
MKDIR = mkdir

FIND = find

INSTALL = install

FLEX = flex

BISON= bison



# sparse is architecture-neutral, which means that we need to tell it

# explicitly what architecture to check for. Fix this up for yours..
@@ -158,6 +160,14 @@ ifneq ($(MAKECMDGOALS),clean) 
ifneq ($(MAKECMDGOALS),tags)

-include config/feature-tests.mak



ifeq ($(call get-executable,$(FLEX)),)

	dummy := $(error Error: $(FLEX) is missing on this system, please install it)

endif



ifeq ($(call get-executable,$(BISON)),)

	dummy := $(error Error: $(BISON) is missing on this system, please install it)

endif



ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -fstack-protector-all,-fstack-protector-all),y)

	CFLAGS := $(CFLAGS) -fstack-protector-all

endif
@@ -282,9 +292,6 @@ endif 


export PERL_PATH



FLEX = flex

BISON= bison



$(OUTPUT)util/parse-events-flex.c: util/parse-events.l $(OUTPUT)util/parse-events-bison.c

	$(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/parse-events-flex.h $(PARSER_DEBUG_FLEX) -t util/parse-events.l > $(OUTPUT)util/parse-events-flex.c

tools/perf/builtin-annotate.c

+2 −1
Original line number Diff line number Diff line
@@ -309,7 +309,8 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) 
	if (symbol__init() < 0)

		return -1;



	setup_sorting(annotate_usage, options);

	if (setup_sorting() < 0)

		usage_with_options(annotate_usage, options);



	if (argc) {

		/*

tools/perf/builtin-diff.c

+3 −1
Original line number Diff line number Diff line
@@ -605,7 +605,9 @@ int cmd_diff(int argc, const char **argv, const char *prefix __maybe_unused) 


	ui_init();



	setup_sorting(diff_usage, options);

	if (setup_sorting() < 0)

		usage_with_options(diff_usage, options);



	setup_pager();



	sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "dso", NULL);

tools/perf/builtin-evlist.c

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ int cmd_evlist(int argc, const char **argv, const char *prefix __maybe_unused) 
	OPT_BOOLEAN('F', "freq", &details.freq, "Show the sample frequency"),

	OPT_BOOLEAN('v', "verbose", &details.verbose,

		    "Show all event attr details"),

	OPT_BOOLEAN('g', "group", &symbol_conf.event_group,

	OPT_BOOLEAN('g', "group", &details.event_group,

		    "Show event group information"),

	OPT_END()

	};
@@ -52,7 +52,7 @@ int cmd_evlist(int argc, const char **argv, const char *prefix __maybe_unused) 
	if (argc)

		usage_with_options(evlist_usage, options);



	if (symbol_conf.event_group && (details.verbose || details.freq)) {

	if (details.event_group && (details.verbose || details.freq)) {

		pr_err("--group option is not compatible with other options\n");

		usage_with_options(evlist_usage, options);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE