linux-perf-users.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: weilin.wang@intel.com
To: weilin.wang@intel.com, Ian Rogers <irogers@google.com>,
	Kan Liang <kan.liang@linux.intel.com>,
	Namhyung Kim <namhyung@kernel.org>,
	Arnaldo Carvalho de Melo <acme@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Jiri Olsa <jolsa@kernel.org>,
	Adrian Hunter <adrian.hunter@intel.com>
Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
	Perry Taylor <perry.taylor@intel.com>,
	Samantha Alt <samantha.alt@intel.com>,
	Caleb Biggers <caleb.biggers@intel.com>
Subject: [RFC PATCH v5 09/16] perf stat: Add function to handle special events in hardware-grouping
Date: Fri, 12 Apr 2024 14:07:49 -0700	[thread overview]
Message-ID: <20240412210756.309828-10-weilin.wang@intel.com> (raw)
In-Reply-To: <20240412210756.309828-1-weilin.wang@intel.com>

From: Weilin Wang <weilin.wang@intel.com>

There are some special events like topdown events and TSC that are not
described in pmu-event JSON files. Add support to handle this type of
events. This should be considered as a temporary solution because including
these events in JSON files would be a better solution.

Signed-off-by: Weilin Wang <weilin.wang@intel.com>
---
 tools/perf/util/metricgroup.c | 38 ++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
index 04d988ace734..681aacc15787 100644
--- a/tools/perf/util/metricgroup.c
+++ b/tools/perf/util/metricgroup.c
@@ -162,6 +162,20 @@ struct metric {
 
 /* Maximum number of counters per PMU*/
 #define NR_COUNTERS	16
+/* Special events that are not described in pmu-event JSON files.
+ * topdown-* and TSC use dedicated registers, set as free
+ * counter for grouping purpose
+ */
+enum special_events {
+	TOPDOWN	= 0,
+	TSC	= 1,
+	SPECIAL_EVENT_MAX,
+};
+
+static const char *const special_event_names[SPECIAL_EVENT_MAX] = {
+	"topdown-",
+	"TSC",
+};
 
 /**
  * An event used in a metric. This info is for metric grouping.
@@ -2142,6 +2156,15 @@ static int create_grouping(struct list_head *pmu_info_list,
 	return ret;
 };
 
+static bool is_special_event(const char *id)
+{
+	for (int i = 0; i < SPECIAL_EVENT_MAX; i++) {
+		if (!strncmp(id, special_event_names[i], strlen(special_event_names[i])))
+			return true;
+	}
+	return false;
+}
+
 /**
  * hw_aware_build_grouping - Build event groupings by reading counter
  * requirement of the events and counter available on the system from
@@ -2166,6 +2189,17 @@ static int hw_aware_build_grouping(struct expr_parse_ctx *ctx __maybe_unused,
 	hashmap__for_each_entry(ctx->ids, cur, bkt) {
 		const char *id = cur->pkey;
 
+		if (is_special_event(id)) {
+			struct metricgroup__event_info *event;
+
+			event = event_info__new(id, "default_core", "0",
+						/*free_counter=*/true);
+			if (!event)
+				goto err_out;
+
+			list_add(&event->nd, &event_info_list);
+			continue;
+		}
 		ret = get_metricgroup_events(id, etable, &event_info_list);
 		if (ret)
 			goto err_out;
@@ -2636,8 +2670,10 @@ int metricgroup__parse_groups(struct evlist *perf_evlist,
 		ret = hw_aware_parse_groups(perf_evlist, pmu, str,
 			    metric_no_threshold, user_requested_cpu_list, system_wide,
 			    /*fake_pmu=*/NULL, metric_events, table);
-		if (!ret)
+		if (!ret) {
+			pr_info("Hardware aware grouping completed\n");
 			return 0;
+		}
 	}
 
 	return parse_groups(perf_evlist, pmu, str, metric_no_group, metric_no_merge,
-- 
2.42.0


  parent reply	other threads:[~2024-04-12 21:08 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-12 21:07 [RFC PATCH v5 00/16] Perf stat metric grouping with hardware information weilin.wang
2024-04-12 21:07 ` [RFC PATCH v5 01/16] perf stat: Add new field in stat_config to enable hardware aware grouping weilin.wang
2024-04-17  3:49   ` Ian Rogers
2024-04-17 16:21     ` Arnaldo Carvalho de Melo
2024-04-12 21:07 ` [RFC PATCH v5 02/16] perf stat: Add basic functions for the " weilin.wang
2024-04-17  4:56   ` Ian Rogers
2024-04-17 16:24     ` Arnaldo Carvalho de Melo
2024-04-12 21:07 ` [RFC PATCH v5 03/16] perf pmu-events: Add functions in jevent.py to parse counter and event info for " weilin.wang
2024-04-17  5:42   ` Ian Rogers
2024-04-12 21:07 ` [RFC PATCH v5 04/16] find_bit: add _find_last_and_bit() to support finding the most significant set bit weilin.wang
2024-04-12 21:07 ` [RFC PATCH v5 05/16] perf stat: Add functions to set counter bitmaps for hardware-grouping method weilin.wang
2024-04-17  5:35   ` Ian Rogers
2024-04-12 21:07 ` [RFC PATCH v5 06/16] perf stat: Add functions to get counter info weilin.wang
2024-04-12 21:07 ` [RFC PATCH v5 07/16] perf stat: Add functions to create new group and assign events into groups weilin.wang
2024-04-12 21:07 ` [RFC PATCH v5 08/16] perf stat: Add build string function and topdown events handling in hardware-grouping weilin.wang
2024-04-17  5:56   ` Ian Rogers
2024-04-12 21:07 ` weilin.wang [this message]
2024-04-17  6:12   ` [RFC PATCH v5 09/16] perf stat: Add function to handle special events " Ian Rogers
2024-04-12 21:07 ` [RFC PATCH v5 10/16] perf stat: Add function to combine metrics for hardware-grouping weilin.wang
2024-04-12 21:07 ` [RFC PATCH v5 11/16] perf stat: Add partial support on MSR in hardware-grouping weilin.wang
2024-04-12 21:07 ` [RFC PATCH v5 12/16] perf stat: Handle NMI " weilin.wang
2024-04-12 21:07 ` [RFC PATCH v5 13/16] perf stat: Code refactoring " weilin.wang
2024-04-12 21:07 ` [RFC PATCH v5 14/16] perf stat: Add tool events support " weilin.wang
2024-04-12 21:07 ` [RFC PATCH v5 15/16] perf stat: use tool event helper function in metricgroup__build_event_string weilin.wang
2024-04-17  6:36   ` Ian Rogers
2024-04-12 21:07 ` [RFC PATCH v5 16/16] perf stat: Add hardware-grouping cmd option to perf stat weilin.wang

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=20240412210756.309828-10-weilin.wang@intel.com \
    --to=weilin.wang@intel.com \
    --cc=acme@kernel.org \
    --cc=adrian.hunter@intel.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=caleb.biggers@intel.com \
    --cc=irogers@google.com \
    --cc=jolsa@kernel.org \
    --cc=kan.liang@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=namhyung@kernel.org \
    --cc=perry.taylor@intel.com \
    --cc=peterz@infradead.org \
    --cc=samantha.alt@intel.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;
as well as URLs for NNTP newsgroup(s).