mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: John Garry <john.g.garry@oracle.com>
To: acme@kernel.org, irogers@google.com, namhyung@kernel.org,
	jolsa@kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
	linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
	renyu.zj@linux.alibaba.com, shangxiaojing@huawei.com,
	zhangshaokun@hisilicon.com, qiangqing.zhang@nxp.com,
	kjain@linux.ibm.com, kan.liang@linux.intel.com,
	John Garry <john.g.garry@oracle.com>
Subject: [PATCH RFC 2/9] perf metrics: Don't iter sys metrics if we already found a CPU match
Date: Wed, 28 Jun 2023 10:29:42 +0000	[thread overview]
Message-ID: <20230628102949.2598096-3-john.g.garry@oracle.com> (raw)
In-Reply-To: <20230628102949.2598096-1-john.g.garry@oracle.com>

In metricgroup__add_metric() we still iter the sys metrics if we already
found a match from the CPU table, which is pretty pointless, so don't
bother.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 tools/perf/util/metricgroup.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
index 4389ccd29fe7..8d2ac2513530 100644
--- a/tools/perf/util/metricgroup.c
+++ b/tools/perf/util/metricgroup.c
@@ -1261,6 +1261,12 @@ static int metricgroup__add_metric(const char *pmu, const char *metric_name, con
 
 		has_match = data.has_match;
 	}
+
+	if (has_match) {
+		ret = 0;
+		goto out;
+	}
+
 	{
 		struct metricgroup_iter_data data = {
 			.fn = metricgroup__add_metric_sys_event_iter,
@@ -1279,6 +1285,7 @@ static int metricgroup__add_metric(const char *pmu, const char *metric_name, con
 
 		pmu_for_each_sys_metric(metricgroup__sys_event_iter, &data);
 	}
+
 	/* End of pmu events. */
 	if (!has_match)
 		ret = -EINVAL;
-- 
2.35.3


  parent reply	other threads:[~2023-06-28 10:35 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-28 10:29 [PATCH RFC 0/9] perf tool: sys event metric support re-write John Garry
2023-06-28 10:29 ` [PATCH RFC 1/9] perf metrics: Delete metricgroup_add_iter_data.table John Garry
2023-06-30 17:22   ` Ian Rogers
2023-06-28 10:29 ` John Garry [this message]
2023-06-30 17:41   ` [PATCH RFC 2/9] perf metrics: Don't iter sys metrics if we already found a CPU match Ian Rogers
2023-07-03 13:09     ` John Garry
2023-07-12  5:40       ` Ian Rogers
2023-07-12  9:37         ` John Garry
2023-06-28 10:29 ` [PATCH RFC 3/9] perf metrics: Pass cpu and sys tables to metricgroup__add_metric() John Garry
2023-06-30 18:39   ` Ian Rogers
2023-07-03 15:20     ` John Garry
2023-06-28 10:29 ` [PATCH RFC 4/9] perf jevents: Add sys_events_find_events_table() John Garry
2023-06-30 19:00   ` Ian Rogers
2023-06-30 20:16     ` Ian Rogers
2023-07-03 15:15       ` John Garry
2023-07-12  6:05         ` Ian Rogers
2023-07-12 10:55           ` John Garry
2023-07-12 17:52             ` Ian Rogers
2023-07-13 15:06               ` John Garry
2023-07-13 21:35                 ` Ian Rogers
2023-07-14 11:58                   ` John Garry
2023-07-14 15:55                     ` Ian Rogers
2023-07-17  7:41                       ` John Garry
2023-07-17 21:39                         ` Ian Rogers
2023-07-18  9:32                           ` John Garry
2023-07-19 15:25                             ` Ian Rogers
2023-07-19 15:36                               ` John Garry
2023-07-19 15:49                                 ` Ian Rogers
2023-07-19 20:07                               ` Arnaldo Carvalho de Melo
2023-06-28 10:29 ` [PATCH RFC 5/9] perf pmu: Refactor pmu_add_sys_aliases_iter_fn() John Garry
2023-06-28 10:29 ` [PATCH RFC 6/9] perf metrics: Add metricgroup_sys_metric_supported() John Garry
2023-06-28 10:29 ` [PATCH RFC 7/9] perf metrics: Test metric match in metricgroup__sys_event_iter() John Garry
2023-06-28 10:29 ` [PATCH RFC 8/9] perf metrics: Stop metricgroup__add_metric_sys_event_iter if already matched John Garry
2023-06-28 10:29 ` [PATCH RFC 9/9] perf vendor events arm64: Remove unnecessary metric Unit and Compat specifiers John Garry
2023-06-29 22:08 ` [PATCH RFC 0/9] perf tool: sys event metric support re-write Namhyung Kim
2023-06-30  9:35   ` John Garry
2023-06-30 21:07     ` Namhyung Kim

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230628102949.2598096-3-john.g.garry@oracle.com \
    --to=john.g.garry@oracle.com \
    --cc=acme@kernel.org \
    --cc=irogers@google.com \
    --cc=jolsa@kernel.org \
    --cc=kan.liang@linux.intel.com \
    --cc=kjain@linux.ibm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=namhyung@kernel.org \
    --cc=qiangqing.zhang@nxp.com \
    --cc=renyu.zj@linux.alibaba.com \
    --cc=shangxiaojing@huawei.com \
    --cc=zhangshaokun@hisilicon.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®