From mboxrd@z Thu Jan 1 00:00:00 1970 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 54670C88CB2 for ; Thu, 24 Aug 2023 04:14:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240044AbjHXEO2 (ORCPT ); Thu, 24 Aug 2023 00:14:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240094AbjHXEOD (ORCPT ); Thu, 24 Aug 2023 00:14:03 -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 D0A5E1720 for ; Wed, 23 Aug 2023 21:13:59 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-58419550c3aso86168007b3.0 for ; Wed, 23 Aug 2023 21:13:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1692850439; x=1693455239; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=1ZewI3nPpImqbFJqNAvX0ZQHNd9oa0t1rOfrNdK6f64=; b=s6czWNqa6SS0Dx6G/QxxsR/83VjVVuFMvCQY7Qtx2OPqx+fCQ5MTYJ/GHGaxYFuFlx peHgarO4gV3dOEYTL1LwKetnL72ezJIbll3TbQ2zeaWXizmAFpFkqYKLdGYiBJAtvCMg qUF/wIWhnNPDOUxteSx/TH/AuF/AmYCVKMyYj9jHH+YjU1LMpk4qEx4cgjiSDJE+Jr1t +G/Z2l5drDPsDLwS/DlHaRkwy5IFXotVLgXbGm+JF5q3Ub8oUZCQkJS+P93C+zxyczdq TI5XavO62wF+stP1CMkk4lw/38zCGL4/Ydl6h4ZAWA89QtOVfRxQNxLZGifkNzIGmkHA SfyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692850439; x=1693455239; 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=1ZewI3nPpImqbFJqNAvX0ZQHNd9oa0t1rOfrNdK6f64=; b=gHX9sQUedZzwPPNL7V8ZeTsavIgO2ocaRpVx3rC03DZPcq904HYISJxHbleeer+5pZ QDzBwMmnOFwcEDzZY57imWw9FM66WW5kQIzEpRP9wCGUkeucHn4JRuD93AkO71hnrZqB 6dWyjj12tNpqNJZngD3ED7T3SgD9C23WKLNoomU/iQNXHj+pPgkeJDyIAPPdmNvQTbzM Cp0WVY4JvjY5aVskO9+Z1eNlKmQ3YjngV9BKl3v+Kp8Pu0fAWiYcNv3Ynhs1YclRXANS u0QS410kjWjGqaEXHsr0MHrEnJYZz5nHmggWvEy6L/cZ/ayP9MmYrwjpdjuAiAlySa4x VAGA== X-Gm-Message-State: AOJu0YyWZO/4880fa3xzWvMQP8rN13CRc6JV2u7vWgGjCdffmy22Gjdj p+aeR5LfTUQvdrEp4g14u59Wd5sC4MAc X-Google-Smtp-Source: AGHT+IEfdGl2oTHV/ZWECik+jy5EjUwahwoDcJYpBY96quefyzLUIaPWFY5kuZB9wop7VGom14iuNFslqqcQ X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:fbb9:d9e7:7405:2651]) (user=irogers job=sendgmr) by 2002:a05:6902:290:b0:d48:c04:f256 with SMTP id v16-20020a056902029000b00d480c04f256mr195838ybh.11.1692850438995; Wed, 23 Aug 2023 21:13:58 -0700 (PDT) Date: Wed, 23 Aug 2023 21:13:19 -0700 In-Reply-To: <20230824041330.266337-1-irogers@google.com> Message-Id: <20230824041330.266337-8-irogers@google.com> Mime-Version: 1.0 References: <20230824041330.266337-1-irogers@google.com> X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog Subject: [PATCH v2 07/18] 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 Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org 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-events/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_tables[] = { }, }; -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 = &table->entries[0]; pe->name; pe++) { - int ret = fn(pe, table, data); + int ret; + if (pmu && !pmu__name_match(pmu, pe->pmu)) + continue; + + ret = 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 = &pmu_events_map[0]; tables->arch; tables++) { - int ret = pmu_events_table__for_each_event(&tables->event_table, fn, data); + int ret = pmu_events_table__for_each_event(&tables->event_table, + /*pmu=*/ NULL, fn, data); 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 = &pmu_sys_event_tables[0]; tables->name; tables++) { - int ret = pmu_events_table__for_each_event(&tables->table, fn, data); + int ret = pmu_events_table__for_each_event(&tables->table, /*pmu=*/ NULL, fn, data); if (ret) return ret; diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.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 } 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 = 0; i < table->num_pmus; i++) { - int ret = pmu_events_table__for_each_event_pmu(table, &table->pmus[i], - fn, data); + const struct pmu_table_entry *table_pmu = &table->pmus[i]; + const char *pmu_name = &big_c_string[table_pmu->pmu_name.offset]; + int ret; - if (ret) + if (pmu && !pmu__name_match(pmu, pmu_name)) + continue; + + ret = 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 = &pmu_events_map[0]; tables->arch; tables++) { - int ret = pmu_events_table__for_each_event(&tables->event_table, fn, data); + int ret = pmu_events_table__for_each_event(&tables->event_table, + /*pmu=*/ NULL, fn, data); 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 = &pmu_sys_event_tables[0]; tables->name; tables++) { - int ret = pmu_events_table__for_each_event(&tables->event_table, fn, data); + int ret = pmu_events_table__for_each_event(&tables->event_table, + /*pmu=*/ NULL, fn, data); 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); -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 *table, 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 *test __maybe_unused, if (!table || !sys_event_table) return -1; - err = pmu_events_table__for_each_event(table, test__pmu_event_table_core_callback, + err = pmu_events_table__for_each_event(table, /*pmu=*/ NULL, + test__pmu_event_table_core_callback, &map_events); if (err) return err; - err = pmu_events_table__for_each_event(sys_event_table, test__pmu_event_table_sys_callback, + err = pmu_events_table__for_each_event(sys_event_table, /*pmu=*/ 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 0c82bbeea7d6..9ba9ac3d3d96 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -859,28 +859,14 @@ static bool pmu_uncore_alias_match(const char *pmu_name, const char *name) return res; } -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 = vdata; - const char *pname = pe->pmu ?: data->default_pmu_name; + struct list_head *head = vdata; - if (!strcmp(pname, data->pmu->name) || - (data->pmu->is_uncore && pmu_uncore_alias_match(pname, data->pmu->name))) { - /* 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; } @@ -890,14 +876,7 @@ static int pmu_add_cpu_aliases_map_callback(const struct pmu_event *pe, */ void pmu_add_cpu_aliases_table(struct perf_pmu *pmu, const struct pmu_events_table *table) { - struct pmu_add_cpu_aliases_map_data data = { - .head = &pmu->aliases, - .default_pmu_name = perf_pmus__default_pmu_name(), - .pmu = 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_callback, &pmu->aliases); } static void pmu_add_cpu_aliases(struct perf_pmu *pmu) @@ -1713,6 +1692,12 @@ int perf_pmu__for_each_event(const struct perf_pmu *pmu, void *state, pmu_event_ return ret; } +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); /** * perf_pmu_is_software - is the PMU a software PMU as in it uses the -- 2.42.0.rc1.204.g551eb34607-goog