On Fri, Jun 26, 2020 at 02:40:34PM -0700, Ian Rogers wrote: > On Fri, Jun 26, 2020 at 12:48 PM Jiri Olsa <[email protected]> wrote: > > > > Adding test that compute metric with other metrics in it. > > > > cache_miss_cycles = metric:dcache_miss_cpi + metric:icache_miss_cycles > > > > This is really nice! Do we need to do anything in tests/pmu-events.c? > Presumably if a metric is referencing another metric the call to > expr__parse there will test the other metric is parseable. Just wanted > to sanity check.
right, I did not realize that, but that test is passing for me, so I guess it's fine.. I'll double check thanks, jirka > > Acked-by: Ian Rogers <[email protected]> > > > Signed-off-by: Jiri Olsa <[email protected]> > > --- > > tools/perf/tests/parse-metric.c | 33 +++++++++++++++++++++++++++++++++ > > 1 file changed, 33 insertions(+) > > > > diff --git a/tools/perf/tests/parse-metric.c > > b/tools/perf/tests/parse-metric.c > > index 8c48251425e1..feb97f7c90c8 100644 > > --- a/tools/perf/tests/parse-metric.c > > +++ b/tools/perf/tests/parse-metric.c > > @@ -11,6 +11,8 @@ > > #include "debug.h" > > #include "expr.h" > > #include "stat.h" > > +#include <perf/cpumap.h> > > +#include <perf/evlist.h> > > > > static struct pmu_event pme_test[] = { > > { > > @@ -22,6 +24,18 @@ static struct pmu_event pme_test[] = { > > "( 1 + cpu_clk_unhalted.one_thread_active / > > cpu_clk_unhalted.ref_xclk ) )))", > > .metric_name = "Frontend_Bound_SMT", > > }, > > +{ > > + .metric_expr = "l1d\\-loads\\-misses / inst_retired.any", > > + .metric_name = "dcache_miss_cpi", > > +}, > > +{ > > + .metric_expr = "l1i\\-loads\\-misses / inst_retired.any", > > + .metric_name = "icache_miss_cycles", > > +}, > > +{ > > + .metric_expr = "(metric:dcache_miss_cpi + > > metric:icache_miss_cycles)", > > + .metric_name = "cache_miss_cycles", > > +}, > > }; > > > > static struct pmu_events_map map = { > > @@ -162,9 +176,28 @@ static int test_frontend(void) > > return 0; > > } > > > > +static int test_cache_miss_cycles(void) > > +{ > > + double ratio; > > + struct value vals[] = { > > + { .event = "l1d-loads-misses", .val = 300 }, > > + { .event = "l1i-loads-misses", .val = 200 }, > > + { .event = "inst_retired.any", .val = 400 }, > > + { 0 }, > > + }; > > + > > + TEST_ASSERT_VAL("failed to compute metric", > > + compute_metric("cache_miss_cycles", vals, &ratio) > > == 0); > > + > > + TEST_ASSERT_VAL("cache_miss_cycles failed, wrong ratio", > > + ratio == 1.25); > > + 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); > > + TEST_ASSERT_VAL("cache_miss_cycles failed", > > test_cache_miss_cycles() == 0); > > return 0; > > } > > -- > > 2.25.4 > > >
