From nobody Fri Feb 13 14:08:45 2026 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 D2BFFCE7A81 for ; Mon, 25 Sep 2023 06:21:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232296AbjIYGVT (ORCPT ); Mon, 25 Sep 2023 02:21:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232185AbjIYGUQ (ORCPT ); Mon, 25 Sep 2023 02:20:16 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BEFD11D; Sun, 24 Sep 2023 23:20:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695622809; x=1727158809; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=r7XoFu9otGkGBXjSMYltLA2yk70i52Up8v53Cp2OC/8=; b=J0V0t5AY2NU9CyFyc7MqXPHIBlXSp9t42am9Ah+W1h5xWWezbLSgkRnv 67CfCxKvY3rNlRnGZLAq18TZm9hx42wC5UhRvkJDV/hXQt0G/hMWq+Hb7 LR1Tpygh/+9GV4OdKFQbYLv0ZZ3dW4G/yHDDsoz+fujcOmnJu1V6L96sp ayHO67eNdeNnl30/f2kEn8tTnFvrIWJGtPTOWNtzwB019G0PhpJhi0IA1 obzCOi/vKO2twd8iZmmeKnHculeoQidFp/awZqstWAcDHWP+QllfYm+qp XaBz7OeO4ysanv7WItLEhhOvzrDMwKBcUYSVAEKv1xzk8yI9ZwUN2O93G A==; X-IronPort-AV: E=McAfee;i="6600,9927,10843"; a="445279546" X-IronPort-AV: E=Sophos;i="6.03,174,1694761200"; d="scan'208";a="445279546" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Sep 2023 23:19:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10843"; a="818494420" X-IronPort-AV: E=Sophos;i="6.03,174,1694761200"; d="scan'208";a="818494420" Received: from b49691a75598.jf.intel.com ([10.54.34.22]) by fmsmga004.fm.intel.com with ESMTP; 24 Sep 2023 23:19:23 -0700 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 Subject: [RFC PATCH 21/25] perf stat: Add tool events support in hardware-grouping Date: Sun, 24 Sep 2023 23:18:20 -0700 Message-Id: <20230925061824.3818631-22-weilin.wang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20230925061824.3818631-1-weilin.wang@intel.com> References: <20230925061824.3818631-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 tool events into default_core grouping strings if find tool events so that metrics use tool events could be correctly calculated. Need this step to support TopdownL4-L5. Signed-off-by: Weilin Wang --- tools/perf/util/metricgroup.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 3c569d838..d10f6afb0 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -1950,6 +1950,7 @@ static int assign_event_grouping(struct metricgroup__= event_info *e, =20 static int hw_aware_metricgroup__build_event_string(struct list_head *grou= p_strs, const char *modifier, + const bool tool_events[PERF_TOOL_MAX], struct list_head *groups) { struct metricgroup__pmu_group_list *p; @@ -2029,6 +2030,22 @@ static int hw_aware_metricgroup__build_event_string(= struct list_head *group_strs } ret =3D strbuf_addf(events, "}:W"); RETURN_IF_NON_ZERO(ret); + if (!strcmp(p->pmu_name, "default_core")) { + int i =3D 0; + + perf_tool_event__for_each_event(i) { + if (tool_events[i]) { + const char *tmp =3D strdup(perf_tool_event__to_str(i)); + + if (!tmp) + return -ENOMEM; + ret =3D strbuf_addstr(events, ","); + RETURN_IF_NON_ZERO(ret); + ret =3D strbuf_addstr(events, tmp); + RETURN_IF_NON_ZERO(ret); + } + } + } pr_debug("events-buf: %s\n", events->buf); list_add_tail(&new_group_str->nd, group_strs); } @@ -2094,7 +2111,8 @@ static int hw_aware_build_grouping(struct expr_parse_= ctx *ctx, pr_debug("found event %s\n", id); if (!strncmp(id, special_pattern, strlen(special_pattern))) { struct metricgroup__event_info *event; - event =3D event_info__new(id, "default_core", "0", false, true); + event =3D event_info__new(id, "default_core", "0", false, + /*free_counter=3D*/true); if (!event) { ret =3D -ENOMEM; goto err_out; @@ -2106,6 +2124,7 @@ static int hw_aware_build_grouping(struct expr_parse_= ctx *ctx, if (ret) goto err_out; } + ret =3D get_pmu_counter_layouts(&pmu_info_list, ltable); if (ret) goto err_out; @@ -2151,6 +2170,7 @@ static void metricgroup__free_grouping_strs(struct li= st_head */ static int hw_aware_parse_ids(struct perf_pmu *fake_pmu, struct expr_parse_ctx *ids, const char *modifier, + const bool tool_events[PERF_TOOL_MAX], struct evlist **out_evlist) { struct parse_events_error parse_error; @@ -2164,7 +2184,8 @@ static int hw_aware_parse_ids(struct perf_pmu *fake_p= mu, ret =3D hw_aware_build_grouping(ids, &grouping); if (ret) goto err_out; - ret =3D hw_aware_metricgroup__build_event_string(&grouping_str, modifier,= &grouping); + ret =3D hw_aware_metricgroup__build_event_string(&grouping_str, modifier, + tool_events, &grouping); if (ret) goto err_out; =20 @@ -2298,6 +2319,7 @@ static int hw_aware_parse_groups(struct evlist *perf_= evlist, struct evlist *combined_evlist =3D NULL; LIST_HEAD(metric_list); struct metric *m; + bool tool_events[PERF_TOOL_MAX] =3D {false}; int ret; bool metric_no_group =3D false; bool metric_no_merge =3D false; @@ -2316,11 +2338,14 @@ static int hw_aware_parse_groups(struct evlist *per= f_evlist, if (!metric_no_merge) { struct expr_parse_ctx *combined =3D NULL; =20 + find_tool_events(&metric_list, tool_events); + ret =3D hw_aware_build_combined_expr_ctx(&metric_list, &combined); =20 if (!ret && combined && hashmap__size(combined->ids)) { ret =3D hw_aware_parse_ids(fake_pmu, combined, /*modifier=3D*/NULL, + tool_events, &combined_evlist); } =20 --=20 2.39.3