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

Commit 7588bada authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/core' of git://github.com/acmel/linux into perf/core

parents d48b0e17 64c6f0c7

tools/perf/Documentation/perf-annotate.txt

+1 −2
Original line number Diff line number Diff line
@@ -73,8 +73,7 @@ OPTIONS 
	CPUs.



--asm-raw::

	Show raw instruction encoding of assembly instructions. They

	are displayed by default, disable with --no-asm-raw.

	Show raw instruction encoding of assembly instructions.



--source::

	Interleave source code with assembly code. Enabled by default,

tools/perf/Documentation/perf-report.txt

+16 −1
Original line number Diff line number Diff line
@@ -137,6 +137,21 @@ OPTIONS 
-M::

--disassembler-style=:: Set disassembler style for objdump.



--source::

	Interleave source code with assembly code. Enabled by default,

	disable with --no-source.



--asm-raw::

	Show raw instruction encoding of assembly instructions.



--show-total-period:: Show a column with the sum of periods.



-I::

--show-info::

	Display extended information about the perf.data file. This adds

	information which may be very large and thus may clutter the display.

	It currently includes: cpu and numa topology of the host system.



SEE ALSO

--------

linkperf:perf-stat[1]
 
linkperf:perf-stat[1], linkperf:perf-annotate[1]

tools/perf/Documentation/perf-script.txt

+7 −0
Original line number Diff line number Diff line
@@ -188,6 +188,13 @@ OPTIONS 
	CPUs are specified with -: 0-2. Default is to report samples on all

	CPUs.



-I::

--show-info::

	Display extended information about the perf.data file. This adds

	information which may be very large and thus may clutter the display.

	It currently includes: cpu and numa topology of the host system.

	It can only be used with the perf script report mode.



SEE ALSO

--------

linkperf:perf-record[1], linkperf:perf-script-perl[1],

tools/perf/Documentation/perf-top.txt

+45 −3
Original line number Diff line number Diff line
@@ -106,6 +106,51 @@ Default is to monitor all CPUS. 
--zero::

	Zero history across display updates.



-s::

--sort::

	Sort by key(s): pid, comm, dso, symbol, parent



-n::

--show-nr-samples::

	Show a column with the number of samples.



--show-total-period::

	Show a column with the sum of periods.



--dsos::

	Only consider symbols in these dsos.



--comms::

	Only consider symbols in these comms.



--symbols::

	Only consider these symbols.



-M::

--disassembler-style=:: Set disassembler style for objdump.



--source::

	Interleave source code with assembly code. Enabled by default,

	disable with --no-source.



--asm-raw::

	Show raw instruction encoding of assembly instructions.



-G [type,min,order]::

--call-graph::

        Display call chains using type, min percent threshold and order.

	type can be either:

	- flat: single column, linear exposure of call chains.

	- graph: use a graph tree, displaying absolute overhead rates.

	- fractal: like graph, but displays relative rates. Each branch of

		 the tree is considered as a new profiled object.



	order can be either:

	- callee: callee based call graph.

	- caller: inverted caller based call graph.



	Default: fractal,0.5,callee.



INTERACTIVE PROMPTING KEYS

--------------------------
@@ -130,9 +175,6 @@ INTERACTIVE PROMPTING KEYS 
[S]::

	Stop annotation, return to full profile display.



[w]::

	Toggle between weighted sum and individual count[E]r profile.



[z]::

	Toggle event count zeroing across display updates.

tools/perf/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -466,7 +466,6 @@ else 
		LIB_OBJS += $(OUTPUT)util/ui/browsers/annotate.o

		LIB_OBJS += $(OUTPUT)util/ui/browsers/hists.o

		LIB_OBJS += $(OUTPUT)util/ui/browsers/map.o

		LIB_OBJS += $(OUTPUT)util/ui/browsers/top.o

		LIB_OBJS += $(OUTPUT)util/ui/helpline.o

		LIB_OBJS += $(OUTPUT)util/ui/progress.o

		LIB_OBJS += $(OUTPUT)util/ui/util.o
@@ -729,9 +728,6 @@ $(OUTPUT)util/ui/browser.o: util/ui/browser.c $(OUTPUT)PERF-CFLAGS 
$(OUTPUT)util/ui/browsers/annotate.o: util/ui/browsers/annotate.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $<



$(OUTPUT)util/ui/browsers/top.o: util/ui/browsers/top.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $<



$(OUTPUT)util/ui/browsers/hists.o: util/ui/browsers/hists.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $<