[PATCH 14/19] perf metric: Add DCache_L2 to metric parse test

2020-07-29 Thread Jiri Olsa 
Adding test that compute DCache_L2 metrics with other related metrics in it.

Signed-off-by: Jiri Olsa 
Reviewed-by: Kajol Jain 
Acked-by: Ian Rogers 
Cc: Alexander Shishkin 
Cc: Andi Kleen 
Cc: John Garry 
Cc: Michael Petlan 
Cc: Namhyung Kim 
Cc: Paul Clarke 
Cc: Peter Zijlstra 
Cc: Stephane Eranian 
Link: http://lore.kernel.org/lkml/20200719181320.785305-15-jo...@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo 
---
 tools/perf/tests/parse-metric.c | 71 +
 1 file changed, 71 insertions(+)

diff --git a/tools/perf/tests/parse-metric.c b/tools/perf/tests/parse-metric.c
index 28f33893338b..aa4d5a9f09a8 100644
--- a/tools/perf/tests/parse-metric.c
+++ b/tools/perf/tests/parse-metric.c
@@ -36,6 +36,27 @@ static struct pmu_event pme_test[] = {
.metric_expr= "(dcache_miss_cpi + icache_miss_cycles)",
.metric_name= "cache_miss_cycles",
 },
+{
+   .metric_expr= "l2_rqsts.demand_data_rd_hit + l2_rqsts.pf_hit + 
l2_rqsts.rfo_hit",
+   .metric_name= "DCache_L2_All_Hits",
+},
+{
+   .metric_expr= "max(l2_rqsts.all_demand_data_rd - 
l2_rqsts.demand_data_rd_hit, 0) + "
+ "l2_rqsts.pf_miss + l2_rqsts.rfo_miss",
+   .metric_name= "DCache_L2_All_Miss",
+},
+{
+   .metric_expr= "dcache_l2_all_hits + dcache_l2_all_miss",
+   .metric_name= "DCache_L2_All",
+},
+{
+   .metric_expr= "d_ratio(dcache_l2_all_hits, dcache_l2_all)",
+   .metric_name= "DCache_L2_Hits",
+},
+{
+   .metric_expr= "d_ratio(dcache_l2_all_miss, dcache_l2_all)",
+   .metric_name= "DCache_L2_Misses",
+},
 };
 
 static struct pmu_events_map map = {
@@ -194,10 +215,60 @@ static int test_cache_miss_cycles(void)
return 0;
 }
 
+
+/*
+ * DCache_L2_All_Hits = l2_rqsts.demand_data_rd_hit + l2_rqsts.pf_hit + 
l2_rqsts.rfo_hi
+ * DCache_L2_All_Miss = max(l2_rqsts.all_demand_data_rd - 
l2_rqsts.demand_data_rd_hit, 0) +
+ *  l2_rqsts.pf_miss + l2_rqsts.rfo_miss
+ * DCache_L2_All  = dcache_l2_all_hits + dcache_l2_all_miss
+ * DCache_L2_Hits = d_ratio(dcache_l2_all_hits, dcache_l2_all)
+ * DCache_L2_Misses   = d_ratio(dcache_l2_all_miss, dcache_l2_all)
+ *
+ * l2_rqsts.demand_data_rd_hit = 100
+ * l2_rqsts.pf_hit = 200
+ * l2_rqsts.rfo_hi = 300
+ * l2_rqsts.all_demand_data_rd = 400
+ * l2_rqsts.pf_miss= 500
+ * l2_rqsts.rfo_miss   = 600
+ *
+ * DCache_L2_All_Hits = 600
+ * DCache_L2_All_Miss = MAX(400 - 100, 0) + 500 + 600 = 1400
+ * DCache_L2_All  = 600 + 1400  = 2000
+ * DCache_L2_Hits = 600 / 2000  = 0.3
+ * DCache_L2_Misses   = 1400 / 2000 = 0.7
+ */
+static int test_dcache_l2(void)
+{
+   double ratio;
+   struct value vals[] = {
+   { .event = "l2_rqsts.demand_data_rd_hit", .val = 100 },
+   { .event = "l2_rqsts.pf_hit", .val = 200 },
+   { .event = "l2_rqsts.rfo_hit",.val = 300 },
+   { .event = "l2_rqsts.all_demand_data_rd", .val = 400 },
+   { .event = "l2_rqsts.pf_miss",.val = 500 },
+   { .event = "l2_rqsts.rfo_miss",   .val = 600 },
+   { 0 },
+   };
+
+   TEST_ASSERT_VAL("failed to compute metric",
+   compute_metric("DCache_L2_Hits", vals, ) == 0);
+
+   TEST_ASSERT_VAL("DCache_L2_Hits failed, wrong ratio",
+   ratio == 0.3);
+
+   TEST_ASSERT_VAL("failed to compute metric",
+   compute_metric("DCache_L2_Misses", vals, ) == 0);
+
+   TEST_ASSERT_VAL("DCache_L2_Misses failed, wrong ratio",
+   ratio == 0.7);
+   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);
+   TEST_ASSERT_VAL("DCache_L2 failed", test_dcache_l2() == 0);
return 0;
 }
