From nobody Thu Dec 18 05:17:41 2025 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 633EDEE49B0 for ; Wed, 23 Aug 2023 08:22:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234120AbjHWISa (ORCPT ); Wed, 23 Aug 2023 04:18:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233790AbjHWIKp (ORCPT ); Wed, 23 Aug 2023 04:10:45 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 223061BE for ; Wed, 23 Aug 2023 01:09:10 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d7496b91389so6212718276.1 for ; Wed, 23 Aug 2023 01:09:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1692778149; x=1693382949; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=hTctRXvCXjE3QcZJ1hsp4OH2mXVNnHQp5p4RQcP/Djg=; b=5ifKsNQnfZySr7XTQldnZ06K/BDGMqawhA7oZp0g+3d94s42d+D/ueA+DTYpu05zVy hbIO+BdaZiG6lYL6JYtXfaK7yiUdbxdEr8X9JP+2haRp00oxRxZzry/oy3/fesyIfX/w 8unhuvM5QFScUResmxDUtqzBJd9SMkK9vmA1HsumR2GGhLp+Xx3kV9dl2rqzqGGLyB4K Bod9T4fRvJbuFI8xyu2pyaLpNgWUKEW3OpPqYMj9hbdR8pVcZp4QN4eb1q0ZL46wCwhI zJf+aTskW65PxLTqtNjkYmK14RmQY1b/fV4iNlUv2qWbjkGkERIK+IVyaA4f8pj3FXIL zthg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692778149; x=1693382949; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hTctRXvCXjE3QcZJ1hsp4OH2mXVNnHQp5p4RQcP/Djg=; b=KLisBnYXsBa1qOKdrUf7y9RSJkqfcsAxMow/9s36thUP3n2Gc6m+4W9sYAQTmCSzdr LkRxNUlfp9xDAwH+4Oj8dKBssIK2RWKOy6+QprFpgZ4GdqvoWh7WDu29YJf58ZRSca5c 2k6aYJLOb5EoUj3d9G1SeFIg6jzgm6Z2ayXLxeqbdfwHnO0hjxavXsDzQkT8NuDk7IKI WR9LWyWQ6A4CayL3LZg8eOZlY+lH45C5sUMzPRnxGRK1yesHdk9uImykujS7nJOSAzLd k4BFVxJXYTE7x2uLLNHnY7afEyBF5CxIcVjZngEAxZd5VMn+VxRAam2kQ6T/15Am4FXB bcSA== X-Gm-Message-State: AOJu0YxQ6Skvb4vNvKiGz4/sA9HS3OJgkVByR6c2A3tv9CFv5i+z+9cy FbhwJXIR/GX+pJMnb8kAdR3kPyHC8RWq X-Google-Smtp-Source: AGHT+IEXOY3eyUqMIhYlpovQXqhyextxMTfaS7NEseV+dMLLIZwG/jnQ+fqU5QGb1WycaoOp+2ltz2eIwsUV X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:3971:e84:f508:9a36]) (user=irogers job=sendgmr) by 2002:a25:7483:0:b0:d72:a54d:4ab with SMTP id p125-20020a257483000000b00d72a54d04abmr205011ybc.3.1692778149424; Wed, 23 Aug 2023 01:09:09 -0700 (PDT) Date: Wed, 23 Aug 2023 01:08:18 -0700 In-Reply-To: <20230823080828.1460376-1-irogers@google.com> Message-Id: <20230823080828.1460376-16-irogers@google.com> Mime-Version: 1.0 References: <20230823080828.1460376-1-irogers@google.com> X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog Subject: [PATCH v1 15/25] perf pmu-events: Reduce processed events by passing PMU From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , James Clark , Kan Liang , John Garry , Kajol Jain , Jing Zhang , Ravi Bangoria , Rob Herring , Gaosheng Cui , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Pass the PMU to pmu_events_table__for_each_event so that entries that don't match don't need to be processed by callback. If a NULL PMU is passed then all PMUs are processed. perf bench internals pmu-scan "Average PMU scanning" performance is reduced by about 5% on an Intel tigerlake. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/empty-pmu-events.c | 15 ++++++---- tools/perf/pmu-events/jevents.py | 18 ++++++++---- tools/perf/pmu-events/pmu-events.h | 4 ++- tools/perf/tests/pmu-events.c | 6 ++-- tools/perf/util/pmu.c | 35 +++++++----------------- tools/perf/util/pmu.h | 1 + 6 files changed, 41 insertions(+), 38 deletions(-) diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-even= ts/empty-pmu-events.c index 807f2e55c17c..2d6f748280ac 100644 --- a/tools/perf/pmu-events/empty-pmu-events.c +++ b/tools/perf/pmu-events/empty-pmu-events.c @@ -266,12 +266,16 @@ static const struct pmu_sys_events pmu_sys_event_tabl= es[] =3D { }, }; =20 -int pmu_events_table__for_each_event(const struct pmu_events_table *table,= pmu_event_iter_fn fn, - void *data) +int pmu_events_table__for_each_event(const struct pmu_events_table *table,= struct perf_pmu *pmu, + pmu_event_iter_fn fn, void *data) { for (const struct pmu_event *pe =3D &table->entries[0]; pe->name; pe++) { - int ret =3D fn(pe, table, data); + int ret; =20 + if (pmu && !pmu__name_match(pmu, pe->pmu)) + continue; + + ret =3D fn(pe, table, data); if (ret) return ret; } @@ -371,7 +375,8 @@ const struct pmu_metrics_table *find_core_metrics_table= (const char *arch, const int pmu_for_each_core_event(pmu_event_iter_fn fn, void *data) { for (const struct pmu_events_map *tables =3D &pmu_events_map[0]; tables->= arch; tables++) { - int ret =3D pmu_events_table__for_each_event(&tables->event_table, fn, d= ata); + int ret =3D pmu_events_table__for_each_event(&tables->event_table, + /*pmu=3D*/ NULL, fn, data); =20 if (ret) return ret; @@ -408,7 +413,7 @@ int pmu_for_each_sys_event(pmu_event_iter_fn fn, void *= data) for (const struct pmu_sys_events *tables =3D &pmu_sys_event_tables[0]; tables->name; tables++) { - int ret =3D pmu_events_table__for_each_event(&tables->table, fn, data); + int ret =3D pmu_events_table__for_each_event(&tables->table, /*pmu=3D*/ = NULL, fn, data); =20 if (ret) return ret; diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index 1ad20140114c..396af53e0e45 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -826,14 +826,20 @@ static int pmu_events_table__for_each_event_pmu(const= struct pmu_events_table *t } =20 int pmu_events_table__for_each_event(const struct pmu_events_table *table, + struct perf_pmu *pmu, pmu_event_iter_fn fn, void *data) { for (size_t i =3D 0; i < table->num_pmus; i++) { - int ret =3D pmu_events_table__for_each_event_pmu(table, &t= able->pmus[i], - fn, data); + const struct pmu_table_entry *table_pmu =3D &table->pmus[i= ]; + const char *pmu_name =3D &big_c_string[table_pmu->pmu_name= .offset]; + int ret; =20 - if (ret) + if (pmu && !pmu__name_match(pmu, pmu_name)) + continue; + + ret =3D pmu_events_table__for_each_event_pmu(table, table_= pmu, fn, data); + if (pmu || ret) return ret; } return 0; @@ -955,7 +961,8 @@ int pmu_for_each_core_event(pmu_event_iter_fn fn, void = *data) for (const struct pmu_events_map *tables =3D &pmu_events_map[0]; tables->arch; tables++) { - int ret =3D pmu_events_table__for_each_event(&tables->even= t_table, fn, data); + int ret =3D pmu_events_table__for_each_event(&tables->even= t_table, + /*pmu=3D*/ NULL= , fn, data); =20 if (ret) return ret; @@ -992,7 +999,8 @@ int pmu_for_each_sys_event(pmu_event_iter_fn fn, void *= data) for (const struct pmu_sys_events *tables =3D &pmu_sys_event_tables= [0]; tables->name; tables++) { - int ret =3D pmu_events_table__for_each_event(&tables->even= t_table, fn, data); + int ret =3D pmu_events_table__for_each_event(&tables->even= t_table, + /*pmu=3D*/ NULL= , fn, data); =20 if (ret) return ret; diff --git a/tools/perf/pmu-events/pmu-events.h b/tools/perf/pmu-events/pmu= -events.h index 6557381b7de1..c0303ba42e97 100644 --- a/tools/perf/pmu-events/pmu-events.h +++ b/tools/perf/pmu-events/pmu-events.h @@ -77,7 +77,9 @@ typedef int (*pmu_metric_iter_fn)(const struct pmu_metric= *pm, const struct pmu_metrics_table *table, void *data); =20 -int pmu_events_table__for_each_event(const struct pmu_events_table *table,= pmu_event_iter_fn fn, +int pmu_events_table__for_each_event(const struct pmu_events_table *table, + struct perf_pmu *pmu, + pmu_event_iter_fn fn, void *data); int pmu_metrics_table__for_each_metric(const struct pmu_metrics_table *tab= le, pmu_metric_iter_fn fn, void *data); diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index 0b6efabc3d20..92d1f6f0e666 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -483,12 +483,14 @@ static int test__pmu_event_table(struct test_suite *t= est __maybe_unused, if (!table || !sys_event_table) return -1; =20 - err =3D pmu_events_table__for_each_event(table, test__pmu_event_table_cor= e_callback, + err =3D pmu_events_table__for_each_event(table, /*pmu=3D*/ NULL, + test__pmu_event_table_core_callback, &map_events); if (err) return err; =20 - err =3D pmu_events_table__for_each_event(sys_event_table, test__pmu_event= _table_sys_callback, + err =3D pmu_events_table__for_each_event(sys_event_table, /*pmu=3D*/ NULL, + test__pmu_event_table_sys_callback, &map_events); if (err) return err; diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 0036e41f6baf..284962c133b3 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -855,28 +855,14 @@ static bool pmu_uncore_alias_match(const char *pmu_na= me, const char *name) return res; } =20 -struct pmu_add_cpu_aliases_map_data { - /* List being added to. */ - struct list_head *head; - /* If a pmu_event lacks a given PMU the default used. */ - char *default_pmu_name; - /* The PMU that we're searching for events for. */ - struct perf_pmu *pmu; -}; - static int pmu_add_cpu_aliases_map_callback(const struct pmu_event *pe, const struct pmu_events_table *table __maybe_unused, void *vdata) { - struct pmu_add_cpu_aliases_map_data *data =3D vdata; - const char *pname =3D pe->pmu ?: data->default_pmu_name; + struct list_head *head =3D vdata; =20 - if (!strcmp(pname, data->pmu->name) || - (data->pmu->is_uncore && pmu_uncore_alias_match(pname, data->pmu->nam= e))) { - /* need type casts to override 'const' */ - __perf_pmu__new_alias(data->head, -1, (char *)pe->name, (char *)pe->desc, - (char *)pe->event, pe); - } + /* need type casts to override 'const' */ + __perf_pmu__new_alias(head, -1, (char *)pe->name, (char *)pe->desc, (char= *)pe->event, pe); return 0; } =20 @@ -886,14 +872,7 @@ static int pmu_add_cpu_aliases_map_callback(const stru= ct pmu_event *pe, */ void pmu_add_cpu_aliases_table(struct perf_pmu *pmu, const struct pmu_even= ts_table *table) { - struct pmu_add_cpu_aliases_map_data data =3D { - .head =3D &pmu->aliases, - .default_pmu_name =3D perf_pmus__default_pmu_name(), - .pmu =3D pmu, - }; - - pmu_events_table__for_each_event(table, pmu_add_cpu_aliases_map_callback,= &data); - free(data.default_pmu_name); + pmu_events_table__for_each_event(table, pmu, pmu_add_cpu_aliases_map_call= back, &pmu->aliases); } =20 static void pmu_add_cpu_aliases(struct perf_pmu *pmu) @@ -1709,6 +1688,12 @@ int perf_pmu__for_each_event(const struct perf_pmu *= pmu, void *state, pmu_event_ return ret; } =20 +bool pmu__name_match(const struct perf_pmu *pmu, const char *pmu_name) +{ + return !strcmp(pmu->name, pmu_name) || + (pmu->is_uncore && pmu_uncore_alias_match(pmu_name, pmu->name)); +} + bool perf_pmu__is_software(const struct perf_pmu *pmu) { if (pmu->is_core || pmu->is_uncore || pmu->auxtrace) diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 03211de345c1..2b1730152bc0 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -198,6 +198,7 @@ bool perf_pmu__auto_merge_stats(const struct perf_pmu *= pmu); bool perf_pmu__have_event(const struct perf_pmu *pmu, const char *name); size_t perf_pmu__num_events(const struct perf_pmu *pmu); int perf_pmu__for_each_event(const struct perf_pmu *pmu, void *state, pmu_= event_callback cb); +bool pmu__name_match(const struct perf_pmu *pmu, const char *pmu_name); =20 /** * perf_pmu_is_software - is the PMU a software PMU as in it uses the --=20 2.42.0.rc1.204.g551eb34607-goog