From nobody Sat Apr 11 11:09:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6009C00140 for ; Fri, 12 Aug 2022 23:11:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238327AbiHLXK7 (ORCPT ); Fri, 12 Aug 2022 19:10:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238227AbiHLXKY (ORCPT ); Fri, 12 Aug 2022 19:10:24 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5953DC for ; Fri, 12 Aug 2022 16:10:18 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-31f58599ad3so18410077b3.20 for ; Fri, 12 Aug 2022 16:10:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc; bh=sh297cGcNiOM+DSF6NOV/SZoJCZhIA8yBWiOo7MNppM=; b=guBO+fWjnBSeyC1tcVP76LdTPXZfgBFgI6pj1rSBpIHbsoZqv8ZZLASWh8mZ12d2d7 J/yrygnYBF67ZLNLWSo6SJ3czpvWkgxhP5o9t91GDIWxLZhLE0sMFcY7KgAt7ijpkKKt l10lThDL++OEF+DPdcy9UTHCd22qqk2uc3JwfY5/rlX5N69L8vFS7XZnxzGgrULToNWO Ac3TrM3u8vaVzn0VZPCYJSnWSYjer7qm0bmhG2WXPXs0EVCazYdhjHvYgXWb6O08NAOE AKaFbABA0H4ls3qfwPVGgV43V8ViJMaIRPQG2J1M7WhsOXm4aX1iH/RFhmyt3y3D74bL 9DgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc; bh=sh297cGcNiOM+DSF6NOV/SZoJCZhIA8yBWiOo7MNppM=; b=FBnYkHzD66TKhlJ8gmSy+4W74WOQN/jeccsX7UvA3WR19Q5aYANEg+uBUXHqGGJZgF CUj1Z9yIxYbk/BMoM++SdwIvcgto+Ie9rjazxcv9O9mva41OWZjrtRHpbtZLWJ9HTu1H amenge000GXsztvmZQbSPiGiZt3FW5qI9PgKcsOMALNj5OfiOEB6dV847BnXEmhJMGRd 70pIPwYDacBXbp0BHsqtqaGXdF61Lo8aAGdLE9FG4dRmd28czAmZJWCroQVdT9Fm9RDS axzITCVyNwN2VxyckVjkU2qPHv9V/AkObvx+AGuHSCtlMHPQvHwkPAh/aO2qSdeCTr+c 1B/w== X-Gm-Message-State: ACgBeo2BX28XLZs6vzPa9B2BEN+jY0MJ1xPm3kyt5AYVM9HW+zbLqkdH 1dalPmV5QS4v4YqlxolDADGbz3MswGjy X-Google-Smtp-Source: AA6agR4DrwHWjOb1uxndcZwM0Hn6akRz4VsjGhTUMliGtDkmwo3Hz/3zMb6+V8fOnQCY287fi8anRkqCHA17 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:d668:2937:8218:c5ec]) (user=irogers job=sendgmr) by 2002:a81:100e:0:b0:324:9670:7241 with SMTP id 14-20020a81100e000000b0032496707241mr5762614ywq.95.1660345818345; Fri, 12 Aug 2022 16:10:18 -0700 (PDT) Date: Fri, 12 Aug 2022 16:09:44 -0700 In-Reply-To: <20220812230949.683239-1-irogers@google.com> Message-Id: <20220812230949.683239-10-irogers@google.com> Mime-Version: 1.0 References: <20220812230949.683239-1-irogers@google.com> X-Mailer: git-send-email 2.37.1.595.g718a3a8f04-goog Subject: [PATCH v5 09/14] perf pmu-events: Move test events/metrics to json From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Andi Kleen , Zhengjun Xing , Ravi Bangoria , Kan Liang , Adrian Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move arrays of pmu_events into the json code so that it may be regenerated and modified by the jevents.py script. Signed-off-by: Ian Rogers --- .../arch/test/test_soc/cpu/metrics.json | 64 +++++++++++++++++ tools/perf/pmu-events/empty-pmu-events.c | 64 +++++++++++++++++ tools/perf/tests/expand-cgroup.c | 17 +---- tools/perf/tests/parse-metric.c | 68 +------------------ 4 files changed, 132 insertions(+), 81 deletions(-) create mode 100644 tools/perf/pmu-events/arch/test/test_soc/cpu/metrics.js= on diff --git a/tools/perf/pmu-events/arch/test/test_soc/cpu/metrics.json b/to= ols/perf/pmu-events/arch/test/test_soc/cpu/metrics.json new file mode 100644 index 000000000000..42d9b5242fd7 --- /dev/null +++ b/tools/perf/pmu-events/arch/test/test_soc/cpu/metrics.json @@ -0,0 +1,64 @@ +[ + { + "MetricExpr": "1 / IPC", + "MetricName": "CPI" + }, + { + "MetricExpr": "inst_retired.any / cpu_clk_unhalted.thread", + "MetricName": "IPC", + "MetricGroup": "group1" + }, + { + "MetricExpr": "idq_uops_not_delivered.core / (4 * (( ( cpu_clk_unhalte= d.thread / 2 ) * ( 1 + cpu_clk_unhalted.one_thread_active / cpu_clk_unhalte= d.ref_xclk ) )))", + "MetricName": "Frontend_Bound_SMT" + }, + { + "MetricExpr": "l1d\\-loads\\-misses / inst_retired.any", + "MetricName": "dcache_miss_cpi" + }, + { + "MetricExpr": "l1i\\-loads\\-misses / inst_retired.any", + "MetricName": "icache_miss_cycles" + }, + { + "MetricExpr": "(dcache_miss_cpi + icache_miss_cycles)", + "MetricName": "cache_miss_cycles", + "MetricGroup": "group1" + }, + { + "MetricExpr": "l2_rqsts.demand_data_rd_hit + l2_rqsts.pf_hit + l2_rqst= s.rfo_hit", + "MetricName": "DCache_L2_All_Hits" + }, + { + "MetricExpr": "max(l2_rqsts.all_demand_data_rd - l2_rqsts.demand_data_= rd_hit, 0) + l2_rqsts.pf_miss + l2_rqsts.rfo_miss", + "MetricName": "DCache_L2_All_Miss" + }, + { + "MetricExpr": "dcache_l2_all_hits + dcache_l2_all_miss", + "MetricName": "DCache_L2_All" + }, + { + "MetricExpr": "d_ratio(dcache_l2_all_hits, dcache_l2_all)", + "MetricName": "DCache_L2_Hits" + }, + { + "MetricExpr": "d_ratio(dcache_l2_all_miss, dcache_l2_all)", + "MetricName": "DCache_L2_Misses" + }, + { + "MetricExpr": "ipc + M2", + "MetricName": "M1" + }, + { + "MetricExpr": "ipc + M1", + "MetricName": "M2" + }, + { + "MetricExpr": "1/M3", + "MetricName": "M3" + }, + { + "MetricExpr": "64 * l1d.replacement / 1000000000 / duration_time", + "MetricName": "L1D_Cache_Fill_BW" + } +] diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-even= ts/empty-pmu-events.c index 8ef75aff996c..028f44efe48d 100644 --- a/tools/perf/pmu-events/empty-pmu-events.c +++ b/tools/perf/pmu-events/empty-pmu-events.c @@ -105,6 +105,70 @@ static const struct pmu_event pme_test_soc_cpu[] =3D { .desc =3D "L2 BTB Correction", .topic =3D "branch", }, + { + .metric_expr =3D "1 / IPC", + .metric_name =3D "CPI", + }, + { + .metric_expr =3D "inst_retired.any / cpu_clk_unhalted.thread", + .metric_name =3D "IPC", + .metric_group =3D "group1", + }, + { + .metric_expr =3D "idq_uops_not_delivered.core / (4 * (( ( cpu_clk_unhalt= ed.thread / 2 ) * " + "( 1 + cpu_clk_unhalted.one_thread_active / cpu_clk_unhalted.ref_xclk ) = )))", + .metric_name =3D "Frontend_Bound_SMT", + }, + { + .metric_expr =3D "l1d\\-loads\\-misses / inst_retired.any", + .metric_name =3D "dcache_miss_cpi", + }, + { + .metric_expr =3D "l1i\\-loads\\-misses / inst_retired.any", + .metric_name =3D "icache_miss_cycles", + }, + { + .metric_expr =3D "(dcache_miss_cpi + icache_miss_cycles)", + .metric_name =3D "cache_miss_cycles", + .metric_group =3D "group1", + }, + { + .metric_expr =3D "l2_rqsts.demand_data_rd_hit + l2_rqsts.pf_hit + l2_rqs= ts.rfo_hit", + .metric_name =3D "DCache_L2_All_Hits", + }, + { + .metric_expr =3D "max(l2_rqsts.all_demand_data_rd - l2_rqsts.demand_data= _rd_hit, 0) + " + "l2_rqsts.pf_miss + l2_rqsts.rfo_miss", + .metric_name =3D "DCache_L2_All_Miss", + }, + { + .metric_expr =3D "dcache_l2_all_hits + dcache_l2_all_miss", + .metric_name =3D "DCache_L2_All", + }, + { + .metric_expr =3D "d_ratio(dcache_l2_all_hits, dcache_l2_all)", + .metric_name =3D "DCache_L2_Hits", + }, + { + .metric_expr =3D "d_ratio(dcache_l2_all_miss, dcache_l2_all)", + .metric_name =3D "DCache_L2_Misses", + }, + { + .metric_expr =3D "ipc + M2", + .metric_name =3D "M1", + }, + { + .metric_expr =3D "ipc + M1", + .metric_name =3D "M2", + }, + { + .metric_expr =3D "1/M3", + .metric_name =3D "M3", + }, + { + .metric_expr =3D "64 * l1d.replacement / 1000000000 / duration_time", + .metric_name =3D "L1D_Cache_Fill_BW", + }, { .name =3D 0, .event =3D 0, diff --git a/tools/perf/tests/expand-cgroup.c b/tools/perf/tests/expand-cgr= oup.c index 411fc578e5a4..e79ee8621a90 100644 --- a/tools/perf/tests/expand-cgroup.c +++ b/tools/perf/tests/expand-cgroup.c @@ -180,26 +180,13 @@ static int expand_metric_events(void) struct evlist *evlist; struct rblist metric_events; const char metric_str[] =3D "CPI"; - - struct pmu_event pme_test[] =3D { - { - .metric_expr =3D "instructions / cycles", - .metric_name =3D "IPC", - }, - { - .metric_expr =3D "1 / IPC", - .metric_name =3D "CPI", - }, - { - .metric_expr =3D NULL, - .metric_name =3D NULL, - }, - }; + const struct pmu_event *pme_test; =20 evlist =3D evlist__new(); TEST_ASSERT_VAL("failed to get evlist", evlist); =20 rblist__init(&metric_events); + pme_test =3D find_core_events_table("testarch", "testcpu"); ret =3D metricgroup__parse_groups_test(evlist, pme_test, metric_str, false, false, &metric_events); if (ret < 0) { diff --git a/tools/perf/tests/parse-metric.c b/tools/perf/tests/parse-metri= c.c index 7aebde7c37ec..30c7091857b8 100644 --- a/tools/perf/tests/parse-metric.c +++ b/tools/perf/tests/parse-metric.c @@ -13,72 +13,6 @@ #include "stat.h" #include "pmu.h" =20 -static struct pmu_event pme_test[] =3D { -{ - .metric_expr =3D "inst_retired.any / cpu_clk_unhalted.thread", - .metric_name =3D "IPC", - .metric_group =3D "group1", -}, -{ - .metric_expr =3D "idq_uops_not_delivered.core / (4 * (( ( cpu_clk_unhalte= d.thread / 2 ) * " - "( 1 + cpu_clk_unhalted.one_thread_active / cpu_clk_unhalted.ref_xclk= ) )))", - .metric_name =3D "Frontend_Bound_SMT", -}, -{ - .metric_expr =3D "l1d\\-loads\\-misses / inst_retired.any", - .metric_name =3D "dcache_miss_cpi", -}, -{ - .metric_expr =3D "l1i\\-loads\\-misses / inst_retired.any", - .metric_name =3D "icache_miss_cycles", -}, -{ - .metric_expr =3D "(dcache_miss_cpi + icache_miss_cycles)", - .metric_name =3D "cache_miss_cycles", - .metric_group =3D "group1", -}, -{ - .metric_expr =3D "l2_rqsts.demand_data_rd_hit + l2_rqsts.pf_hit + l2_rqst= s.rfo_hit", - .metric_name =3D "DCache_L2_All_Hits", -}, -{ - .metric_expr =3D "max(l2_rqsts.all_demand_data_rd - l2_rqsts.demand_data_= rd_hit, 0) + " - "l2_rqsts.pf_miss + l2_rqsts.rfo_miss", - .metric_name =3D "DCache_L2_All_Miss", -}, -{ - .metric_expr =3D "dcache_l2_all_hits + dcache_l2_all_miss", - .metric_name =3D "DCache_L2_All", -}, -{ - .metric_expr =3D "d_ratio(dcache_l2_all_hits, dcache_l2_all)", - .metric_name =3D "DCache_L2_Hits", -}, -{ - .metric_expr =3D "d_ratio(dcache_l2_all_miss, dcache_l2_all)", - .metric_name =3D "DCache_L2_Misses", -}, -{ - .metric_expr =3D "ipc + m2", - .metric_name =3D "M1", -}, -{ - .metric_expr =3D "ipc + m1", - .metric_name =3D "M2", -}, -{ - .metric_expr =3D "1/m3", - .metric_name =3D "M3", -}, -{ - .metric_expr =3D "64 * l1d.replacement / 1000000000 / duration_time", - .metric_name =3D "L1D_Cache_Fill_BW", -}, -{ - .name =3D NULL, -} -}; - struct value { const char *event; u64 val; @@ -138,6 +72,7 @@ static int __compute_metric(const char *name, struct val= ue *vals, struct rblist metric_events =3D { .nr_entries =3D 0, }; + const struct pmu_event *pme_test; struct perf_cpu_map *cpus; struct runtime_stat st; struct evlist *evlist; @@ -161,6 +96,7 @@ static int __compute_metric(const char *name, struct val= ue *vals, runtime_stat__init(&st); =20 /* Parse the metric into metric_events list. */ + pme_test =3D find_core_events_table("testarch", "testcpu"); err =3D metricgroup__parse_groups_test(evlist, pme_test, name, false, false, &metric_events); --=20 2.37.1.595.g718a3a8f04-goog