-- 
2.25.4

Re: [PATCH 14/19] perf metric: Add DCache_L2 to metric parse test

2020-07-28 Thread Arnaldo Carvalho de Melo 
Em Sun, Jul 26, 2020 at 02:49:46PM +0530, kajoljain escreveu:
> On 7/19/20 11:43 PM, Jiri Olsa wrote:
> > Adding test that compute DCache_L2 metrics with other related metrics in it.
> > 
> > Acked-by: Ian Rogers 
> > Signed-off-by: Jiri Olsa 
> 
> Reviewed-By : Kajol Jain

Thanks, applied.

- Arnaldo
 
> Thanks,
> Kajol Jain
> > ---
> >  tools/perf/tests/parse-metric.c | 71 +
> >  1 file changed, 71 insertions(+)
> > 
> > diff --git a/tools/perf/tests/parse-metric.c 
> > b/tools/perf/tests/parse-metric.c
> > index 28f33893338b..aa4d5a9f09a8 100644
> > --- a/tools/perf/tests/parse-metric.c
> > +++ b/tools/perf/tests/parse-metric.c
> > @@ -36,6 +36,27 @@ static struct pmu_event pme_test[] = {
> > .metric_expr= "(dcache_miss_cpi + icache_miss_cycles)",
> > .metric_name= "cache_miss_cycles",
> >  },
> > +{
> > +   .metric_expr= "l2_rqsts.demand_data_rd_hit + l2_rqsts.pf_hit + 
> > l2_rqsts.rfo_hit",
> > +   .metric_name= "DCache_L2_All_Hits",
> > +},
> > +{
> > +   .metric_expr= "max(l2_rqsts.all_demand_data_rd - 
> > l2_rqsts.demand_data_rd_hit, 0) + "
> > + "l2_rqsts.pf_miss + l2_rqsts.rfo_miss",
> > +   .metric_name= "DCache_L2_All_Miss",
> > +},
> > +{
> > +   .metric_expr= "dcache_l2_all_hits + dcache_l2_all_miss",
> > +   .metric_name= "DCache_L2_All",
> > +},
> > +{
> > +   .metric_expr= "d_ratio(dcache_l2_all_hits, dcache_l2_all)",
> > +   .metric_name= "DCache_L2_Hits",
> > +},
> > +{
> > +   .metric_expr= "d_ratio(dcache_l2_all_miss, dcache_l2_all)",
> > +   .metric_name= "DCache_L2_Misses",
> > +},
> >  };
> >  
> >  static struct pmu_events_map map = {
> > @@ -194,10 +215,60 @@ static int test_cache_miss_cycles(void)
> > return 0;
> >  }
> >  
> > +
> > +/*
> > + * DCache_L2_All_Hits = l2_rqsts.demand_data_rd_hit + l2_rqsts.pf_hit + 
> > l2_rqsts.rfo_hi
> > + * DCache_L2_All_Miss = max(l2_rqsts.all_demand_data_rd - 
> > l2_rqsts.demand_data_rd_hit, 0) +
> > + *  l2_rqsts.pf_miss + l2_rqsts.rfo_miss
> > + * DCache_L2_All  = dcache_l2_all_hits + dcache_l2_all_miss
> > + * DCache_L2_Hits = d_ratio(dcache_l2_all_hits, dcache_l2_all)
> > + * DCache_L2_Misses   = d_ratio(dcache_l2_all_miss, dcache_l2_all)
> > + *
> > + * l2_rqsts.demand_data_rd_hit = 100
> > + * l2_rqsts.pf_hit = 200
> > + * l2_rqsts.rfo_hi = 300
> > + * l2_rqsts.all_demand_data_rd = 400
> > + * l2_rqsts.pf_miss= 500
> > + * l2_rqsts.rfo_miss   = 600
> > + *
> > + * DCache_L2_All_Hits = 600
> > + * DCache_L2_All_Miss = MAX(400 - 100, 0) + 500 + 600 = 1400
> > + * DCache_L2_All  = 600 + 1400  = 2000
> > + * DCache_L2_Hits = 600 / 2000  = 0.3
> > + * DCache_L2_Misses   = 1400 / 2000 = 0.7
> > + */
> > +static int test_dcache_l2(void)
> > +{
> > +   double ratio;
> > +   struct value vals[] = {
> > +   { .event = "l2_rqsts.demand_data_rd_hit", .val = 100 },
> > +   { .event = "l2_rqsts.pf_hit", .val = 200 },
> > +   { .event = "l2_rqsts.rfo_hit",.val = 300 },
> > +   { .event = "l2_rqsts.all_demand_data_rd", .val = 400 },
> > +   { .event = "l2_rqsts.pf_miss",.val = 500 },
> > +   { .event = "l2_rqsts.rfo_miss",   .val = 600 },
> > +   { 0 },
> > +   };
> > +
> > +   TEST_ASSERT_VAL("failed to compute metric",
> > +   compute_metric("DCache_L2_Hits", vals, ) == 0);
> > +
> > +   TEST_ASSERT_VAL("DCache_L2_Hits failed, wrong ratio",
> > +   ratio == 0.3);
> > +
> > +   TEST_ASSERT_VAL("failed to compute metric",
> > +   compute_metric("DCache_L2_Misses", vals, ) == 0);
> > +
> > +   TEST_ASSERT_VAL("DCache_L2_Misses failed, wrong ratio",
> > +   ratio == 0.7);
> > +   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);
> > +   TEST_ASSERT_VAL("DCache_L2 failed", test_dcache_l2() == 0);
> > return 0;
> >  }
> > 

