| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20200728123704.GX40195@kernel.org>
Date: Tue, 28 Jul 2020 09:37:04 -0300
From: Arnaldo Carvalho de Melo <acme@...nel.org>
To: Ian Rogers <irogers@...gle.com>
Cc: Jiri Olsa <jolsa@...nel.org>, lkml <linux-kernel@...r.kernel.org>,
Ingo Molnar <mingo@...nel.org>,
Namhyung Kim <namhyung@...nel.org>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
Peter Zijlstra <a.p.zijlstra@...llo.nl>,
Michael Petlan <mpetlan@...hat.com>,
Andi Kleen <ak@...ux.intel.com>,
Kajol Jain <kjain@...ux.ibm.com>,
John Garry <john.garry@...wei.com>,
"Paul A. Clarke" <pc@...ibm.com>,
Stephane Eranian <eranian@...gle.com>
Subject: Re: [PATCH 17/19] perf metric: Add metric group test
Em Sun, Jul 19, 2020 at 03:41:14PM -0700, Ian Rogers escreveu:
> On Sun, Jul 19, 2020 at 11:14 AM Jiri Olsa <jolsa@...nel.org> wrote:
> >
> > Adding test for metric group plus compute_metric_group
> > function to get metrics values within the group.
> >
> > Signed-off-by: Jiri Olsa <jolsa@...nel.org>
>
> Acked-by: Ian Rogers <irogers@...gle.com>
Thanks, applied.
- Arnaldo
> Thanks,
> Ian
>
> > ---
> > tools/perf/tests/parse-metric.c | 48 +++++++++++++++++++++++++++++++--
> > 1 file changed, 46 insertions(+), 2 deletions(-)
> >
> > diff --git a/tools/perf/tests/parse-metric.c b/tools/perf/tests/parse-metric.c
> > index 5ac32f80f8ea..f2ba5b2c5557 100644
> > --- a/tools/perf/tests/parse-metric.c
> > +++ b/tools/perf/tests/parse-metric.c
> > @@ -18,6 +18,7 @@ static struct pmu_event pme_test[] = {
> > {
> > .metric_expr = "inst_retired.any / cpu_clk_unhalted.thread",
> > .metric_name = "IPC",
> > + .metric_group = "group1",
> > },
> > {
> > .metric_expr = "idq_uops_not_delivered.core / (4 * (( ( cpu_clk_unhalted.thread / 2 ) * "
> > @@ -35,6 +36,7 @@ static struct pmu_event pme_test[] = {
> > {
> > .metric_expr = "(dcache_miss_cpi + icache_miss_cycles)",
> > .metric_name = "cache_miss_cycles",
> > + .metric_group = "group1",
> > },
> > {
> > .metric_expr = "l2_rqsts.demand_data_rd_hit + l2_rqsts.pf_hit + l2_rqsts.rfo_hit",
> > @@ -127,7 +129,9 @@ static double compute_single(struct rblist *metric_events, struct evlist *evlist
> > return 0.;
> > }
> >
> > -static int compute_metric(const char *name, struct value *vals, double *ratio)
> > +static int __compute_metric(const char *name, struct value *vals,
> > + const char *name1, double *ratio1,
> > + const char *name2, double *ratio2)
> > {
> > struct rblist metric_events = {
> > .nr_entries = 0,
> > @@ -166,7 +170,10 @@ static int compute_metric(const char *name, struct value *vals, double *ratio)
> > load_runtime_stat(&st, evlist, vals);
> >
> > /* And execute the metric */
> > - *ratio = compute_single(&metric_events, evlist, &st, name);
> > + if (name1 && ratio1)
> > + *ratio1 = compute_single(&metric_events, evlist, &st, name1);
> > + if (name2 && ratio2)
> > + *ratio2 = compute_single(&metric_events, evlist, &st, name2);
> >
> > /* ... clenup. */
> > metricgroup__rblist_exit(&metric_events);
> > @@ -177,6 +184,18 @@ static int compute_metric(const char *name, struct value *vals, double *ratio)
> > return 0;
> > }
> >
> > +static int compute_metric(const char *name, struct value *vals, double *ratio)
> > +{
> > + return __compute_metric(name, vals, name, ratio, NULL, NULL);
> > +}
> > +
> > +static int compute_metric_group(const char *name, struct value *vals,
> > + const char *name1, double *ratio1,
> > + const char *name2, double *ratio2)
> > +{
> > + return __compute_metric(name, vals, name1, ratio1, name2, ratio2);
> > +}
> > +
> > static int test_ipc(void)
> > {
> > double ratio;
> > @@ -297,6 +316,30 @@ static int test_recursion_fail(void)
> > return 0;
> > }
> >
> > +static int test_metric_group(void)
> > +{
> > + double ratio1, ratio2;
> > + struct value vals[] = {
> > + { .event = "cpu_clk_unhalted.thread", .val = 200 },
> > + { .event = "l1d-loads-misses", .val = 300 },
> > + { .event = "l1i-loads-misses", .val = 200 },
> > + { .event = "inst_retired.any", .val = 400 },
> > + { 0 },
> > + };
> > +
> > + TEST_ASSERT_VAL("failed to find recursion",
> > + compute_metric_group("group1", vals,
> > + "IPC", &ratio1,
> > + "cache_miss_cycles", &ratio2) == 0);
> > +
> > + TEST_ASSERT_VAL("group IPC failed, wrong ratio",
> > + ratio1 == 2.0);
> > +
> > + TEST_ASSERT_VAL("group cache_miss_cycles failed, wrong ratio",
> > + ratio2 == 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);
> > @@ -304,5 +347,6 @@ int test__parse_metric(struct test *test __maybe_unused, int subtest __maybe_unu
> > TEST_ASSERT_VAL("cache_miss_cycles failed", test_cache_miss_cycles() == 0);
> > TEST_ASSERT_VAL("DCache_L2 failed", test_dcache_l2() == 0);
> > TEST_ASSERT_VAL("recursion fail failed", test_recursion_fail() == 0);
> > + TEST_ASSERT_VAL("test metric group", test_metric_group() == 0);
> > return 0;
> > }
> > --
> > 2.25.4
> >
--
- Arnaldo
Powered by blists - more mailing lists