aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2013-08-06 09:28:05 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2013-08-07 16:35:40 -0400
commite9a7c414477d20c3cc56f90f29c35b06f0f15e25 (patch)
treea322f63cea50e67f997af05113a5024bf61aaf45 /tools
parentd50bf78ff69297d3f60aa778c272acc8e5f59a19 (diff)
perf tools: Add support for pinned modifier
This commit adds support for a new modifier "D", which requests that the event, or group of events, be pinned to the PMU. The "p" modifier is already taken for precise, and "P" may be used in future to mean "fully precise". So we use "D", which stands for pinneD - and looks like a padlock, or if you're using the ":D" syntax perf smiles at you. This is an oft-requested feature from our HW folks, who want to be able to run a large number of events, but also want 100% accurate results for instructions per cycle. Comparison of results with and without pinning: $ perf stat -e '{cycles,instructions}:D' -e cycles,instructions,... 79,590,480,683 cycles # 0.000 GHz 166,123,716,524 instructions # 2.09 insns per cycle # 0.11 stalled cycles per insn 79,352,134,463 cycles # 0.000 GHz [11.11%] 165,178,301,818 instructions # 2.08 insns per cycle # 0.11 stalled cycles per insn [11.13%] As you can see although perf does a very good job of scaling the values in the non-pinned case, there is some small discrepancy. The patch is fairly straight forward, the one detail is that we need to make sure we only request pinning for the group leader when we have a group. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Namhyung Kim <namhyung@kernel.org> Acked-by: Jiri Olsa <jolsa@redhat.com> Tested-by: Jiri Olsa <jolsa@redhat.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1375795686-4226-1-git-send-email-michael@ellerman.id.au [ Use perf_evsel__is_group_leader instead of open coded equivalent, as suggested by Jiri Olsa ] Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/Documentation/perf-list.txt1
-rw-r--r--tools/perf/util/parse-events.c11
-rw-r--r--tools/perf/util/parse-events.l3
3 files changed, 13 insertions, 2 deletions
diff --git a/tools/perf/Documentation/perf-list.txt b/tools/perf/Documentation/perf-list.txt
index eb03f063f0a2..6fce6a622206 100644
--- a/tools/perf/Documentation/perf-list.txt
+++ b/tools/perf/Documentation/perf-list.txt
@@ -30,6 +30,7 @@ counted. The following modifiers exist:
30 H - host counting (not in KVM guests) 30 H - host counting (not in KVM guests)
31 p - precise level 31 p - precise level
32 S - read sample value (PERF_SAMPLE_READ) 32 S - read sample value (PERF_SAMPLE_READ)
33 D - pin the event to the PMU
33 34
34The 'p' modifier can be used for specifying how precise the instruction 35The 'p' modifier can be used for specifying how precise the instruction
35address should be. The 'p' modifier can be specified multiple times: 36address should be. The 'p' modifier can be specified multiple times:
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index dba877dc9482..9cba92386a82 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -688,6 +688,7 @@ struct event_modifier {
688 int precise; 688 int precise;
689 int exclude_GH; 689 int exclude_GH;
690 int sample_read; 690 int sample_read;
691 int pinned;
691}; 692};
692 693
693static int get_event_modifier(struct event_modifier *mod, char *str, 694static int get_event_modifier(struct event_modifier *mod, char *str,
@@ -700,6 +701,7 @@ static int get_event_modifier(struct event_modifier *mod, char *str,
700 int eG = evsel ? evsel->attr.exclude_guest : 0; 701 int eG = evsel ? evsel->attr.exclude_guest : 0;
701 int precise = evsel ? evsel->attr.precise_ip : 0; 702 int precise = evsel ? evsel->attr.precise_ip : 0;
702 int sample_read = 0; 703 int sample_read = 0;
704 int pinned = evsel ? evsel->attr.pinned : 0;
703 705
704 int exclude = eu | ek | eh; 706 int exclude = eu | ek | eh;
705 int exclude_GH = evsel ? evsel->exclude_GH : 0; 707 int exclude_GH = evsel ? evsel->exclude_GH : 0;
@@ -734,6 +736,8 @@ static int get_event_modifier(struct event_modifier *mod, char *str,
734 eG = 1; 736 eG = 1;
735 } else if (*str == 'S') { 737 } else if (*str == 'S') {
736 sample_read = 1; 738 sample_read = 1;
739 } else if (*str == 'D') {
740 pinned = 1;
737 } else 741 } else
738 break; 742 break;
739 743
@@ -761,6 +765,8 @@ static int get_event_modifier(struct event_modifier *mod, char *str,
761 mod->precise = precise; 765 mod->precise = precise;
762 mod->exclude_GH = exclude_GH; 766 mod->exclude_GH = exclude_GH;
763 mod->sample_read = sample_read; 767 mod->sample_read = sample_read;
768 mod->pinned = pinned;
769
764 return 0; 770 return 0;
765} 771}
766 772
@@ -773,7 +779,7 @@ static int check_modifier(char *str)
773 char *p = str; 779 char *p = str;
774 780
775 /* The sizeof includes 0 byte as well. */ 781 /* The sizeof includes 0 byte as well. */
776 if (strlen(str) > (sizeof("ukhGHpppS") - 1)) 782 if (strlen(str) > (sizeof("ukhGHpppSD") - 1))
777 return -1; 783 return -1;
778 784
779 while (*p) { 785 while (*p) {
@@ -812,6 +818,9 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add)
812 evsel->attr.exclude_guest = mod.eG; 818 evsel->attr.exclude_guest = mod.eG;
813 evsel->exclude_GH = mod.exclude_GH; 819 evsel->exclude_GH = mod.exclude_GH;
814 evsel->sample_read = mod.sample_read; 820 evsel->sample_read = mod.sample_read;
821
822 if (perf_evsel__is_group_leader(evsel))
823 evsel->attr.pinned = mod.pinned;
815 } 824 }
816 825
817 return 0; 826 return 0;
diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l
index b36115fe416a..0790452658b3 100644
--- a/tools/perf/util/parse-events.l
+++ b/tools/perf/util/parse-events.l
@@ -82,7 +82,8 @@ num_hex 0x[a-fA-F0-9]+
82num_raw_hex [a-fA-F0-9]+ 82num_raw_hex [a-fA-F0-9]+
83name [a-zA-Z_*?][a-zA-Z0-9_*?]* 83name [a-zA-Z_*?][a-zA-Z0-9_*?]*
84name_minus [a-zA-Z_*?][a-zA-Z0-9\-_*?]* 84name_minus [a-zA-Z_*?][a-zA-Z0-9\-_*?]*
85modifier_event [ukhpGHS]+ 85/* If you add a modifier you need to update check_modifier() */
86modifier_event [ukhpGHSD]+
86modifier_bp [rwx]{1,3} 87modifier_bp [rwx]{1,3}
87 88
88%% 89%%