-- 

- Arnaldo

Re: [PATCH 14/19] perf metric: Add DCache_L2 to metric parse test

2020-07-26 Thread kajoljain 



On 7/19/20 11:43 PM, Jiri Olsa wrote:
> Adding test that compute DCache_L2 metrics with other related metrics in it.
> 
> Acked-by: Ian Rogers 
> Signed-off-by: Jiri Olsa 

Reviewed-By : Kajol Jain

Thanks,
Kajol Jain
> ---
>  tools/perf/tests/parse-metric.c | 71 +
>  1 file changed, 71 insertions(+)
> 
> diff --git a/tools/perf/tests/parse-metric.c b/tools/perf/tests/parse-metric.c
> index 28f33893338b..aa4d5a9f09a8 100644
> --- a/tools/perf/tests/parse-metric.c
> +++ b/tools/perf/tests/parse-metric.c
> @@ -36,6 +36,27 @@ static struct pmu_event pme_test[] = {
>   .metric_expr= "(dcache_miss_cpi + icache_miss_cycles)",
>   .metric_name= "cache_miss_cycles",
>  },
> +{
> + .metric_expr= "l2_rqsts.demand_data_rd_hit + l2_rqsts.pf_hit + 
> l2_rqsts.rfo_hit",
> + .metric_name= "DCache_L2_All_Hits",
> +},
> +{
> + .metric_expr= "max(l2_rqsts.all_demand_data_rd - 
> l2_rqsts.demand_data_rd_hit, 0) + "
> +   "l2_rqsts.pf_miss + l2_rqsts.rfo_miss",
> + .metric_name= "DCache_L2_All_Miss",
> +},
> +{
> + .metric_expr= "dcache_l2_all_hits + dcache_l2_all_miss",
> + .metric_name= "DCache_L2_All",
> +},
> +{
> + .metric_expr= "d_ratio(dcache_l2_all_hits, dcache_l2_all)",
> + .metric_name= "DCache_L2_Hits",
> +},
> +{
> + .metric_expr= "d_ratio(dcache_l2_all_miss, dcache_l2_all)",
> + .metric_name= "DCache_L2_Misses",
> +},
>  };
>  
>  static struct pmu_events_map map = {
> @@ -194,10 +215,60 @@ static int test_cache_miss_cycles(void)
>   return 0;
>  }
>  
> +
> +/*
> + * DCache_L2_All_Hits = l2_rqsts.demand_data_rd_hit + l2_rqsts.pf_hit + 
> l2_rqsts.rfo_hi
> + * DCache_L2_All_Miss = max(l2_rqsts.all_demand_data_rd - 
> l2_rqsts.demand_data_rd_hit, 0) +
> + *  l2_rqsts.pf_miss + l2_rqsts.rfo_miss
> + * DCache_L2_All  = dcache_l2_all_hits + dcache_l2_all_miss
> + * DCache_L2_Hits = d_ratio(dcache_l2_all_hits, dcache_l2_all)
> + * DCache_L2_Misses   = d_ratio(dcache_l2_all_miss, dcache_l2_all)
> + *
> + * l2_rqsts.demand_data_rd_hit = 100
> + * l2_rqsts.pf_hit = 200
> + * l2_rqsts.rfo_hi = 300
> + * l2_rqsts.all_demand_data_rd = 400
> + * l2_rqsts.pf_miss= 500
> + * l2_rqsts.rfo_miss   = 600
> + *
> + * DCache_L2_All_Hits = 600
> + * DCache_L2_All_Miss = MAX(400 - 100, 0) + 500 + 600 = 1400
> + * DCache_L2_All  = 600 + 1400  = 2000
> + * DCache_L2_Hits = 600 / 2000  = 0.3
> + * DCache_L2_Misses   = 1400 / 2000 = 0.7
> + */
> +static int test_dcache_l2(void)
> +{
> + double ratio;
> + struct value vals[] = {
> + { .event = "l2_rqsts.demand_data_rd_hit", .val = 100 },
> + { .event = "l2_rqsts.pf_hit", .val = 200 },
> + { .event = "l2_rqsts.rfo_hit",.val = 300 },
> + { .event = "l2_rqsts.all_demand_data_rd", .val = 400 },
> + { .event = "l2_rqsts.pf_miss",.val = 500 },
> + { .event = "l2_rqsts.rfo_miss",   .val = 600 },
> + { 0 },
> + };
> +
> + TEST_ASSERT_VAL("failed to compute metric",
> + compute_metric("DCache_L2_Hits", vals, ) == 0);
> +
> + TEST_ASSERT_VAL("DCache_L2_Hits failed, wrong ratio",
> + ratio == 0.3);
> +
> + TEST_ASSERT_VAL("failed to compute metric",
> + compute_metric("DCache_L2_Misses", vals, ) == 0);
> +
> + TEST_ASSERT_VAL("DCache_L2_Misses failed, wrong ratio",
> + ratio == 0.7);
> + 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);
> + TEST_ASSERT_VAL("DCache_L2 failed", test_dcache_l2() == 0);
>   return 0;
>  }
>

