From nobody Sun Dec 28 04:58:36 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 A7F30C4332F for ; Tue, 12 Dec 2023 23:04:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377985AbjLLXEd (ORCPT ); Tue, 12 Dec 2023 18:04:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378015AbjLLXEH (ORCPT ); Tue, 12 Dec 2023 18:04:07 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5BB718B; Tue, 12 Dec 2023 15:03:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702422231; x=1733958231; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3GTSojueKrZAHm7+ztYQ/xXSABrjDOLxOrKwyxXPHCI=; b=lzbPZoBmEOMCpPSqiGC4DuXK0IwR+tLCXQvBMy/a7dya2ROtSkUEu05Z oSDi5jB/p9/QhYh1UXLh86aKbSWRYoVF6Pd0cbbBx5FeFVTSuyCMhZJ9M qnBKPIgydcXlWx0EndvsvQCnBEGH/vn9I+pyJQUwrRmrmmpz0UaNUcmT9 /Sc2ya+mBGNh5WrxwO+QRbMWg2b1zzlzZEZvNX/b09A2t5xmhv7j/46YY dIqRmKnQ7156lH0kdLadw7QD3ULTfcRarEseweagteoBkRi5Uost6v4LZ yDTrws+EWb2o1Kqacqz6Z/2L20IEdG5Q9Vq/jmBO03JERkUZDEqAYxgoi Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10922"; a="392056015" X-IronPort-AV: E=Sophos;i="6.04,271,1695711600"; d="scan'208";a="392056015" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2023 15:02:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10922"; a="864392027" X-IronPort-AV: E=Sophos;i="6.04,271,1695711600"; d="scan'208";a="864392027" Received: from node-10329.jf.intel.com ([10.54.34.22]) by FMSMGA003.fm.intel.com with ESMTP; 12 Dec 2023 15:02:55 -0800 From: weilin.wang@intel.com To: weilin.wang@intel.com, Ian Rogers , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Kan Liang Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Perry Taylor , Samantha Alt , Caleb Biggers , Mark Rutland , Yang Jihong Subject: [RFC PATCH v3 13/18] perf stat: Handle taken alone in hardware-grouping Date: Tue, 12 Dec 2023 15:02:19 -0800 Message-Id: <20231212230224.1473300-15-weilin.wang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231212230224.1473300-1-weilin.wang@intel.com> References: <20231212230224.1473300-1-weilin.wang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Weilin Wang Add taken alone into consideration when grouping. Only one taken alone event is supported per group. Signed-off-by: Weilin Wang --- tools/perf/pmu-events/jevents.py | 7 +++++-- tools/perf/pmu-events/pmu-events.h | 1 + tools/perf/util/metricgroup.c | 18 +++++++++++++----- tools/perf/util/metricgroup.h | 2 ++ 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index 16f17d335f8e..e5919e5e6d4a 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -55,7 +55,9 @@ _json_event_attributes =3D [ # Counter this event could use 'counter', # Longer things (the last won't be iterated over during decompress). - 'long_desc' + 'long_desc', + # Taken alone event could not be collected in the same group with othe= r taken alone event + 'taken_alone' ] =20 # Attributes that are in pmu_unit_layout. @@ -71,7 +73,7 @@ _json_metric_attributes =3D [ ] # Attributes that are bools or enum int values, encoded as '0', '1',... _json_enum_attributes =3D ['aggr_mode', 'deprecated', 'event_grouping', 'p= erpkg', - 'size', 'fixed_size' + 'size', 'fixed_size', 'taken_alone' ] =20 def removesuffix(s: str, suffix: str) -> str: @@ -331,6 +333,7 @@ class JsonEvent: extra_desc +=3D ' Spec update: ' + jd['Errata'] self.pmu =3D unit_to_pmu(jd.get('Unit')) self.counter =3D jd.get('Counter') + self.taken_alone =3D jd.get('TakenAlone') self.size =3D jd.get('Size') self.fixed_size =3D jd.get('FixedSize') filter =3D jd.get('Filter') diff --git a/tools/perf/pmu-events/pmu-events.h b/tools/perf/pmu-events/pmu= -events.h index 65e0c5dd8bb4..ce10356e9665 100644 --- a/tools/perf/pmu-events/pmu-events.h +++ b/tools/perf/pmu-events/pmu-events.h @@ -50,6 +50,7 @@ struct pmu_event { const char *unit; bool perpkg; bool deprecated; + bool taken_alone; }; =20 struct pmu_metric { diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 016ea949ba5d..78e607f3ad56 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -1624,6 +1624,7 @@ static void metricgroup__free_pmu_info(struct list_he= ad *pmu_info_list) static struct metricgroup__event_info *event_info__new(const char *name, const char *pmu_name, const char *counter, + bool taken_alone, bool free_counter) { int ret =3D 0; @@ -1638,6 +1639,7 @@ static struct metricgroup__event_info *event_info__ne= w(const char *name, pmu_name =3D "core"; =20 e->name =3D name; + e->taken_alone =3D taken_alone; e->free_counter =3D free_counter; e->pmu_name =3D pmu_name; if (free_counter) { @@ -1676,7 +1678,8 @@ static int metricgroup__add_metric_event_callback(con= st struct pmu_event *pe, if (!strcasecmp(pe->name, d->event_name)) { if (!pe->counter) return -EINVAL; - event =3D event_info__new(d->event_id, pe->pmu, pe->counter, /*free_coun= ter=3D*/false); + event =3D event_info__new(d->event_id, pe->pmu, pe->counter, + pe->taken_alone, /*free_counter=3D*/false); if (!event) return -ENOMEM; list_add(&event->nd, d->list); @@ -1799,6 +1802,8 @@ static int find_and_set_counters(struct metricgroup__= event_info *e, int ret; unsigned long find_bit =3D 0; =20 + if (e->taken_alone && current_group->taken_alone) + return -ENOSPC; if (e->free_counter) return 0; if (e->fixed_counter) { @@ -1833,11 +1838,13 @@ static int _insert_event(struct metricgroup__event_= info *e, list_add(&event->nd, &group->event_head); else list_add_tail(&event->nd, &group->event_head); + if (e->taken_alone) + group->taken_alone =3D true; return 0; } =20 /** - * Insert the new_group node at the end of the group list. + * Initialize the new group and insert it to the end of the group list. */ static int insert_new_group(struct list_head *head, struct metricgroup__group *new_group, @@ -1847,6 +1854,7 @@ static int insert_new_group(struct list_head *head, INIT_LIST_HEAD(&new_group->event_head); fill_counter_bitmap(new_group->gp_counters, 0, size); fill_counter_bitmap(new_group->fixed_counters, 0, fixed_size); + new_group->taken_alone =3D false; list_add_tail(&new_group->nd, head); return 0; } @@ -2050,8 +2058,8 @@ static int create_grouping(struct list_head *pmu_info= _list, //TODO: for each new core group, we should consider to add events that us= es fixed counters list_for_each_entry(e, event_info_list, nd) { bitmap_scnprintf(e->counters, NR_COUNTERS, bit_buf, NR_COUNTERS); - pr_debug("Event name %s, [pmu]=3D%s, [counters]=3D%s\n", e->name, - e->pmu_name, bit_buf); + pr_debug("Event name %s, [pmu]=3D%s, [counters]=3D%s, [taken_alone]=3D%d= \n", + e->name, e->pmu_name, bit_buf, e->taken_alone); ret =3D assign_event_grouping(e, pmu_info_list, &groups); if (ret) goto out; @@ -2098,7 +2106,7 @@ static int hw_aware_build_grouping(struct expr_parse_= ctx *ctx __maybe_unused, if (is_special_event(id)) { struct metricgroup__event_info *event; =20 - event =3D event_info__new(id, "default_core", "0", + event =3D event_info__new(id, "default_core", "0", false, /*free_counter=3D*/true); if (!event) goto err_out; diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h index 37fdf8c5ba77..8f6a1bb9d1ad 100644 --- a/tools/perf/util/metricgroup.h +++ b/tools/perf/util/metricgroup.h @@ -105,6 +105,7 @@ struct metricgroup__event_info { const char *pmu_name; bool fixed_counter; bool free_counter; + bool taken_alone; /** The counters the event allowed to be collected on. */ DECLARE_BITMAP(counters, NR_COUNTERS); }; @@ -154,6 +155,7 @@ struct metricgroup__group { DECLARE_BITMAP(fixed_counters, NR_COUNTERS); /** Head to the list of event names in this group*/ struct list_head event_head; + bool taken_alone; }; =20 struct metricgroup__group_events { --=20 2.39.3