perf tools: Allow config terms with breakpoints
Adrian Hunter
reviewerv2 cover perf tools: Allow config terms with breakpoints
Hi
Here is a patch (V2) to the event parser for breakpoint events. I am not that familiar with flex / bison, but it seemed to need trailing context to stop the mem event colon and slash delimiters from getting mixed up with delimiters for config terms or event modifiers. Please look closely at that.
Change in V2:
Add comments to tools/perf/util/parse-events.l Add a test for 2 mem events back to back with config terms
Adrian Hunter (1):
perf tools: Allow config terms with breakpoints
tools/perf/tests/parse-events.c | 157 ++++++++++++++++++++++++++++++++++++++++ tools/perf/util/parse-events.c | 23 +++++- tools/perf/util/parse-events.h | 6 +- tools/perf/util/parse-events.l | 23 +++++- tools/perf/util/parse-events.y | 42 ++++++----- 5 files changed, 224 insertions(+), 27 deletions(-)
Regards
Adrian
Adrian Hunter
reviewerPATCH v2 1/1 perf tools: Allow config terms with breakpoints
Add config terms to the parsing of breakpoint events. Extend "Test event parsing" to also cover using a confg term.
This makes breakpoint events consistent with other events which already support config terms.
Example:
$ cat dr_test.c #include <unistd.h> #include <stdio.h>
void func0(void)
{
}
int main()
{
printf("func0 %p\n", &func0);
while (1) {
func0();
usleep(100000);
}
return 0;
}
$ gcc -g -O0 -o dr_test dr_test.c
$ ./dr_test &
[2] 19646
func0 0x55feb98dd169
$ perf record -e mem:0x55feb98dd169:x/name=breakpoint/ -p 19646 -- sleep 0.5
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.017 MB perf.data (5 samples) ]
$ perf script
dr_test 19646 5632.956628: 1 breakpoint: 55feb98dd169 func0+0x0 (/home/ahunter/git/work/dr_test)
dr_test 19646 5633.056866: 1 breakpoint: 55feb98dd169 func0+0x0 (/home/ahunter/git/work/dr_test)
dr_test 19646 5633.157084: 1 breakpoint: 55feb98dd169 func0+0x0 (/home/ahunter/git/work/dr_test)
dr_test 19646 5633.257309: 1 breakpoint: 55feb98dd169 func0+0x0 (/home/ahunter/git/work/dr_test)
dr_test 19646 5633.357532: 1 breakpoint: 55feb98dd169 func0+0x0 (/home/ahunter/git/work/dr_test)
$ sudo perf test "Test event parsing"
6: Parse event definition strings :
6.1: Test event parsing : Ok
$ sudo perf test -v "Test event parsing" |& grep mem
running test 8 'mem:0'
running test 9 'mem:0:x'
running test 10 'mem:0:r'
running test 11 'mem:0:w'
running test 19 'mem:0:u'
running test 20 'mem:0:x:k'
running test 21 'mem:0:r:hp'
running test 22 'mem:0:w:up'
running test 26 'mem:0:rw'
running test 27 'mem:0:rw:kp'
running test 42 'mem:0/1'
running test 43 'mem:0/2:w'
running test 44 'mem:0/4:rw:u'
running test 58 'mem:0/name=breakpoint/'
running test 59 'mem:0:x/name=breakpoint/'
running test 60 'mem:0:r/name=breakpoint/'
running test 61 'mem:0:w/name=breakpoint/'
running test 62 'mem:0/name=breakpoint/u'
running test 63 'mem:0:x/name=breakpoint/k'
running test 64 'mem:0:r/name=breakpoint/hp'
running test 65 'mem:0:w/name=breakpoint/up'
running test 66 'mem:0:rw/name=breakpoint/'
running test 67 'mem:0:rw/name=breakpoint/kp'
running test 68 'mem:0/1/name=breakpoint/'
running test 69 'mem:0/2:w/name=breakpoint/'
running test 70 'mem:0/4:rw/name=breakpoint/u'
running test 71 'mem:0/1/name=breakpoint1/,mem:0/4:rw/name=breakpoint2/'--- tools/perf/tests/parse-events.c | 157 ++++++++++++++++++++++++++++++++ tools/perf/util/parse-events.c | 23 ++++- tools/perf/util/parse-events.h | 6 +- tools/perf/util/parse-events.l | 23 ++++- tools/perf/util/parse-events.y | 42 +++++---- 5 files changed, 224 insertions(+), 27 deletions(-)
Change in V2:
Add comments to tools/perf/util/parse-events.l Add a test for 2 mem events back to back with config terms
tools/perf/tests/parse-events.c +157 -0
@@ -439,6 +439,93 @@ static int test__checkevent_breakpoint_rw_modifier(struct evlist *evlist)return test__checkevent_breakpoint_rw (evlist); } +static int test__checkevent_breakpoint_modifier_name (struct evlist *evlist) +{ +struct evsel *evsel =evlist__first (evlist); + +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); +TEST_ASSERT_VAL ("wrong name" , + !strcmp (evsel__name (evsel),"breakpoint" )); + +return test__checkevent_breakpoint (evlist); +} + +static int test__checkevent_breakpoint_x_modifier_name (struct evlist *evlist) +{ +struct evsel *evsel =evlist__first (evlist); + +TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); +TEST_ASSERT_VAL ("wrong name" , + !strcmp (evsel__name (evsel),"breakpoint" )); + +return test__checkevent_breakpoint_x (evlist); +} + +static int test__checkevent_breakpoint_r_modifier_name (struct evlist *evlist) +{ +struct evsel *evsel =evlist__first (evlist); + +TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , !evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip); +TEST_ASSERT_VAL ("wrong name" , + !strcmp (evsel__name (evsel),"breakpoint" )); + +return test__checkevent_breakpoint_r (evlist); +} + +static int test__checkevent_breakpoint_w_modifier_name (struct evlist *evlist) +{ +struct evsel *evsel =evlist__first (evlist); + +TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip); +TEST_ASSERT_VAL ("wrong name" , + !strcmp (evsel__name (evsel),"breakpoint" )); + +return test__checkevent_breakpoint_w (evlist); +} + +static int test__checkevent_breakpoint_rw_modifier_name (struct evlist *evlist) +{ +struct evsel *evsel =evlist__first (evlist); + +TEST_ASSERT_VAL ("wrong exclude_user" , evsel->core.attr.exclude_user); +TEST_ASSERT_VAL ("wrong exclude_kernel" , !evsel->core.attr.exclude_kernel); +TEST_ASSERT_VAL ("wrong exclude_hv" , evsel->core.attr.exclude_hv); +TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip); +TEST_ASSERT_VAL ("wrong name" , + !strcmp (evsel__name (evsel),"breakpoint" )); + +return test__checkevent_breakpoint_rw (evlist); +} + +static int test__checkevent_breakpoint_2_events (struct evlist *evlist) +{ +struct evsel *evsel =evlist__first (evlist); + +TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); + +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_BREAKPOINT == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong name" , !strcmp (evsel__name (evsel),"breakpoint1" )); + + evsel =evsel__next (evsel); + +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_BREAKPOINT == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong name" , !strcmp (evsel__name (evsel),"breakpoint2" )); + +return TEST_OK ; +} +static int test__checkevent_pmu (struct evlist *evlist) {
@@ -1973,6 +2060,76 @@ static const struct evlist_test test__events[] = { .check = test__exclusive_group, /* 7 */ }, + { + .name = "mem:0/name=breakpoint/", + .check = test__checkevent_breakpoint, + /* 8 */ + }, + { + .name = "mem:0:x/name=breakpoint/", + .check = test__checkevent_breakpoint_x, + /* 9 */ + }, + { + .name = "mem:0:r/name=breakpoint/", + .check = test__checkevent_breakpoint_r, + /* 0 */ + }, + { + .name = "mem:0:w/name=breakpoint/", + .check = test__checkevent_breakpoint_w, + /* 1 */ + }, + { + .name = "mem:0/name=breakpoint/u", + .check = test__checkevent_breakpoint_modifier_name, + /* 2 */ + }, + { + .name = "mem:0:x/name=breakpoint/k", + .check = test__checkevent_breakpoint_x_modifier_name, + /* 3 */ + }, + { + .name = "mem:0:r/name=breakpoint/hp", + .check = test__checkevent_breakpoint_r_modifier_name, + /* 4 */ + }, + { + .name = "mem:0:w/name=breakpoint/up", + .check = test__checkevent_breakpoint_w_modifier_name, + /* 5 */ + }, + { + .name = "mem:0:rw/name=breakpoint/", + .check = test__checkevent_breakpoint_rw, + /* 6 */ + }, + { + .name = "mem:0:rw/name=breakpoint/kp", + .check = test__checkevent_breakpoint_rw_modifier_name, + /* 7 */ + }, + { + .name = "mem:0/1/name=breakpoint/", + .check = test__checkevent_breakpoint_len, + /* 8 */ + }, + { + .name = "mem:0/2:w/name=breakpoint/", + .check = test__checkevent_breakpoint_len_w, + /* 9 */ + }, + { + .name = "mem:0/4:rw/name=breakpoint/u", + .check = test__checkevent_breakpoint_len_rw_modifier, + /* 0 */ + }, + { + .name = "mem:0/1/name=breakpoint1/,mem:0/4:rw/name=breakpoint2/", + .check = test__checkevent_breakpoint_2_events, + /* 1 */ + }, }; static const struct evlist_test test__events_pmu[] = {
tools/perf/util/parse-events.c +19 -4
@@ -896,10 +896,14 @@ do { \return 0 ; } -int parse_events_add_breakpoint (struct list_head *list,int *idx, -u64 addr,char *type,u64 len) +int parse_events_add_breakpoint (struct parse_events_state *parse_state, +struct list_head *list, +u64 addr,char *type,u64 len, +struct list_head *head_config__maybe_unused ) {struct perf_event_attr attr; +LIST_HEAD (config_terms); +const char *name;memset (&attr,0 ,sizeof (attr)); attr.bp_addr = addr;
@@ -920,8 +924,19 @@ int parse_events_add_breakpoint(struct list_head *list, int *idx, attr.type =PERF_TYPE_BREAKPOINT ; attr.sample_period =1 ; -return add_event (list, idx, &attr,/*name=*/ NULL ,/*mertic_id=*/ NULL , -/*config_terms=*/ NULL ); +if (head_config) { +if (config_attr (&attr, head_config, parse_state->error, + config_term_common)) +return -EINVAL ; + +if (get_config_terms (head_config, &config_terms)) +return -ENOMEM ; + } + + name =get_config_name (head_config); + +return add_event (list, &parse_state->idx, &attr, name,/*mertic_id=*/ NULL , + &config_terms); } static int check_type_val(struct parse_events_term *term,
tools/perf/util/parse-events.h +4 -2
@@ -179,8 +179,10 @@ int parse_events_add_cache(struct list_head *list, int *idx,struct parse_events_error *error, struct list_head *head_config, struct parse_events_state *parse_state); -int parse_events_add_breakpoint (struct list_head *list,int *idx, -u64 addr,char *type,u64 len); +int parse_events_add_breakpoint (struct parse_events_state *parse_state, +struct list_head *list, +u64 addr,char *type,u64 len, +struct list_head *head_config); int parse_events_add_pmu(struct parse_events_state *parse_state, struct list_head *list, char *name, struct list_head *head_config,
tools/perf/util/parse-events.l +20 -3
@@ -215,9 +215,14 @@ name [a-zA-Z_*?\[\]][a-zA-Z0-9_*?.\[\]!]* name_tag [\'][a-zA-Z_*?\[\]][a-zA-Z0-9_*?\-,\.\[\]:=]*[\'] name_minus [a-zA-Z_*?][a-zA-Z0-9\-_*?.:]* drv_cfg_term [a-zA-Z0-9_\.]+(=[a-zA-Z0-9_*?\.:]+)? -/* If you add a modifier you need to update check_modifier() */ +/* + * If you add a modifier you need to update check_modifier(). + * Also, the letters in modifier_event must not be in modifier_bp. + */ modifier_event [ukhpPGHSDIWeb]+ modifier_bp [rwx]{1,3} +digit [0-9] +non_digit [^0-9] %%
@@ -315,8 +320,20 @@ r0x{num_raw_hex} { return raw(yyscanner); } <mem>{ {modifier_bp} { return str(yyscanner, PE_MODIFIER_BP); } -: { return ':'; } -"/" { return '/'; } + /* + * The colon before memory access modifiers can get mixed up with the + * colon before event modifiers. Fortunately none of the option letters + * are the same, so trailing context can be used disambiguate the two + * cases. + */ +":"/{modifier_bp} { return str(yyscanner, PE_BP_COLON); } + /* + * The slash before memory length can get mixed up with the slash before + * config terms. Fortunately config terms do not start with a numeric + * digit, so trailing context can be used disambiguate the two cases. + */ +"/"/{digit} { return str(yyscanner, PE_BP_SLASH); } +"/"/{non_digit} { BEGIN(config); return '/'; } {num_dec} { return value(yyscanner, 10); } {num_hex} { return value(yyscanner, 16); } /*
tools/perf/util/parse-events.y +24 -18
106 lines not on this page · raw message
Signature · 1 line
2.34.1
Quoted 10 lines · Adrian Hunter
Hi
Here is a patch (V2) to the event parser for breakpoint events. I am not that familiar with flex / bison, but it seemed to need trailing context to stop the mem event colon and slash delimiters from getting mixed up with delimiters for config terms or event modifiers. Please look closely at that.
Quoted 4 lines
Change in V2:
Add comments to
tools/perf/util/parse-events.lAdd a test for 2 mem events back to back with config terms
Thanks for the tests/comments!
Ian
Quoted 14 lines
Adrian Hunter (1):
perf tools: Allow config terms with breakpointstools/perf/tests/parse-events.c | 157 ++++++++++++++++++++++++++++++++++++++++ tools/perf/util/parse-events.c | 23 +++++- tools/perf/util/parse-events.h | 6 +- tools/perf/util/parse-events.l | 23 +++++- tools/perf/util/parse-events.y | 42 ++++++----- 5 files changed, 224 insertions(+), 27 deletions(-)Regards
Adrian