[PATCH 14/19] perf metric: Add DCache_L2 to metric parse test

2020-07-19 Thread Jiri Olsa 
Adding test that compute DCache_L2 metrics with other related metrics in it.

Acked-by: Ian Rogers 
Signed-off-by: Jiri Olsa 
---
 tools/perf/tests/parse-metric.c | 71 +
 1 file changed, 71 insertions(+)

diff --git a/tools/perf/tests/parse-metric.c b/tools/perf/tests/parse-metric.c
index 28f33893338b..aa4d5a9f09a8 100644
--- a/tools/perf/tests/parse-metric.c
+++ b/tools/perf/tests/parse-metric.c
@@ -36,6 +36,27 @@ static struct pmu_event pme_test[] = {
.metric_expr= "(dcache_miss_cpi + icache_miss_cycles)",
.metric_name= "cache_miss_cycles",
 },
+{
+   .metric_expr= "l2_rqsts.demand_data_rd_hit + l2_rqsts.pf_hit + 
l2_rqsts.rfo_hit",
+   .metric_name= "DCache_L2_All_Hits",
+},
+{
+   .metric_expr= "max(l2_rqsts.all_demand_data_rd - 
l2_rqsts.demand_data_rd_hit, 0) + "
+ "l2_rqsts.pf_miss + l2_rqsts.rfo_miss",
+   .metric_name= "DCache_L2_All_Miss",
+},
+{
+   .metric_expr= "dcache_l2_all_hits + dcache_l2_all_miss",
+   .metric_name= "DCache_L2_All",
+},
+{
+   .metric_expr= "d_ratio(dcache_l2_all_hits, dcache_l2_all)",
+   .metric_name= "DCache_L2_Hits",
+},
+{
+   .metric_expr= "d_ratio(dcache_l2_all_miss, dcache_l2_all)",
+   .metric_name= "DCache_L2_Misses",
+},
 };
 
 static struct pmu_events_map map = {
@@ -194,10 +215,60 @@ static int test_cache_miss_cycles(void)
return 0;
 }
 
