Skip to content

Commit

Permalink
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/git/acme/linux into perf/core

Conflicts:
	tools/perf/builtin-stat.c
  • Loading branch information
Ingo Molnar committed Aug 18, 2011
2 parents 8bc84f8 + 4aa9015 commit 51887c8
Show file tree
Hide file tree
Showing 8 changed files with 126 additions and 66 deletions.
11 changes: 11 additions & 0 deletions tools/perf/Documentation/perf-annotate.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,17 @@ OPTIONS
CPUs are specified with -: 0-2. Default is to report samples on all
CPUs.

--asm-raw::
Show raw instruction encoding of assembly instructions. They
are displayed by default, disable with --no-asm-raw.

--source::
Interleave source code with assembly code. Enabled by default,
disable with --no-source.

--symfs=<directory>::
Look for files with symbols relative to this directory.

SEE ALSO
--------
linkperf:perf-record[1], linkperf:perf-report[1]
7 changes: 7 additions & 0 deletions tools/perf/Documentation/perf-stat.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,13 @@ an empty cgroup (monitor all the time) using, e.g., -G foo,,bar. Cgroups must ha
corresponding events, i.e., they always refer to events defined earlier on the command
line.

-o file::
-output file::
Print the output into the designated file.

--append::
Append to the output file designated with the -o option. Ignored if -o is not specified.

EXAMPLES
--------

Expand Down
6 changes: 6 additions & 0 deletions tools/perf/builtin-annotate.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,12 @@ static const struct option options[] = {
OPT_BOOLEAN('P', "full-paths", &full_paths,
"Don't shorten the displayed pathnames"),
OPT_STRING('c', "cpu", &cpu_list, "cpu", "list of cpus to profile"),
OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory",
"Look for files with symbols relative to this directory"),
OPT_BOOLEAN('0', "source", &symbol_conf.annotate_src,
"Interleave source code with assembly code (default)"),
OPT_BOOLEAN('0', "asm-raw", &symbol_conf.annotate_asm_raw,
"Display raw encoding of assembly instructions (default)"),
OPT_END()
};

Expand Down
Loading

0 comments on commit 51887c8

Please sign in to comment.