diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-06 04:17:40 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-06 04:22:46 -0400 |
| commit | 387ef4e24af4ae43a7961ba6eec749488da99535 (patch) | |
| tree | bdd6995a544bce7401562afbd70ffd27e2b5a083 /tools/perf/Documentation/perf-bench.txt | |
| parent | 6a67943a18c264d5f3df436da38edb3e59adc905 (diff) | |
| parent | 81e9b994bb20716d1f6c47e048e4ae4a43de2f83 (diff) | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
perf/core improvements and fixes:
- Preparatory patches to use hw events in PMU syntax, from Jiri Olsa
- Remaining backport of trace-cmd's libparseevent, from Namhyung Kim
- Fix libtraceevent 'clean' make target, from Namhyung Kim
- Teach ctags about libtraceevent error codes, from Namhyung Kim
- Fix libtraceevent dependency files usage, from Namhyung Kim
- Support hex number pretty printing in libtraceevent, fixing
kvm output, from Namhyung Kim
- Kill some die() usage in libtraceevent, from Namhyung Kim
- Improve support for hw breakpoints parsing/pretty printing/testing,
from Jiri Olsa
- Clarify perf bench option naming, from Hitoshi Mitake
- Look for ".note" ELF notes too, used in the kernel vdso, from Jiri Olsa
- Fix internal PMU list usage, removing leak, from Robert Richter
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/Documentation/perf-bench.txt')
| -rw-r--r-- | tools/perf/Documentation/perf-bench.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/Documentation/perf-bench.txt b/tools/perf/Documentation/perf-bench.txt index f3c716a4cad..7065cd6fbdf 100644 --- a/tools/perf/Documentation/perf-bench.txt +++ b/tools/perf/Documentation/perf-bench.txt | |||
| @@ -144,7 +144,7 @@ On x86-64, x86-64-unrolled, x86-64-movsq and x86-64-movsb are supported. | |||
| 144 | Repeat memcpy invocation this number of times. | 144 | Repeat memcpy invocation this number of times. |
| 145 | 145 | ||
| 146 | -c:: | 146 | -c:: |
| 147 | --clock:: | 147 | --cycle:: |
| 148 | Use perf's cpu-cycles event instead of gettimeofday syscall. | 148 | Use perf's cpu-cycles event instead of gettimeofday syscall. |
| 149 | 149 | ||
| 150 | -o:: | 150 | -o:: |
| @@ -176,7 +176,7 @@ On x86-64, x86-64-unrolled, x86-64-stosq and x86-64-stosb are supported. | |||
| 176 | Repeat memset invocation this number of times. | 176 | Repeat memset invocation this number of times. |
| 177 | 177 | ||
| 178 | -c:: | 178 | -c:: |
| 179 | --clock:: | 179 | --cycle:: |
| 180 | Use perf's cpu-cycles event instead of gettimeofday syscall. | 180 | Use perf's cpu-cycles event instead of gettimeofday syscall. |
| 181 | 181 | ||
| 182 | -o:: | 182 | -o:: |