+
+/*
+ * DCache_L2_All_Hits = l2_rqsts.demand_data_rd_hit + l2_rqsts.pf_hit + 
l2_rqsts.rfo_hi
+ * DCache_L2_All_Miss = max(l2_rqsts.all_demand_data_rd - 
l2_rqsts.demand_data_rd_hit, 0) +
+ *  l2_rqsts.pf_miss + l2_rqsts.rfo_miss
+ * DCache_L2_All  = dcache_l2_all_hits + dcache_l2_all_miss
+ * DCache_L2_Hits = d_ratio(dcache_l2_all_hits, dcache_l2_all)
+ * DCache_L2_Misses   = d_ratio(dcache_l2_all_miss, dcache_l2_all)
+ *
+ * l2_rqsts.demand_data_rd_hit = 100
+ * l2_rqsts.pf_hit = 200
+ * l2_rqsts.rfo_hi = 300
+ * l2_rqsts.all_demand_data_rd = 400
+ * l2_rqsts.pf_miss= 500
+ * l2_rqsts.rfo_miss   = 600
+ *
+ * DCache_L2_All_Hits = 600
+ * DCache_L2_All_Miss = MAX(400 - 100, 0) + 500 + 600 = 1400
+ * DCache_L2_All  = 600 + 1400  = 2000
+ * DCache_L2_Hits = 600 / 2000  = 0.3
+ * DCache_L2_Misses   = 1400 / 2000 = 0.7
+ */
+static int test_dcache_l2(void)
+{
+   double ratio;
+   struct value vals[] = {
+   { .event = "l2_rqsts.demand_data_rd_hit", .val = 100 },
+   { .event = "l2_rqsts.pf_hit", .val = 200 },
+   { .event = "l2_rqsts.rfo_hit",.val = 300 },
+   { .event = "l2_rqsts.all_demand_data_rd", .val = 400 },
+   { .event = "l2_rqsts.pf_miss",.val = 500 },
+   { .event = "l2_rqsts.rfo_miss",   .val = 600 },
+   { 0 },
+   };
+
+   TEST_ASSERT_VAL("failed to compute metric",
+   compute_metric("DCache_L2_Hits", vals, ) == 0);
+
+   TEST_ASSERT_VAL("DCache_L2_Hits failed, wrong ratio",
+   ratio == 0.3);
+
+   TEST_ASSERT_VAL("failed to compute metric",
+   compute_metric("DCache_L2_Misses", vals, ) == 0);
+
+   TEST_ASSERT_VAL("DCache_L2_Misses failed, wrong ratio",
+   ratio == 0.7);
+   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);
+   TEST_ASSERT_VAL("DCache_L2 failed", test_dcache_l2() == 0);
return 0;
 }
-- 
2.25.4