perf tests: Add metrics tests
Jiri Olsa
reviewerv2 cover perf tests: Add metrics tests
hi,
changes for using metric result in another metric seem to change lot of core metric code, so it's better we have some more tests before we do that.
v2 changes:
- some of the patches got accepted
- add missing free to patch 1 [Ian]
- factor pmu-events test functions and reuse it in the new test [Ian]
- add fake_pmu bool to parse_events interface [Ian]
- simplify metric tests
- use proper cover letter subject ;-)
I actually reworked the 2 patches Ian acked so far, so I did not add them.
Also available in here:
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
perf/metric_test
thanks,
jirka
---
Jiri Olsa (13):
perf tools: Add fake pmu support
perf tools: Add fake_pmu bool to parse_events interface perf tests: Factor check_parse_id function perf tests: Add another metric parsing test perf tools: Factor out parse_groups function perf tools: Add fake_pmu to parse_events function perf tools: Add map to parse_events function perf tools: Add metricgroup__parse_groups_test function perf tools: Factor out prepare_metric function perf tools: Release metric_events rblist
perf tools: Add test_generic_metric function perf tests: Add parse metric test for ipc metric perf tests: Add parse metric test for frontend metric
tools/perf/arch/arm/util/cs-etm.c | 2 +- tools/perf/arch/arm64/util/arm-spe.c | 2 +- tools/perf/arch/powerpc/util/kvm-stat.c | 2 +- tools/perf/arch/x86/tests/intel-cqm.c | 2 +- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 2 +- tools/perf/arch/x86/util/intel-bts.c | 2 +- tools/perf/arch/x86/util/intel-pt.c | 6 ++-- tools/perf/builtin-stat.c | 9 +++--- tools/perf/builtin-trace.c | 4 +-- tools/perf/tests/Build | 1 + tools/perf/tests/backward-ring-buffer.c | 3 +- tools/perf/tests/builtin-test.c | 4 +++ tools/perf/tests/code-reading.c | 2 +- tools/perf/tests/event-times.c | 2 +- tools/perf/tests/evsel-roundtrip-name.c | 4 +-- tools/perf/tests/hists_cumulate.c | 2 +- tools/perf/tests/hists_filter.c | 4 +-- tools/perf/tests/hists_link.c | 4 +-- tools/perf/tests/hists_output.c | 2 +- tools/perf/tests/keep-tracking.c | 4 +-- tools/perf/tests/parse-events.c | 2 +- tools/perf/tests/parse-metric.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/perf/tests/pmu-events.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- tools/perf/tests/switch-tracking.c | 8 ++--- tools/perf/tests/tests.h | 1 + tools/perf/util/bpf-loader.c | 2 +- tools/perf/util/metricgroup.c | 74 ++++++++++++++++++++++++++++++++++++---------- tools/perf/util/metricgroup.h | 10 +++++++ tools/perf/util/parse-events.c | 29 +++++++++++------- tools/perf/util/parse-events.h | 5 ++-- tools/perf/util/parse-events.l | 8 +++-- tools/perf/util/parse-events.y | 41 ++++++++++++++++++++++++-- tools/perf/util/perf_api_probe.c | 2 +- tools/perf/util/record.c | 2 +- tools/perf/util/stat-shadow.c | 67 ++++++++++++++++++++++++++++++------------ tools/perf/util/stat.h | 3 ++ 36 files changed, 527 insertions(+), 92 deletions(-) create mode 100644 tools/perf/tests/parse-metric.c
Jiri Olsa
reviewerPATCH v2 1/13 perf tools: Add fake pmu support
Adding the way to create pmu event without the actual PMU being in place. This way we can test metrics defined for any processors.
The interface is to define fake_pmu in struct parse_events_state data. It will be used only in tests via special interface function added in following changes.
--- tools/perf/util/parse-events.c | 14 +++++++++--- tools/perf/util/parse-events.h | 3 ++- tools/perf/util/parse-events.l | 8 +++++-- tools/perf/util/parse-events.y | 41 ++++++++++++++++++++++++++++++++-- 4 files changed, 58 insertions(+), 8 deletions(-)
tools/perf/util/parse-events.c +11 -3
@@ -1429,6 +1429,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,bool auto_merge_stats, bool use_alias) { + bool is_fake = parse_state->fake_pmu;struct perf_event_attr attr;struct perf_pmu_info info;struct perf_pmu *pmu;
@@ -1450,7 +1451,14 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,fprintf (stderr,"' that may result in non-fatal errors\n" ); } - pmu =perf_pmu__find (name); +if (is_fake) { +static struct perf_pmu fake_pmu = { }; + + pmu = &fake_pmu; + }else { + pmu =perf_pmu__find (name); + } +if (!pmu) {char *err_str;
@@ -1483,7 +1491,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, } } -if (perf_pmu__check_alias (pmu, head_config, &info)) +if (!is_fake &&perf_pmu__check_alias (pmu, head_config, &info))return -EINVAL ;if (verbose >1 ) {
@@ -1516,7 +1524,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,if (pmu->default_config &&get_config_chgs (pmu, head_config, &config_terms))return -ENOMEM ; -if (perf_pmu__config (pmu, &attr, head_config, parse_state->error)) { +if (!is_fake &&perf_pmu__config (pmu, &attr, head_config, parse_state->error)) {struct evsel_config_term *pos, *tmp;list_for_each_entry_safe (pos, tmp, &config_terms, list) {
tools/perf/util/parse-events.h +2 -1
@@ -127,9 +127,10 @@ struct parse_events_state {int idx;int nr_groups;struct parse_events_error *error; -struct evlist *evlist; +struct evlist *evlist;struct list_head *terms;int stoken; +bool fake_pmu; }; void parse_events__handle_error(struct parse_events_error *err, int idx,
tools/perf/util/parse-events.l +6 -2
@@ -129,12 +129,16 @@ do { \ yyless(0); \ } while (0) -static int pmu_str_check(yyscan_t scanner) +static int pmu_str_check(yyscan_t scanner, struct parse_events_state *parse_state) { YYSTYPE *yylval = parse_events_get_lval(scanner); char *text = parse_events_get_text(scanner); yylval->str = strdup(text); + + if (parse_state->fake_pmu) + return PE_PMU_EVENT_FAKE; + switch (perf_pmu__parse_check(text)) { case PMU_EVENT_SYMBOL_PREFIX: return PE_PMU_EVENT_PRE;
@@ -376,7 +380,7 @@ r{num_raw_hex} { return raw(yyscanner); } {modifier_event} { return str(yyscanner, PE_MODIFIER_EVENT); } {bpf_object} { if (!isbpf(yyscanner)) { USER_REJECT }; return str(yyscanner, PE_BPF_OBJECT); } {bpf_source} { if (!isbpf(yyscanner)) { USER_REJECT }; return str(yyscanner, PE_BPF_SOURCE); } -{name} { return pmu_str_check(yyscanner); } +{name} { return pmu_str_check(yyscanner, _parse_state); } {name_tag} { return str(yyscanner, PE_NAME); } "/" { BEGIN(config); return '/'; } - { return '-'; }
tools/perf/util/parse-events.y +39 -2
59 lines not on this page · raw message
Signature · 1 line
2.25.4
Jiri Olsa
reviewerPATCH v2 2/13 perf tools: Add fake_pmu bool to parse_events interface
In reply to Jiri OlsaAdding fake_pmu bool argument parse_events interface to parse events and use fake pmu event in case pmu event is parsed.
This way it's possible to parse events from PMUs which are not present in the system. It's available only for testing purposes coming in following changes, so all the current users set fake_pmu argument as false.
--- tools/perf/arch/arm/util/cs-etm.c | 2 +- tools/perf/arch/powerpc/util/kvm-stat.c | 2 +- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 2 +- tools/perf/arch/x86/util/intel-bts.c | 2 +- tools/perf/arch/x86/util/intel-pt.c | 6 +++--- tools/perf/builtin-stat.c | 8 ++++---- tools/perf/builtin-trace.c | 4 ++-- tools/perf/tests/backward-ring-buffer.c | 3 ++- tools/perf/tests/code-reading.c | 2 +- tools/perf/tests/event-times.c | 2 +- tools/perf/tests/evsel-roundtrip-name.c | 4 ++-- tools/perf/tests/hists_cumulate.c | 2 +- tools/perf/tests/hists_filter.c | 4 ++-- tools/perf/tests/hists_link.c | 4 ++-- tools/perf/tests/hists_output.c | 2 +- tools/perf/tests/keep-tracking.c | 4 ++-- tools/perf/tests/parse-events.c | 2 +- tools/perf/tests/pmu-events.c | 2 +- tools/perf/tests/switch-tracking.c | 8 ++++---- tools/perf/util/bpf-loader.c | 2 +- tools/perf/util/metricgroup.c | 2 +- tools/perf/util/parse-events.c | 15 ++++++++------- tools/perf/util/parse-events.h | 2 +- tools/perf/util/perf_api_probe.c | 2 +- tools/perf/util/record.c | 2 +- 25 files changed, 46 insertions(+), 44 deletions(-)
tools/perf/arch/arm/util/cs-etm.c +1 -1
@@ -415,7 +415,7 @@ static int cs_etm_recording_options(struct auxtrace_record *itr,if (opts->full_auxtrace) {struct evsel *tracking_evsel; - err =parse_events (evlist,"dummy:u" ,NULL ); + err =parse_events (evlist,"dummy:u" ,NULL , false);if (err) goto out;
tools/perf/arch/powerpc/util/kvm-stat.c +1 -1
@@ -114,7 +114,7 @@ static int is_tracepoint_available(const char *str, struct evlist *evlist)int ret;bzero (&err,sizeof (err)); - ret =parse_events (evlist, str, &err); + ret =parse_events (evlist, str, &err, false);if (err.str)parse_events_print_error (&err,"tracepoint" );return ret;
tools/perf/arch/x86/tests/perf-time-to-tsc.c +1 -1
@@ -80,7 +80,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybeperf_evlist__set_maps (&evlist->core, cpus, threads); -CHECK__ (parse_events (evlist,"cycles:u" ,NULL )); +CHECK__ (parse_events (evlist,"cycles:u" ,NULL , false));perf_evlist__config (evlist, &opts,NULL );
tools/perf/arch/x86/util/intel-bts.c +1 -1
@@ -232,7 +232,7 @@ static int intel_bts_recording_options(struct auxtrace_record *itr,struct evsel *tracking_evsel;int err; - err =parse_events (evlist,"dummy:u" ,NULL ); + err =parse_events (evlist,"dummy:u" ,NULL , false);if (err)return err;
tools/perf/arch/x86/util/intel-pt.c +3 -3
@@ -419,7 +419,7 @@ static int intel_pt_track_switches(struct evlist *evlist)if (!perf_evlist__can_select_event (evlist, sched_switch))return -EPERM ; - err =parse_events (evlist, sched_switch,NULL ); + err =parse_events (evlist, sched_switch,NULL , false);if (err) {pr_debug2 ("%s: failed to parse %s, error %d\n" , __func__, sched_switch, err);
@@ -796,7 +796,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,if (!cpu_wide &&perf_can_record_cpu_wide ()) {struct evsel *switch_evsel; - err =parse_events (evlist,"dummy:u" ,NULL ); + err =parse_events (evlist,"dummy:u" ,NULL , false);if (err)return err;
@@ -854,7 +854,7 @@ static int intel_pt_recording_options(struct auxtrace_record *itr,if (opts->full_auxtrace) {struct evsel *tracking_evsel; - err =parse_events (evlist,"dummy:u" ,NULL ); + err =parse_events (evlist,"dummy:u" ,NULL , false);if (err)return err;
tools/perf/builtin-stat.c +4 -4
@@ -1533,11 +1533,11 @@ static int add_default_attributes(void)if (pmu_have_event ("cpu" ,"cycles-ct" ) &&pmu_have_event ("cpu" ,"el-start" )) err =parse_events (evsel_list, transaction_attrs, - &errinfo); + &errinfo, false);else err =parse_events (evsel_list, transaction_limited_attrs, - &errinfo); + &errinfo, false);if (err) {fprintf (stderr,"Cannot set up transaction events\n" );parse_events_print_error (&errinfo, transaction_attrs);
@@ -1566,7 +1566,7 @@ static int add_default_attributes(void) pmu_have_event("msr", "smi")) { if (!force_metric_only) stat_config.metric_only = true; - err = parse_events(evsel_list, smi_cost_attrs, &errinfo); + err = parse_events(evsel_list, smi_cost_attrs, &errinfo, false); } else {fprintf (stderr,"To measure SMI cost, it needs " "msr/aperf/, msr/smi/ and cpu/cycles/ support\n" );
@@ -1606,7 +1606,7 @@ static int add_default_attributes(void)if (topdown_attrs[0 ] && str) {if (warn)arch_topdown_group_warn (); - err =parse_events (evsel_list, str, &errinfo); + err =parse_events (evsel_list, str, &errinfo, false);if (err) { fprintf(stderr, "Cannot set up top down events %s: %d\n",
tools/perf/builtin-trace.c +2 -2
@@ -3044,7 +3044,7 @@ static bool evlist__add_vfs_getname(struct evlist *evlist)int ret;bzero (&err,sizeof (err)); - ret =parse_events (evlist,"probe:vfs_getname*" , &err); + ret =parse_events (evlist,"probe:vfs_getname*" , &err, false);if (ret) {free (err.str);free (err.help);
@@ -4879,7 +4879,7 @@ int cmd_trace(int argc, const char **argv)struct parse_events_error parse_err;bzero (&parse_err,sizeof (parse_err)); - err =parse_events (trace.evlist, trace.perfconfig_events, &parse_err); + err =parse_events (trace.evlist, trace.perfconfig_events, &parse_err, false);if (err) {parse_events_print_error (&parse_err, trace.perfconfig_events); goto out;
tools/perf/tests/backward-ring-buffer.c +2 -1
@@ -120,7 +120,8 @@ int test__backward_ring_buffer(struct test *test __maybe_unused, int subtest __m* Set backward bit, ring buffer should be writing from end. Record * it in aux evlist */ - err =parse_events (evlist,"syscalls:sys_enter_prctl/overwrite/" , &parse_error); + err =parse_events (evlist,"syscalls:sys_enter_prctl/overwrite/" , + &parse_error, false);if (err) {pr_debug ("Failed to parse tracepoint event, try use root\n" ); ret =TEST_SKIP ;
tools/perf/tests/code-reading.c +1 -1
@@ -645,7 +645,7 @@ static int do_test_code_reading(bool try_kcore) str =do_determine_event (excl_kernel);pr_debug ("Parsing event '%s'\n" , str); - ret =parse_events (evlist, str,NULL ); + ret =parse_events (evlist, str,NULL , false);if (ret <0 ) {pr_debug ("parse_events failed\n" ); goto out_put;
tools/perf/tests/event-times.c +1 -1
@@ -174,7 +174,7 @@ static int test_times(int (attach)(struct evlist *), goto out_err; } - err =parse_events (evlist,"cpu-clock:u" ,NULL ); + err =parse_events (evlist,"cpu-clock:u" ,NULL , false);if (err) {pr_debug ("failed to parse event cpu-clock:u\n" ); goto out_err;
tools/perf/tests/evsel-roundtrip-name.c +2 -2
@@ -25,7 +25,7 @@ static int perf_evsel__roundtrip_cache_name_test(void)for (i =0 ; i <PERF_COUNT_HW_CACHE_RESULT_MAX ; i++) {__evsel__hw_cache_type_op_res_name (type, op, i, name,sizeof (name)); - err =parse_events (evlist, name,NULL ); + err =parse_events (evlist, name,NULL , false);if (err) ret = err; }
@@ -72,7 +72,7 @@ static int __perf_evsel__name_array_test(const char *names[], int nr_names)return -ENOMEM ;for (i =0 ; i < nr_names; ++i) { - err =parse_events (evlist, names[i],NULL ); + err =parse_events (evlist, names[i],NULL , false);if (err) {pr_debug ("failed to parse event '%s', err %d\n" , names[i], err);
tools/perf/tests/hists_cumulate.c +1 -1
@@ -706,7 +706,7 @@ int test__hists_cumulate(struct test *test __maybe_unused, int subtest __maybe_uTEST_ASSERT_VAL ("No memory" , evlist); - err =parse_events (evlist,"cpu-clock" ,NULL ); + err =parse_events (evlist,"cpu-clock" ,NULL , false);if (err) goto out; err =TEST_FAIL ;
tools/perf/tests/hists_filter.c +2 -2
@@ -111,10 +111,10 @@ int test__hists_filter(struct test *test __maybe_unused, int subtest __maybe_unuTEST_ASSERT_VAL ("No memory" , evlist); - err =parse_events (evlist,"cpu-clock" ,NULL ); + err =parse_events (evlist,"cpu-clock" ,NULL , false);if (err) goto out; - err =parse_events (evlist,"task-clock" ,NULL ); + err =parse_events (evlist,"task-clock" ,NULL , false);if (err) goto out; err =TEST_FAIL ;
tools/perf/tests/hists_link.c +2 -2
@@ -276,10 +276,10 @@ int test__hists_link(struct test *test __maybe_unused, int subtest __maybe_unuseif (evlist ==NULL )return -ENOMEM ; - err =parse_events (evlist,"cpu-clock" ,NULL ); + err =parse_events (evlist,"cpu-clock" ,NULL , false);if (err) goto out; - err =parse_events (evlist,"task-clock" ,NULL ); + err =parse_events (evlist,"task-clock" ,NULL , false);if (err) goto out;
tools/perf/tests/hists_output.c +1 -1
@@ -593,7 +593,7 @@ int test__hists_output(struct test *test __maybe_unused, int subtest __maybe_unuTEST_ASSERT_VAL ("No memory" , evlist); - err =parse_events (evlist,"cpu-clock" ,NULL ); + err =parse_events (evlist,"cpu-clock" ,NULL , false);if (err) goto out; err =TEST_FAIL ;
tools/perf/tests/keep-tracking.c +2 -2
@@ -89,8 +89,8 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_unperf_evlist__set_maps (&evlist->core, cpus, threads); -CHECK__ (parse_events (evlist,"dummy:u" ,NULL )); -CHECK__ (parse_events (evlist,"cycles:u" ,NULL )); +CHECK__ (parse_events (evlist,"dummy:u" ,NULL , false)); +CHECK__ (parse_events (evlist,"cycles:u" ,NULL , false));perf_evlist__config (evlist, &opts,NULL );
tools/perf/tests/parse-events.c +1 -1
@@ -1797,7 +1797,7 @@ static int test_event(struct evlist_test *e)if (evlist ==NULL )return -ENOMEM ; - ret =parse_events (evlist, e->name, &err); + ret =parse_events (evlist, e->name, &err, false);if (ret) {pr_debug ("failed to parse event '%s', err %d, str '%s'\n" , e->name, ret, err.str);
tools/perf/tests/pmu-events.c +1 -1
@@ -402,7 +402,7 @@ static int check_parse_id(const char *id, bool same_cpu, struct pmu_event *pe) evlist =evlist__new ();memset (&error,0 ,sizeof (error)); - ret =parse_events (evlist, id, &error); + ret =parse_events (evlist, id, &error, false);if (ret && same_cpu) {pr_warning ("Parse event failed metric '%s' id '%s' expr '%s'\n" , pe->metric_name, id, pe->metric_expr);
tools/perf/tests/switch-tracking.c +4 -4
@@ -362,7 +362,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_perf_evlist__set_maps (&evlist->core, cpus, threads);/* First event */ - err =parse_events (evlist,"cpu-clock:u" ,NULL ); + err =parse_events (evlist,"cpu-clock:u" ,NULL , false);if (err) {pr_debug ("Failed to parse event dummy:u\n" ); goto out_err;
@@ -371,7 +371,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_ cpu_clocks_evsel =evlist__last (evlist);/* Second event */ - err =parse_events (evlist,"cycles:u" ,NULL ); + err =parse_events (evlist,"cycles:u" ,NULL , false);if (err) {pr_debug ("Failed to parse event cycles:u\n" ); goto out_err;
@@ -386,7 +386,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_ goto out; } - err =parse_events (evlist, sched_switch,NULL ); + err =parse_events (evlist, sched_switch,NULL , false);if (err) {pr_debug ("Failed to parse event %s\n" , sched_switch); goto out_err;
@@ -416,7 +416,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_evsel__set_sample_bit (cycles_evsel,TIME );/* Fourth event */ - err =parse_events (evlist,"dummy:u" ,NULL ); + err =parse_events (evlist,"dummy:u" ,NULL , false);if (err) {pr_debug ("Failed to parse event dummy:u\n" ); goto out_err;
tools/perf/util/bpf-loader.c +1 -1
@@ -1560,7 +1560,7 @@ struct evsel *bpf__setup_output_event(struct evlist *evlist, const char *name)if (asprintf (&event_definition,"bpf-output/no-inherit=1,name=%s/" , name) <0 )return ERR_PTR (-ENOMEM ); - err =parse_events (evlist, event_definition,NULL ); + err =parse_events (evlist, event_definition,NULL , false);free (event_definition);if (err) {
tools/perf/util/metricgroup.c +1 -1
@@ -729,7 +729,7 @@ int metricgroup__parse_groups(const struct option *opt,return ret;pr_debug ("adding %s\n" , extra_events.buf);bzero (&parse_error,sizeof (parse_error)); - ret =parse_events (perf_evlist, extra_events.buf, &parse_error); + ret =parse_events (perf_evlist, extra_events.buf, &parse_error, false);if (ret) {parse_events_print_error (&parse_error, extra_events.buf); goto out;
tools/perf/util/parse-events.c +8 -7
@@ -2097,14 +2097,15 @@ int parse_events_terms(struct list_head *terms, const char *str) }int parse_events (struct evlist *evlist,const char *str, -struct parse_events_error *err) +struct parse_events_error *err,bool fake_pmu) {struct parse_events_state parse_state = { - .list =LIST_HEAD_INIT (parse_state.list), - .idx = evlist->core.nr_entries, - .error = err, - .evlist = evlist, - .stoken =PE_START_EVENTS , + .list =LIST_HEAD_INIT (parse_state.list), + .idx = evlist->core.nr_entries, + .error = err, + .evlist = evlist, + .stoken =PE_START_EVENTS , + .fake_pmu = fake_pmu, };int ret;
@@ -2232,7 +2233,7 @@ int parse_events_option(const struct option *opt, const char *str,int ret;bzero (&err,sizeof (err)); - ret =parse_events (evlist, str, &err); + ret =parse_events (evlist, str, &err, false);if (ret) {parse_events_print_error (&err, str);
tools/perf/util/parse-events.h +1 -1
@@ -34,7 +34,7 @@ const char *event_type(int type);int parse_events_option (const struct option *opt,const char *str,int unset);int parse_events_option_new_evlist (const struct option *opt,const char *str,int unset);int parse_events (struct evlist *evlist,const char *str, -struct parse_events_error *error); +struct parse_events_error *error,bool fake_pmu);int parse_events_terms (struct list_head *terms,const char *str);int parse_filter (const struct option *opt,const char *str,int unset);int exclude_perf (const struct option *opt,const char *arg,int unset);
tools/perf/util/perf_api_probe.c +1 -1
@@ -23,7 +23,7 @@ static int perf_do_probe_api(setup_probe_fn_t fn, int cpu, const char *str)if (!evlist)return -ENOMEM ; -if (parse_events (evlist, str,NULL )) +if (parse_events (evlist, str,NULL , false)) goto out_delete; evsel =evlist__first (evlist);
tools/perf/util/record.c +1 -1
@@ -210,7 +210,7 @@ bool perf_evlist__can_select_event(struct evlist *evlist, const char *str)if (!temp_evlist)return false; - err =parse_events (temp_evlist, str,NULL ); + err =parse_events (temp_evlist, str,NULL , false);if (err) goto out_delete;
Signature · 1 line
2.25.4
Jiri Olsa
reviewerPATCH v2 3/13 perf tests: Factor check_parse_id function
In reply to Jiri OlsaSeparating the generic part of check_parse_id function, so it can be used in following changes for the new test.
--- tools/perf/tests/pmu-events.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
tools/perf/tests/pmu-events.c +15 -6
@@ -390,9 +390,8 @@ static bool is_number(const char *str)return errno ==0 && end_ptr != str; } -static int check_parse_id (const char *id,bool same_cpu,struct pmu_event *pe) +static int check_parse_id (const char *id,struct parse_events_error *error) { -struct parse_events_error error;struct evlist *evlist;int ret;
@@ -401,8 +400,19 @@ static int check_parse_id(const char *id, bool same_cpu, struct pmu_event *pe)return 0 ; evlist =evlist__new (); -memset (&error,0 ,sizeof (error)); - ret =parse_events (evlist, id, &error, false); +if (!evlist) +return -ENOMEM ; +memset (error,0 ,sizeof (*error)); + ret =parse_events (evlist, id, error, false); +evlist__delete (evlist); +return ret; +} + +static int check_parse_cpu (const char *id,bool same_cpu,struct pmu_event *pe) +{ +struct parse_events_error error; + +int ret =check_parse_id (id, &error);if (ret && same_cpu) {pr_warning ("Parse event failed metric '%s' id '%s' expr '%s'\n" , pe->metric_name, id, pe->metric_expr);
@@ -413,7 +423,6 @@ static int check_parse_id(const char *id, bool same_cpu, struct pmu_event *pe) id, pe->metric_name, pe->metric_expr); ret =0 ; } -evlist__delete (evlist);free (error.str);free (error.help);free (error.first_str);
@@ -474,7 +483,7 @@ static int test_parsing(void)expr__add_id (&ctx,strdup (cur->key), k++);hashmap__for_each_entry ((&ctx.ids), cur, bkt) { -if (check_parse_id (cur->key, map == cpus_map, +if (check_parse_cpu (cur->key, map == cpus_map, pe)) ret++; }
Signature · 1 line
2.25.4
Jiri Olsa
reviewerPATCH v2 4/13 perf tests: Add another metric parsing test
In reply to Jiri OlsaThe test goes through all metrics compiled for arch within pmu events and try to parse them.
This test is different from 'test_parsing' in that we go through all the events in the current arch, not just one defined for current CPU model. Using 'fake_pmu' to parse events which do not have PMUs defined in the system.
Say there's bad change in ivybridge metrics file, like:
--- a/tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json +++ b/tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json @@ -8,7 +8,7 @@
- "MetricExpr": "IDQ_UOPS_NOT_DELIVERED.CORE / (4 * ((
+ "MetricExpr": "IDQ_UOPS_NOT_DELIVERED.CORE / / (4 *
the test fails with (on my kabylake laptop):
$ perf test 'Parsing of PMU event table metrics with fake PMUs' -v parsing 'idq_uops_not_delivered.core / / (4 * (( ( cpu_clk_unh... syntax error, line 1 expr__parse failed test child finished with -1 ...
The test also defines its own list of metrics and tries to parse them. It's handy for developing.
--- tools/perf/tests/pmu-events.c | 117 +++++++++++++++++++++++++++++++++- 1 file changed, 114 insertions(+), 3 deletions(-)
tools/perf/tests/pmu-events.c +114 -3
@@ -390,7 +390,8 @@ static bool is_number(const char *str)return errno ==0 && end_ptr != str; } -static int check_parse_id (const char *id,struct parse_events_error *error) +static int check_parse_id (const char *id,struct parse_events_error *error, +bool fake_pmu) {struct evlist *evlist;int ret;
@@ -403,7 +404,7 @@ static int check_parse_id(const char *id, struct parse_events_error *error)if (!evlist)return -ENOMEM ;memset (error,0 ,sizeof (*error)); - ret =parse_events (evlist, id, error, false); + ret =parse_events (evlist, id, error, fake_pmu);evlist__delete (evlist);return ret; }
@@ -412,7 +413,7 @@ static int check_parse_cpu(const char *id, bool same_cpu, struct pmu_event *pe) {struct parse_events_error error; -int ret =check_parse_id (id, &error); +int ret =check_parse_id (id, &error, false);if (ret && same_cpu) {pr_warning ("Parse event failed metric '%s' id '%s' expr '%s'\n" , pe->metric_name, id, pe->metric_expr);
@@ -430,6 +431,18 @@ static int check_parse_cpu(const char *id, bool same_cpu, struct pmu_event *pe)return ret; } +static int check_parse_fake (const char *id) +{ +struct parse_events_error error; +int ret =check_parse_id (id, &error, true); + +free (error.str); +free (error.help); +free (error.first_str); +free (error.first_help); +return ret; +} +static void expr_failure (const char *msg,const struct pmu_events_map *map,const struct pmu_event *pe)
@@ -499,6 +512,100 @@ static int test_parsing(void)return ret ==0 ?TEST_OK :TEST_SKIP ; } +struct test_metric { +const char *str; +}; + +static struct test_metric metrics[] = { + {"(unc_p_power_state_occupancy.cores_c0 / unc_p_clockticks) * 100." }, + {"imx8_ddr0@read\\-cycles@ * 4 * 4" , }, + {"imx8_ddr0@axid\\-read\\,axi_mask\\=0xffff\\,axi_id\\=0x0000@ * 4" , }, + {"(cstate_pkg@c2\\-residency@ / msr@tsc@) * 100" , }, + {"(imx8_ddr0@read\\-cycles@ + imx8_ddr0@write\\-cycles@)" , }, +}; + +static int metric_parse_fake (const char *str) +{ +struct expr_parse_ctx ctx; +struct hashmap_entry *cur; +double result; +int ret =-1 ; +size_t bkt; +int i; + +pr_debug ("parsing '%s'\n" , str); + +expr__ctx_init (&ctx); +if (expr__find_other (str,NULL , &ctx,0 ) <0 ) { +pr_err ("expr__find_other failed\n" ); +return -1 ; + } + +/* +* Add all ids with a made up value. The value may +* trigger divide by zero when subtracted and so try to +* make them unique. +*/ + i =1 ; +hashmap__for_each_entry ((&ctx.ids), cur, bkt) +expr__add_id (&ctx,strdup (cur->key), i++); + +hashmap__for_each_entry ((&ctx.ids), cur, bkt) { +if (check_parse_fake (cur->key)) { +pr_err ("check_parse_fake failed\n" ); + goto out; + } + } + +if (expr__parse (&result, &ctx, str,1 )) +pr_err ("expr__parse failed\n" ); +else + ret =0 ; + +out: +expr__ctx_clear (&ctx); +return ret; +} + +/* +* Parse all the metrics for current architecture, +* or all defined cpus via the 'fake_pmu' bool +* in parse_events. +*/ +static int test_parsing_fake (void ) +{ +struct pmu_events_map *map; +struct pmu_event *pe; +unsigned int i, j; +int err =0 ; + +for (i =0 ; i <ARRAY_SIZE (metrics); i++) { + err =metric_parse_fake (metrics[i].str); +if (err) +return err; + } + + i =0 ; +for (;;) { + map = &pmu_events_map[i++]; +if (!map->table) +break ; + j =0 ; +for (;;) { + pe = &map->table[j++]; +if (!pe->name && !pe->metric_group && !pe->metric_name) +break ; +if (!pe->metric_expr) +continue ; + err =metric_parse_fake (pe->metric_expr); +if (err) +return err; + } + } + +return 0 ; +} + static const struct { int (*func)(void); const char *desc;
@@ -515,6 +622,10 @@ static const struct { .func = test_parsing, .desc = "Parsing of PMU event table metrics", }, + { + .func = test_parsing_fake, + .desc = "Parsing of PMU event table metrics with fake PMUs", + }, };const char *test__pmu_events_subtest_get_desc (int subtest)
Signature · 1 line
2.25.4
Jiri Olsa
reviewerPATCH v2 7/13 perf tools: Add map to parse_events function
In reply to Jiri OlsaFor testing purposes we need to pass our own map of events from parse_groups through metricgroup__add_metric.
--- tools/perf/util/metricgroup.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
tools/perf/util/metricgroup.c +13 -10
@@ -597,17 +597,14 @@ static int __metricgroup__add_metric(struct list_head *group_list,static int metricgroup__add_metric (const char *metric,bool metric_no_group,struct strbuf *events, -struct list_head *group_list) +struct list_head *group_list, +struct pmu_events_map *map) { -struct pmu_events_map *map =perf_pmu__find_map (NULL );struct pmu_event *pe;struct egroup *eg;int i, ret;bool has_match = false; -if (!map) -return 0 ; -for (i =0 ; ; i++) { pe = &map->table[i];
@@ -668,7 +665,8 @@ static int metricgroup__add_metric(const char *metric, bool metric_no_group,static int metricgroup__add_metric_list (const char *list,bool metric_no_group,struct strbuf *events, -struct list_head *group_list) +struct list_head *group_list, +struct pmu_events_map *map) {char *llist, *nlist, *p;int ret = -EINVAL ;
@@ -683,7 +681,7 @@ static int metricgroup__add_metric_list(const char *list, bool metric_no_group,while ((p =strsep (&llist,"," )) !=NULL ) { ret =metricgroup__add_metric (p, metric_no_group, events, - group_list); + group_list, map);if (ret == -EINVAL ) {fprintf (stderr,"Cannot find metric or group `%s'\n" , p);
@@ -713,7 +711,8 @@ static int parse_groups(struct evlist *perf_evlist, const char *str,bool metric_no_group, bool metric_no_merge, bool fake_pmu, - struct rblist *metric_events) + struct rblist *metric_events, + struct pmu_events_map *map) { struct parse_events_error parse_error;struct strbuf extra_events;
@@ -723,7 +722,7 @@ static int parse_groups(struct evlist *perf_evlist, const char *str,if (metric_events->nr_entries ==0 )metricgroup__rblist_init (metric_events); ret =metricgroup__add_metric_list (str, metric_no_group, - &extra_events, &group_list); + &extra_events, &group_list, map);if (ret)return ret;pr_debug ("adding %s\n" , extra_events.buf);
@@ -748,9 +747,13 @@ int metricgroup__parse_groups(const struct option *opt, struct rblist *metric_events) {struct evlist *perf_evlist = *(struct evlist **)opt->value; +struct pmu_events_map *map =perf_pmu__find_map (NULL ); + +if (!map) +return 0 ;return parse_groups (perf_evlist, str, metric_no_group, - metric_no_merge, false, metric_events); + metric_no_merge, false, metric_events, map); }bool metricgroup__has_metric (const char *metric)
Signature · 1 line
2.25.4
Jiri Olsa
reviewerPATCH v2 6/13 perf tools: Add fake_pmu to parse_events function
In reply to Jiri OlsaAllow to pass fake_pmu in parse_groups function
so it can be used in parse_events call.
It's set true by metricgroup__parse_groups_test
function.
--- tools/perf/util/metricgroup.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/perf/util/metricgroup.c +3 -2
@@ -712,6 +712,7 @@ static void metricgroup__free_egroups(struct list_head *group_list)static int parse_groups (struct evlist *perf_evlist,const char *str,bool metric_no_group,bool metric_no_merge, +bool fake_pmu,struct rblist *metric_events) {struct parse_events_error parse_error;
@@ -727,7 +728,7 @@ static int parse_groups(struct evlist *perf_evlist, const char *str,return ret;pr_debug ("adding %s\n" , extra_events.buf);bzero (&parse_error,sizeof (parse_error)); - ret =parse_events (perf_evlist, extra_events.buf, &parse_error, false); + ret =parse_events (perf_evlist, extra_events.buf, &parse_error, fake_pmu);if (ret) {parse_events_print_error (&parse_error, extra_events.buf); goto out;
@@ -749,7 +750,7 @@ int metricgroup__parse_groups(const struct option *opt,struct evlist *perf_evlist = *(struct evlist **)opt->value;return parse_groups (perf_evlist, str, metric_no_group, - metric_no_merge, metric_events); + metric_no_merge, false, metric_events); }bool metricgroup__has_metric (const char *metric)
Signature · 1 line
2.25.4
Jiri Olsa
reviewerPATCH v2 8/13 perf tools: Add metricgroup__parse_groups_test function
In reply to Jiri OlsaAdding metricgroup__parse_groups_test function. It will be used as test's interface to metric parsing in following changes.
--- tools/perf/util/metricgroup.c | 11 +++++++++++ tools/perf/util/metricgroup.h | 9 +++++++++ 2 files changed, 20 insertions(+)
tools/perf/util/metricgroup.c +11 -0
@@ -756,6 +756,17 @@ int metricgroup__parse_groups(const struct option *opt, metric_no_merge, false, metric_events, map); } +int metricgroup__parse_groups_test (struct evlist *evlist, +struct pmu_events_map *map, +const char *str, +bool metric_no_group, +bool metric_no_merge, +struct rblist *metric_events) +{ +return parse_groups (evlist, str, metric_no_group, + metric_no_merge, true, metric_events, map); +} +bool metricgroup__has_metric (const char *metric) {struct pmu_events_map *map =perf_pmu__find_map (NULL );
tools/perf/util/metricgroup.h +9 -0
@@ -7,8 +7,10 @@#include <stdbool.h> struct evsel ; +struct evlist ;struct option ;struct rblist ; +struct pmu_events_map ;struct metric_event {struct rb_node nd;
@@ -34,6 +36,13 @@ int metricgroup__parse_groups(const struct option *opt,bool metric_no_merge, struct rblist *metric_events); +int metricgroup__parse_groups_test (struct evlist *evlist, +struct pmu_events_map *map, +const char *str, +bool metric_no_group, +bool metric_no_merge, +struct rblist *metric_events); +void metricgroup__print (bool metrics,bool groups,char *filter,bool raw,bool details);bool metricgroup__has_metric (const char *metric);
Signature · 1 line
2.25.4
Jiri Olsa
reviewerPATCH v2 11/13 perf tools: Add test_generic_metric function
In reply to Jiri OlsaAdding test_generic_metric that prepares and runs given metric over the data from psswd struct runtime_stat object.
--- tools/perf/util/stat-shadow.c | 14 ++++++++++++++ tools/perf/util/stat.h | 3 +++ 2 files changed, 17 insertions(+)
tools/perf/util/stat-shadow.c +14 -0
@@ -842,6 +842,20 @@ static void generic_metric(struct perf_stat_config *config,expr__ctx_clear (&pctx); } +double test_generic_metric (struct metric_expr *mexp,int cpu,struct runtime_stat *st) +{ +struct expr_parse_ctx pctx; +double ratio; + +if (prepare_metric (mexp->metric_events, &pctx, cpu, st) <0 ) +return 0. ; + +if (expr__parse (&ratio, &pctx, mexp->metric_expr,1 )) +return 0. ; + +return ratio; +} + void perf_stat__print_shadow_stats(struct perf_stat_config *config, struct evsel *evsel, double avg, int cpu,
tools/perf/util/stat.h +3 -0
@@ -230,4 +230,7 @@ perf_evlist__print_counters(struct evlist *evlist,struct target *_target, struct timespec *ts, int argc, const char **argv); + +struct metric_expr ; +double test_generic_metric (struct metric_expr *mexp,int cpu,struct runtime_stat *st);#endif
Signature · 1 line
2.25.4
Jiri Olsa
reviewerPATCH v2 13/13 perf tests: Add parse metric test for frontend metric
In reply to Jiri OlsaAdding new metri test for frontend metric. It's stolen from x86 pmu events.
--- tools/perf/tests/parse-metric.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
tools/perf/tests/parse-metric.c +25 -0
@@ -17,6 +17,11 @@ static struct pmu_event pme_test[] = { .metric_expr = "inst_retired.any / cpu_clk_unhalted.thread", .metric_name = "IPC", }, +{ + .metric_expr = "idq_uops_not_delivered.core / (4 * (( ( cpu_clk_unhalted.thread / 2 ) * " + "( 1 + cpu_clk_unhalted.one_thread_active / cpu_clk_unhalted.ref_xclk ) )))", + .metric_name = "Frontend_Bound_SMT", +}, };static struct pmu_events_map map = {
@@ -138,8 +143,28 @@ static int test_ipc(void)return 0 ; } +static int test_frontend (void ) +{ +double ratio; +struct value vals[] = { + { .event ="idq_uops_not_delivered.core" , .val =300 }, + { .event ="cpu_clk_unhalted.thread" , .val =200 }, + { .event ="cpu_clk_unhalted.one_thread_active" , .val =400 }, + { .event ="cpu_clk_unhalted.ref_xclk" , .val =600 }, + {0 }, + }; + +TEST_ASSERT_VAL ("failed to compute metric" , +compute_metric ("Frontend_Bound_SMT" , vals, &ratio) ==0 ); + +TEST_ASSERT_VAL ("Frontend_Bound_SMT failed, wrong ratio" , + ratio ==0.45 ); +return 0 ; +} +int test__parse_metric (struct test *test__maybe_unused ,int subtest__maybe_unused ) {TEST_ASSERT_VAL ("IPC failed" ,test_ipc () ==0 ); +TEST_ASSERT_VAL ("frontend failed" ,test_frontend () ==0 );return 0 ; }
Signature · 1 line
2.25.4
Jiri Olsa
reviewerPATCH v2 12/13 perf tests: Add parse metric test for ipc metric
In reply to Jiri OlsaAdding new test that process metrics code and checks the expected results. Starting with easy ipc metric.
--- tools/perf/tests/Build | 1 + tools/perf/tests/builtin-test.c | 4 + tools/perf/tests/parse-metric.c | 145 ++++++++++++++++++++++++++++++++ tools/perf/tests/tests.h | 1 + 4 files changed, 151 insertions(+) create mode 100644 tools/perf/tests/parse-metric.c
tools/perf/tests/Build +1 -0
@@ -59,6 +59,7 @@ perf-y += genelf.o perf-y += api-io.o perf-y += demangle-java-test.o perf-y += pfm.o +perf-y += parse-metric.o $(OUTPUT)tests/llvm-src-base.c: tests/bpf-script-example.c tests/Build $(call rule_mkdir)
tools/perf/tests/builtin-test.c +4 -0
@@ -337,6 +337,10 @@ static struct test generic_tests[] = { .desc = "Demangle Java", .func = test__demangle_java, }, + { + .desc = "Parse and process metrics", + .func = test__parse_metric, + }, { .func = NULL, },
tools/perf/tests/parse-metric.c new file +145 -0
145 lines not on this page · raw message
tools/perf/tests/tests.h +1 -0
@@ -121,6 +121,7 @@ int test__demangle_java(struct test *test, int subtest);int test__pfm (struct test *test,int subtest);const char *test__pfm_subtest_get_desc (int subtest);int test__pfm_subtest_get_nr (void ); +int test__parse_metric (struct test *test,int subtest);bool test__bp_signal_is_supported (void );bool test__bp_account_is_supported (void );
Signature · 1 line
2.25.4
Jiri Olsa
reviewerPATCH v2 10/13 perf tools: Release metric_events rblist
In reply to Jiri OlsaWe don't release metric_events rblist, add the missing delete hook and call the release before leaving cmd_stat.
--- tools/perf/builtin-stat.c | 1 + tools/perf/util/metricgroup.c | 19 +++++++++++++++++++ tools/perf/util/metricgroup.h | 1 + 3 files changed, 21 insertions(+)
tools/perf/builtin-stat.c +1 -0
@@ -2252,6 +2252,7 @@ int cmd_stat(int argc, const char **argv)evlist__delete (evsel_list); +metricgroup__rblist_exit (&stat_config.metric_events);runtime_stat_delete (&stat_config);return status;
tools/perf/util/metricgroup.c +19 -0
@@ -76,11 +76,30 @@ static struct rb_node *metric_event_new(struct rblist *rblist __maybe_unused,return &me->nd; } +static void metric_event_delete (struct rblist *rblist__maybe_unused , +struct rb_node *rb_node) +{ + struct metric_event *me = container_of(rb_node, struct metric_event, nd); +struct metric_expr *expr, *tmp; + +list_for_each_entry_safe (expr, tmp, &me->head, nd) { +free (expr); + } + +free (me); +} +static void metricgroup__rblist_init (struct rblist *metric_events) {rblist__init (metric_events); metric_events->node_cmp = metric_event_cmp; metric_events->node_new = metric_event_new; + metric_events->node_delete = metric_event_delete; +} + +void metricgroup__rblist_exit (struct rblist *metric_events) +{ +rblist__exit (metric_events); }struct egroup {
tools/perf/util/metricgroup.h +1 -0
@@ -47,4 +47,5 @@ void metricgroup__print(bool metrics, bool groups, char *filter, bool raw, bool details);bool metricgroup__has_metric (const char *metric);int arch_get_runtimeparam (void ); +void metricgroup__rblist_exit (struct rblist *metric_events);#endif
Signature · 1 line
2.25.4
Jiri Olsa
reviewerPATCH v2 5/13 perf tools: Factor out parse_groups function
In reply to Jiri OlsaFactor out the parse_groups function, it will be used for new test interface coming in following changes.
--- tools/perf/util/metricgroup.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
tools/perf/util/metricgroup.c +16 -6
@@ -709,14 +709,12 @@ static void metricgroup__free_egroups(struct list_head *group_list) } } -int metricgroup__parse_groups (const struct option *opt, -const char *str, -bool metric_no_group, -bool metric_no_merge, -struct rblist *metric_events) +static int parse_groups (struct evlist *perf_evlist,const char *str, +bool metric_no_group, +bool metric_no_merge, +struct rblist *metric_events) {struct parse_events_error parse_error; -struct evlist *perf_evlist = *(struct evlist **)opt->value;struct strbuf extra_events;LIST_HEAD (group_list);int ret;
@@ -742,6 +740,18 @@ int metricgroup__parse_groups(const struct option *opt,return ret; } +int metricgroup__parse_groups (const struct option *opt, +const char *str, +bool metric_no_group, +bool metric_no_merge, +struct rblist *metric_events) +{ +struct evlist *perf_evlist = *(struct evlist **)opt->value; + +return parse_groups (perf_evlist, str, metric_no_group, + metric_no_merge, metric_events); +} +bool metricgroup__has_metric (const char *metric) {struct pmu_events_map *map =perf_pmu__find_map (NULL );
Signature · 1 line
2.25.4
Jiri Olsa
reviewerPATCH v2 9/13 perf tools: Factor out prepare_metric function
In reply to Jiri OlsaFactoring out prepare_metric functio so it can
be used in test interface coming in following
changes.
--- tools/perf/util/stat-shadow.c | 53 ++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 19 deletions(-)
tools/perf/util/stat-shadow.c +34 -19
@@ -730,25 +730,16 @@ static void print_smi_cost(struct perf_stat_config *config, out->print_metric (config, out->ctx,NULL ,"%4.0f" ,"SMI#" , smi_num); } -static void generic_metric (struct perf_stat_config *config, -const char *metric_expr, -struct evsel **metric_events, -char *name, -const char *metric_name, -const char *metric_unit, -int runtime, -int cpu, -struct perf_stat_output_ctx *out, -struct runtime_stat *st) +static int prepare_metric (struct evsel **metric_events, +struct expr_parse_ctx *pctx, +int cpu, +struct runtime_stat *st) { -print_metric_t print_metric = out->print_metric; -struct expr_parse_ctx pctx; -double ratio, scale; -int i; -void *ctxp = out->ctx; +double scale;char *n, *pn; +int i; -expr__ctx_init (&pctx); +expr__ctx_init (pctx);for (i =0 ; metric_events[i]; i++) {struct saved_value *v;struct stats *stats;
@@ -771,7 +762,7 @@ static void generic_metric(struct perf_stat_config *config, n =strdup (metric_events[i]->name);if (!n) -return ; +return -ENOMEM ;/* * This display code with --no-merge adds [cpu] postfixes. * These are not supported by the parser. Remove everything
@@ -782,11 +773,35 @@ static void generic_metric(struct perf_stat_config *config, *pn =0 ;if (metric_total) -expr__add_id (&pctx, n, metric_total); +expr__add_id (pctx, n, metric_total);else -expr__add_id (&pctx, n,avg_stats (stats)*scale); +expr__add_id (pctx, n,avg_stats (stats)*scale); } +return i; +} + +static void generic_metric (struct perf_stat_config *config, +const char *metric_expr, +struct evsel **metric_events, +char *name, +const char *metric_name, +const char *metric_unit, +int runtime, +int cpu, +struct perf_stat_output_ctx *out, +struct runtime_stat *st) +{ +print_metric_t print_metric = out->print_metric; +struct expr_parse_ctx pctx; +double ratio, scale; +int i; +void *ctxp = out->ctx; + + i =prepare_metric (metric_events, &pctx, cpu, st); +if (i <0 ) +return ; +if (!metric_events[i]) {if (expr__parse (&ratio, &pctx, metric_expr, runtime) ==0 ) {char *unit;
Signature · 1 line
2.25.4
Ian Rogers
reviewerRe: [PATCH 04/13] perf tests: Add another metric parsing test
In reply to Jiri OlsaQuoted 18 lines · Jiri Olsa
The test goes through all metrics compiled for arch within pmu events and try to parse them.
This test is different from '
test_parsing' in that we go through all the events in the current arch, not just one defined for current CPU model. Using 'fake_pmu' to parse events which do not have PMUs defined in the system.Say there's bad change in ivybridge metrics file, like:
---
a/tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json+++b/tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json@@ -8,7 +8,7 @@
- "MetricExpr": "IDQ_UOPS_NOT_DELIVERED.CORE / (4 * ((
+ "MetricExpr": "IDQ_UOPS_NOT_DELIVERED.CORE / / (4 *
Quoted 8 lines
the test fails with (on my kabylake laptop):
$ perf test 'Parsing of PMU event table metrics with fake PMUs' -v parsing 'idq_uops_not_delivered.core / / (4 * (( ( cpu_clk_unh... syntax error, line 1 expr__parse failed test child finished with -1 ...
For this example as the problem is the expression, presumably this was "passing" with test_parsing due to returning TEST_SKIP? I did this initially so that we could get the test merged and then the metrics fixed. I'd prefer if test_parsing were returning TEST_FAIL.
Quoted 41 lines
The test also defines its own list of metrics and tries to parse them. It's handy for developing.
Signed-off-by Jiri Olsa <[email protected]>--- tools/perf/tests/pmu-events.c | 117 +++++++++++++++++++++++++++++++++- 1 file changed, 114 insertions(+), 3 deletions(-)tools/perf/tests/pmu-events.c +4
-3@@ -390,7 +390,8 @@ static bool is_number(const char *str)return errno ==0 && end_ptr != str; } -static int check_parse_id (const char *id,struct parse_events_error *error) +static int check_parse_id (const char *id,struct parse_events_error *error, +bool fake_pmu) {struct evlist *evlist;int ret;@@ -403,7 +404,7 @@ static int check_parse_id(const char *id, struct parse_events_error *error)if (!evlist)return -ENOMEM ;memset (error,0 ,sizeof (*error)); - ret =parse_events (evlist, id, error, false); + ret =parse_events (evlist, id, error, fake_pmu);evlist__delete (evlist);return ret; }@@ -412,7 +413,7 @@ static int check_parse_cpu(const char *id, bool same_cpu, struct pmu_event *pe) {struct parse_events_error error; -int ret =check_parse_id (id, &error); +int ret =check_parse_id (id, &error, false);if (ret && same_cpu) {pr_warning ("Parse event failed metric '%s' id '%s' expr '%s'\n" , pe->metric_name, id, pe->metric_expr);
tools/perf/tests/pmu-events.c static int check_parse_cpu(const char *id, bool same_cpu, struct pmu_event *pe) · line 436
Quoted 6 lines
tools/perf/tests/pmu-events.c +3
-0@@ -430,6 +431,18 @@ static int check_parse_cpu(const char *id, bool same_cpu, struct pmu_event *pe)return ret; } +static int check_parse_fake (const char *id) +{ +struct parse_events_error error;
nit: this reads funny as it isn't clear, without looking at check_parse_id, that error is zero initialized.
Thanks,
Ian
Quoted 127 lines
tools/perf/tests/pmu-events.c +107
-1+int ret =check_parse_id (id, &error, true); + +free (error.str); +free (error.help); +free (error.first_str); +free (error.first_help); +return ret; +} +static void expr_failure (const char *msg,const struct pmu_events_map *map,const struct pmu_event *pe)@@ -499,6 +512,100 @@ static int test_parsing(void)return ret ==0 ?TEST_OK :TEST_SKIP ; } +struct test_metric { +const char *str; +}; + +static struct test_metric metrics[] = { + {"(unc_p_power_state_occupancy.cores_c0 / unc_p_clockticks) * 100." }, + {"imx8_ddr0@read\\-cycles@ * 4 * 4" , }, + {"imx8_ddr0@axid\\-read\\,axi_mask\\=0xffff\\,axi_id\\=0x0000@ * 4" , }, + {"(cstate_pkg@c2\\-residency@ / msr@tsc@) * 100" , }, + {"(imx8_ddr0@read\\-cycles@ + imx8_ddr0@write\\-cycles@)" , }, +}; + +static int metric_parse_fake (const char *str) +{ +struct expr_parse_ctx ctx; +struct hashmap_entry *cur; +double result; +int ret =-1 ; +size_t bkt; +int i; + +pr_debug ("parsing '%s'\n" , str); + +expr__ctx_init (&ctx); +if (expr__find_other (str,NULL , &ctx,0 ) <0 ) { +pr_err ("expr__find_other failed\n" ); +return -1 ; + } + +/* +* Add all ids with a made up value. The value may +* trigger divide by zero when subtracted and so try to +* make them unique. +*/ + i =1 ; +hashmap__for_each_entry ((&ctx.ids), cur, bkt) +expr__add_id (&ctx,strdup (cur->key), i++); + +hashmap__for_each_entry ((&ctx.ids), cur, bkt) { +if (check_parse_fake (cur->key)) { +pr_err ("check_parse_fake failed\n" ); + goto out; + } + } + +if (expr__parse (&result, &ctx, str,1 )) +pr_err ("expr__parse failed\n" ); +else + ret =0 ; + +out: +expr__ctx_clear (&ctx); +return ret; +} + +/* +* Parse all the metrics for current architecture, +* or all defined cpus via the 'fake_pmu' bool +* in parse_events. +*/ +static int test_parsing_fake (void ) +{ +struct pmu_events_map *map; +struct pmu_event *pe; +unsigned int i, j; +int err =0 ; + +for (i =0 ; i <ARRAY_SIZE (metrics); i++) { + err =metric_parse_fake (metrics[i].str); +if (err) +return err; + } + + i =0 ; +for (;;) { + map = &pmu_events_map[i++]; +if (!map->table) +break ; + j =0 ; +for (;;) { + pe = &map->table[j++]; +if (!pe->name && !pe->metric_group && !pe->metric_name) +break ; +if (!pe->metric_expr) +continue ; + err =metric_parse_fake (pe->metric_expr); +if (err) +return err; + } + } + +return 0 ; +} + static const struct { int (*func)(void); const char *desc;@@ -515,6 +622,10 @@ static const struct { .func = test_parsing, .desc = "Parsing of PMU event table metrics", }, + { + .func = test_parsing_fake, + .desc = "Parsing of PMU event table metrics with fake PMUs", + }, };const char *test__pmu_events_subtest_get_desc (int subtest) --2.25.4
Quoted 71 lines · Jiri Olsa
hi,
changes for using metric result in another metric seem to change lot of core metric code, so it's better we have some more tests before we do that.v2 changes:
- some of the patches got accepted
- add missing free to patch 1 [Ian]
- factor pmu-events test functions and reuse it in the new test [Ian]
- addfake_pmubool toparse_eventsinterface [Ian]
- simplify metric tests
- use proper cover letter subject ;-)I actually reworked the 2 patches Ian acked so far, so I did not add them.
Also available in here:
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
perf/metric_testthanks,
jirka---
Jiri Olsa (13):
perf tools: Add fake pmu support
perf tools: Addfake_pmubool toparse_eventsinterface perf tests: Factorcheck_parse_idfunction perf tests: Add another metric parsing test perf tools: Factor outparse_groupsfunction perf tools: Addfake_pmutoparse_eventsfunction perf tools: Add map toparse_eventsfunction perf tools: Addmetricgroup__parse_groups_testfunction perf tools: Factor outprepare_metricfunction perf tools: Releasemetric_eventsrblist
perf tools: Addtest_generic_metricfunction perf tests: Add parse metric test for ipc metric perf tests: Add parse metric test for frontend metrictools/perf/arch/arm/util/cs-etm.c | 2 +- tools/perf/arch/arm64/util/arm-spe.c | 2 +- tools/perf/arch/powerpc/util/kvm-stat.c | 2 +- tools/perf/arch/x86/tests/intel-cqm.c | 2 +- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 2 +- tools/perf/arch/x86/util/intel-bts.c | 2 +- tools/perf/arch/x86/util/intel-pt.c | 6 ++-- tools/perf/builtin-stat.c | 9 +++--- tools/perf/builtin-trace.c | 4 +-- tools/perf/tests/Build | 1 + tools/perf/tests/backward-ring-buffer.c | 3 +- tools/perf/tests/builtin-test.c | 4 +++ tools/perf/tests/code-reading.c | 2 +- tools/perf/tests/event-times.c | 2 +- tools/perf/tests/evsel-roundtrip-name.c | 4 +-- tools/perf/tests/hists_cumulate.c | 2 +- tools/perf/tests/hists_filter.c | 4 +-- tools/perf/tests/hists_link.c | 4 +-- tools/perf/tests/hists_output.c | 2 +- tools/perf/tests/keep-tracking.c | 4 +-- tools/perf/tests/parse-events.c | 2 +- tools/perf/tests/parse-metric.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/perf/tests/pmu-events.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- tools/perf/tests/switch-tracking.c | 8 ++--- tools/perf/tests/tests.h | 1 + tools/perf/util/bpf-loader.c | 2 +- tools/perf/util/metricgroup.c | 74 ++++++++++++++++++++++++++++++++++++---------- tools/perf/util/metricgroup.h | 10 +++++++ tools/perf/util/parse-events.c | 29 +++++++++++------- tools/perf/util/parse-events.h | 5 ++--
Quoted 9 lines
tools/perf/util/parse-events.l | 8 +++-- tools/perf/util/parse-events.y | 41 ++++++++++++++++++++++++-- tools/perf/util/perf_api_probe.c | 2 +- tools/perf/util/record.c | 2 +- tools/perf/util/stat-shadow.c | 67 ++++++++++++++++++++++++++++++------------ tools/perf/util/stat.h | 3 ++ 36 files changed, 527 insertions(+), 92 deletions(-) create mode 100644 tools/perf/tests/parse-metric.c
Re: [PATCH 04/13] perf tests: Add another metric parsing test
In reply to Ian RogersQuoted 28 lines · Ian Rogers
Quoted 18 lines · Jiri Olsa
The test goes through all metrics compiled for arch within pmu events and try to parse them.
This test is different from '
test_parsing' in that we go through all the events in the current arch, not just one defined for current CPU model. Using 'fake_pmu' to parse events which do not have PMUs defined in the system.Say there's bad change in ivybridge metrics file, like:
---
a/tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json+++b/tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json@@ -8,7 +8,7 @@
- "MetricExpr": "IDQ_UOPS_NOT_DELIVERED.CORE / (4 * ((
+ "MetricExpr": "IDQ_UOPS_NOT_DELIVERED.CORE / / (4 *Quoted 8 lines
the test fails with (on my kabylake laptop):
$ perf test 'Parsing of PMU event table metrics with fake PMUs' -v parsing 'idq_uops_not_delivered.core / / (4 * (( ( cpu_clk_unh... syntax error, line 1 expr__parse failed test child finished with -1 ...
Quoted 4 lines
For this example as the problem is the expression, presumably this was "passing" with
test_parsingdue to returningTEST_SKIP? I did this initially so that we could get the test merged and then the metrics fixed. I'd prefer iftest_parsingwere returningTEST_FAIL.
it will fail:
[jolsa@krava perf]$ git diff
diff --git a/tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json b/tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json index 28e25447d3ef..0cad6b709f96 100644
--- a/tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json
+++ b/tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json
@@ -1,7 +1,7 @@
[
{
"BriefDescription": "This category represents fraction of slots where the processor's Frontend undersupplies its Backend",
- "MetricExpr": "IDQ_UOPS_NOT_DELIVERED.CORE / (4 * cycles)",
+ "MetricExpr": "IDQ_UOPS_NOT_DELIVERED.CORE / / (4 * cycles)",
"MetricGroup": "TopdownL1",
"MetricName": "Frontend_Bound",
[jolsa@krava perf]$ ./perf test 'Parsing of PMU event table metrics with fake PMUs'
10: PMU events :
10.4: Parsing of PMU event table metrics with fake PMUs : FAILED!
because the metric is malformed
jirka
Re: [PATCH 04/13] perf tests: Add another metric parsing test
In reply to Ian RogersOn Tue, Jun 02, 2020 at 10:58:32AM -0700, Ian Rogers wrote:
SNIP
Quoted 6 lines
Review
Quoted 3 lines
(quoted diff) +3
-0+static int check_parse_fake(const char *id) +{ + struct parse_events_error error;nit: this reads funny as it isn't clear, without looking at
check_parse_id, that error is zero initialized.
right, how about something like below?
thanks,
jirka
---
tools/perf/tests/pmu-events.c +2 -3
@@ -403,7 +403,6 @@ static int check_parse_id(const char *id, struct parse_events_error *error, evlist =evlist__new ();if (!evlist)return -ENOMEM ; -memset (error,0 ,sizeof (*error)); ret =parse_events (evlist, id, error, fake_pmu);evlist__delete (evlist);return ret;
@@ -411,7 +410,7 @@ static int check_parse_id(const char *id, struct parse_events_error *error,static int check_parse_cpu (const char *id,bool same_cpu,struct pmu_event *pe) { -struct parse_events_error error; +struct parse_events_error error = {0 };int ret =check_parse_id (id, &error, false);if (ret && same_cpu) {
@@ -433,7 +432,7 @@ static int check_parse_cpu(const char *id, bool same_cpu, struct pmu_event *pe)static int check_parse_fake (const char *id) { -struct parse_events_error error; +struct parse_events_error error = {0 };int ret =check_parse_id (id, &error, true);free (error.str);
Ian Rogers
reviewerRe: [PATCH 04/13] perf tests: Add another metric parsing test
Quoted 5 lines · Jiri Olsa
On Tue, Jun 02, 2020 at 10:58:32AM -0700, Ian Rogers wrote:
SNIP
Quoted 8 lines
Quoted 6 lines
Review
Quoted 3 lines
(quoted diff) +3
-0+static int check_parse_fake(const char *id) +{ + struct parse_events_error error;nit: this reads funny as it isn't clear, without looking at
check_parse_id, that error is zero initialized.right, how about something like below?
Thanks, looks good!
Ian
Quoted 36 lines
thanks,
jirka---
tools/perf/tests/pmu-events.c +2
-3@@ -403,7 +403,6 @@ static int check_parse_id(const char *id, struct parse_events_error *error, evlist =evlist__new ();if (!evlist)return -ENOMEM ; -memset (error,0 ,sizeof (*error)); ret =parse_events (evlist, id, error, fake_pmu);evlist__delete (evlist);return ret;@@ -411,7 +410,7 @@ static int check_parse_id(const char *id, struct parse_events_error *error,static int check_parse_cpu (const char *id,bool same_cpu,struct pmu_event *pe) { -struct parse_events_error error; +struct parse_events_error error = {0 };int ret =check_parse_id (id, &error, false);if (ret && same_cpu) {@@ -433,7 +432,7 @@ static int check_parse_cpu(const char *id, bool same_cpu, struct pmu_event *pe)static int check_parse_fake (const char *id) { -struct parse_events_error error; +struct parse_events_error error = {0 };int ret =check_parse_id (id, &error, true);free (error.str);