Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp1079554rdh; Mon, 25 Sep 2023 02:36:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHpnzWlv+r7/2gH0o63VMw1vGvMhcMOtCQ+SYDif/vDPuyfWpgGUyUfcO9OZ0Lq1iuaZD04 X-Received: by 2002:a05:6870:b68f:b0:1dc:6f48:504e with SMTP id cy15-20020a056870b68f00b001dc6f48504emr8731830oab.8.1695634608315; Mon, 25 Sep 2023 02:36:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695634608; cv=none; d=google.com; s=arc-20160816; b=dyB31+y8E/ZF1PRgydiWDuUPkFfjKFvS817tAf+IWNNI42v8beb5w8LkgeG0ZuiQeB 1pU+5b4bQHHC5+A4tNwA0dBxApME/HlwP5i61IIZxTdIW2PV8+O/iuKPLHUbCIWFzTmO wE8S8J0lEfoCKG5FXvLaegUl/FMp2bJEHJSgYYZ66g5tJ+4CH+BFnKLDLmmbwA5JD1H4 KEAV7arGtL39ejim1bBzqrOt6Ilqiz8dnHtMAc87nDWwrmaW2RAPXvBYfw1w4TFLz85X GwDxJrQKapyrJ0m25qRpXTnDbUsAwrZP80AbOoOjXgah8Xi3txCeQ+MqdcEHfN3keHlX oWhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fAYH/YO0YzwdyAcuRrxg1prTjki5EDAwl5TAxkxOlAY=; fh=aicQXd2sVDKynU70/92qv+8AnsPgYK5pq7fTzS41MP4=; b=LsqYnC/XN48wWdyD6MoOYWoAe5SO0PV4inoixqtU3OXzCN+67MdXgLz+wgEAkS+t28 lyY8KcWTJjTGyvBvO1IctNXchzNt486JpEvsNdHzHhdT0bZOY0Y9BYgKiOBLNMoHgvya WTXk8FSOEPFot8ROato0JROcyqFL0t45Y07WlU1bJL/ReuzRJOSiynSMx3x7ME85MShu 6LZXaThtikKwmGtZbPmqA9OoHPYMcyR4EXYLX4oV+bYVOFuLzhtVoNW8b7xNjk3FCxXT NCAXs/gXTDbC78q5Xpmg/mQdGG+1bOdlbGgpSVB1FJl3SOEJx9cNG26ExwnJVGMhgYTn kj5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HrbZ5vwp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id z125-20020a633383000000b0057c3aaec1c8si8237380pgz.52.2023.09.25.02.36.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Sep 2023 02:36:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HrbZ5vwp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id A8519802582F; Sun, 24 Sep 2023 23:21:24 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232062AbjIYGUa (ORCPT + 99 others); Mon, 25 Sep 2023 02:20:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232109AbjIYGUM (ORCPT ); Mon, 25 Sep 2023 02:20:12 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27819101; Sun, 24 Sep 2023 23:19:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695622793; x=1727158793; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fEvccRwmikHHshQTL44ksw6sBEWAG0p1VrN7V89azF8=; b=HrbZ5vwp+IUuryuRU0q1WogMX45GjLh1rUbE1zQD2fOaeId/8odD1T8A ON0wJskPdPGzP0ZHTFfagm54c+UWKiAo6sjFNY86iYbFwl/AbF0mGD6oq BgKdD8cdm7wN5glZVyxBxUB8HtVU/HWu3tZuew8/8/8bTJadUhEoVv78J oB4U7d13UAQimpsjebt2PGpP8UvNsLO6Awvn3BJ6/6eYPqk2KTQGy7ZC3 YJd7Qqp0BEFgbVnkkitSNclGpmbhRhamOT/Rpio9WwEnWstVcC5nYeoKk IMiAriaIEL7qh8pbe4tA43TNa7T74Z7IONuEHYhPoj3BAM6zhYs9WFzGj Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10843"; a="445279428" X-IronPort-AV: E=Sophos;i="6.03,174,1694761200"; d="scan'208";a="445279428" 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:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10843"; a="818494345" X-IronPort-AV: E=Sophos;i="6.03,174,1694761200"; d="scan'208";a="818494345" Received: from b49691a75598.jf.intel.com ([10.54.34.22]) by fmsmga004.fm.intel.com with ESMTP; 24 Sep 2023 23:19:14 -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 07/25] perf stat: Add helper functions for hardware-grouping method Date: Sun, 24 Sep 2023 23:18:06 -0700 Message-Id: <20230925061824.3818631-8-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: 8bit X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sun, 24 Sep 2023 23:21:25 -0700 (PDT) From: Weilin Wang Add metricgroup__event_info data structure to represent an event in the metric grouping context; the list of counters and the PMU name an event should be collected with. Add functions to parse event counter info from pmu-events and generate a list of metricgroup__event_info data to prepare grouping. Signed-off-by: Weilin Wang --- tools/perf/util/metricgroup.c | 197 +++++++++++++++++++++++++++++++++- tools/perf/util/metricgroup.h | 18 ++++ 2 files changed, 212 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 063c92c71..7f2c1b017 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -1432,6 +1432,183 @@ static int build_combined_expr_ctx(const struct list_head *metric_list, return ret; } +/** + * set_counter_bitmap - The counter bit mapping: [8-15,0-7], e.g. the GP0 is the + * 8th bit and GP7 is the 1st bit in this 16-bits bitmap. The is helpful to + * assign GP4-7 before GP0-3 because some events can be collected using GP0-3 + * only on some platforms. + */ +static int set_counter_bitmap(int pos, unsigned long *bitmap) +{ + if (pos >= NR_COUNTERS || pos < 0) + return -EINVAL; + if (pos <= 7) + pos = 7 - pos; + else + pos = 23 - pos; + *bitmap |= 1ul << pos; + return 0; +} + +static int parse_fixed_counter(const char *counter, + unsigned long *bitmap, + bool *fixed) +{ + int ret = -ENOENT; + //TODO: this pattern is different on some other platforms + const char *pattern = "Fixed counter "; + int pos = 0; + + if (!strncmp(counter, pattern, strlen(pattern))) { + pos = atoi(counter + strlen(pattern)); + ret = set_counter_bitmap(pos, bitmap); + if (ret) + return ret; + *fixed = true; + return 0; + } + return ret; +} + +/** + * parse_counter - Parse event counter info from pmu-events and set up bitmap + * accordingly. + * + * @counter: counter info string to be parsed. + * @bitmap: bitmap to set based on counter info parsed. + * @fixed: is set to true if the event uses fixed counter. + */ +static int parse_counter(const char *counter, + unsigned long *bitmap, + bool *fixed) +{ + int ret = 0; + char *p; + char *tok; + int pos = 0; + + ret = parse_fixed_counter(counter, bitmap, fixed); + // ret==0 means matched with fixed counter + if (ret == 0) + return ret; + + p = strdup(counter); + tok = strtok(p, ","); + if (!tok) + return -ENOENT; + + while (tok) { + pos = atoi(tok); + ret = set_counter_bitmap(pos, bitmap); + if (ret) + return ret; + tok = strtok(NULL, ","); + } + return 0; +} + +static struct metricgroup__event_info *event_info__new(const char *name, + const char *pmu_name, + const char *counter, + bool free_counter) +{ + int ret = 0; + char *bit_buf = malloc(NR_COUNTERS); + bool fixed_counter = false; + struct metricgroup__event_info *e; + e = zalloc(sizeof(*e)); + if (!e) + return NULL; + if (!pmu_name) { + pmu_name = "core"; + } + e->name = name; + e->free_counter = free_counter; + e->pmu_name = strdup(pmu_name); + if (free_counter) { + ret = set_counter_bitmap(0, e->counters); + if (ret) + return NULL; + } else { + ret = parse_counter(counter, e->counters, &fixed_counter); + if (ret) + return NULL; + e->fixed_counter = fixed_counter; + } + + bitmap_scnprintf(e->counters, NR_COUNTERS, bit_buf, NR_COUNTERS); + pr_debug("Event %s requires pmu %s counter: %s bitmap %s, [pmu=%s]\n", + e->name, e->pmu_name, counter, bit_buf, pmu_name); + + return e; +} + +struct metricgroup__add_metric_event_data { + struct list_head *list; + /* pure event name, exclude umask and other info*/ + const char *event_name; + /* event name and umask if applicable*/ + const char *event_id; +}; + +static int metricgroup__add_metric_event_callback(const struct pmu_event *pe, + const struct pmu_events_table *table __maybe_unused, + void *data) +{ + struct metricgroup__event_info *event; + struct metricgroup__add_metric_event_data *d = data; + + if (!strcasecmp(pe->name, d->event_name)) { + event = event_info__new(d->event_id, pe->pmu, pe->counter, /*free_counter=*/false); + if (!event) + return -ENOMEM; + list_add(&event->nd, d->list); + } + + return 0; +} + +/** + * get_metricgroup_events - Find counter requirement of events from the + * pmu_events table + * @full_id: the full event identifiers. + * @table: pmu_events table that is searched for event data. + * @event_info_list: the list that the new event counter info added to. + */ +static int get_metricgroup_events(const char *full_id, + const struct pmu_events_table *table, + struct list_head *event_info_list) +{ + LIST_HEAD(list); + int ret = 0; + const char *id; + const char *rsep, *sep = strchr(full_id, '@'); + + if (sep) { + rsep = strchr(full_id, ','); + id = strndup(sep + 1, rsep - sep - 1); + if (ret) + goto out; + } else { + id = full_id; + } + { + struct metricgroup__add_metric_event_data data = { + .list = &list, + .event_name = id, + .event_id = full_id, + }; + ret = pmu_events_table_for_each_event(table, + metricgroup__add_metric_event_callback, &data); + if (ret) + goto out; + } + +out: + list_splice(&list, event_info_list); + return ret; +} + /** * hw_aware_build_grouping - Build event groupings by reading counter * requirement of the events and counter available on the system from @@ -1445,9 +1622,25 @@ static int hw_aware_build_grouping(struct expr_parse_ctx *ctx __maybe_unused, const char *modifier __maybe_unused) { int ret = 0; + struct hashmap_entry *cur; + LIST_HEAD(pmu_info_list); + LIST_HEAD(event_info_list); + size_t bkt; + const struct pmu_events_table *etable = pmu_events_table__find(); + +#define RETURN_IF_NON_ZERO(x) do { if (x) return x; } while (0) + hashmap__for_each_entry(ctx->ids, cur, bkt) { + const char *id = cur->pkey; + + pr_debug("found event %s\n", id); + + ret = get_metricgroup_events(id, etable, &event_info_list); + if (ret) + return ret; + } - pr_debug("This is a placeholder\n"); return ret; +#undef RETURN_IF_NON_ZERO } static void group_str_free(struct metricgroup__group_strs *g) @@ -1521,8 +1714,6 @@ static int hw_aware_parse_ids(struct perf_pmu *fake_pmu, *out_evlist = parsed_evlist; parsed_evlist = NULL; err_out: - parse_events_error__exit(&parse_error); - evlist__delete(parsed_evlist); metricgroup__free_grouping_strs(&groupings); return ret; } diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h index 89809df85..e493f6965 100644 --- a/tools/perf/util/metricgroup.h +++ b/tools/perf/util/metricgroup.h @@ -5,6 +5,7 @@ #include #include #include +#include #include "pmu-events/pmu-events.h" #include "strbuf.h" @@ -67,6 +68,23 @@ struct metric_expr { int runtime; }; +/* Maximum number of counters per PMU*/ +#define NR_COUNTERS 16 +/** + * An event used in a metric. This info is for metric grouping. + */ +struct metricgroup__event_info { + struct list_head nd; + /** The name of the event. */ + const char *name; + /** The name of the pmu the event be collected on. */ + const char *pmu_name; + bool fixed_counter; + bool free_counter; + /** The counters the event allowed to be collected on. */ + DECLARE_BITMAP(counters, NR_COUNTERS); +}; + /** * Each group is one node in the group string list. */ -- 2.39.3