148 lines
5.0 KiB
Diff
148 lines
5.0 KiB
Diff
From 9b3115e0c7f96d66b85110725c05e1982aacbb6c Mon Sep 17 00:00:00 2001
|
|
From: Jiri Olsa <jolsa@kernel.org>
|
|
Date: Sun, 19 Jul 2020 20:13:18 +0200
|
|
Subject: [PATCH 125/201] perf metric: Add metric group test
|
|
|
|
mainline inclusion
|
|
from mainline-v5.9-rc1
|
|
commit dfce77c580e02c19efacfe9110261c935d1ddb60
|
|
category: feature
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C0CX
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=dfce77c580e02c19efacfe9110261c935d1ddb60
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Adding test for metric group plus compute_metric_group function to get
|
|
metrics values within the group.
|
|
|
|
Committer notes:
|
|
|
|
Fixed this;
|
|
|
|
tests/parse-metric.c:327:7: error: missing field 'val' initializer [-Werror,-Wmissing-field-initializers]
|
|
{ 0 },
|
|
^
|
|
|
|
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
|
|
Reviewed-by: Kajol Jain <kjain@linux.ibm.com>
|
|
Acked-by: Ian Rogers <irogers@google.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <ak@linux.intel.com>
|
|
Cc: John Garry <john.garry@huawei.com>
|
|
Cc: Michael Petlan <mpetlan@redhat.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Paul Clarke <pc@us.ibm.com>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Stephane Eranian <eranian@google.com>
|
|
Link: http://lore.kernel.org/lkml/20200719181320.785305-18-jolsa@kernel.org
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
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 f8c58f7f8e55..007da421bf95 100644
|
|
--- a/tools/perf/tests/parse-metric.c
|
|
+++ b/tools/perf/tests/parse-metric.c
|
|
@@ -16,6 +16,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 ) * "
|
|
@@ -33,6 +34,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",
|
|
@@ -125,7 +127,9 @@ static double compute_single(struct rblist *metric_events, struct perf_evlist *e
|
|
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,
|
|
@@ -164,7 +168,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);
|
|
@@ -175,6 +182,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;
|
|
@@ -295,6 +314,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 },
|
|
+ { .event = NULL, },
|
|
+ };
|
|
+
|
|
+ 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);
|
|
@@ -302,5 +345,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.27.0
|
|
|