Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp1315194rdg; Fri, 13 Oct 2023 18:53:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFgSb906AHUl7rSE2f14S3hIco4NfXIe2/dF8u4pvN56qK9GCNsUrFVnsWoTnKB2H1i44Dm X-Received: by 2002:a05:620a:4310:b0:76f:19f9:82a6 with SMTP id u16-20020a05620a431000b0076f19f982a6mr31820126qko.21.1697248387301; Fri, 13 Oct 2023 18:53:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697248387; cv=none; d=google.com; s=arc-20160816; b=hD8hOh4UJ8LMg59/mUK7FR0Y4tqCdorZSuXuAbrPFexcCrp4XvsdnixxrfY3GQqwak XjHA/BgT8miLhRwTuVavAylkb/ky6rWsR3JCKMLy9OrLfPdgkxNIq5s1VnTjj2BZ5v02 VJ7CErunRI+HTLhBmoL7WTZXzTUqhdb75QOBIgX3F8zpe1QnLmUjit9XM0HFxlDS3hk2 3sNXTBq6LvaligAuORPWh5HpSRVTbJRX0lCTqFW0o7quPfsWXpbKLl/JR9l0hzuV7Xcm 7I/IrCVfE3eU5LyNFnz2kB4vJN/lrXqpd+PRjnhAjkIdZaXC94uQVWkrgTQw/IuectWR AX7w== 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=4Spw3LgmxQFN++un4kn8mlyw5mKNePTBBcI5tLJlZ8g=; fh=fjecWn2tsXHKF5pPtw+gI2dQE/iSXdFsWSc8KUP/zmc=; b=IBOa74tFmIeRNsXCZ10V+veHxSbTGP3kq4LFQ+2kjl6BXCyEeuU5N+oM0S3y1jjFWf cHM2nB+xPvVQD3tpuQWnys9xsKI0UOuh+/W0I71027Zy9+ikoBDMmD2WiTmVswQYdVZi cCcmtWs/hbCodidDi/9JDo58ZkXm2TYtm0p9xJzP8oWxhXhIa2Z7kAoPSjVoM6w3P+SS Z2hKSWI8D/k0JpF7yKiukB6hcLgm7t+zJvgWTCvEUV5LZvb/k/2PfR2LbRfkRTAdlCLg 2tcMoOhvyHtH2jmDLIN/WF1rC4g6lTdeAI7IoXMkToGTP2J4jQDak8dFPNLAe/Zd6D2z K5YA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Y2Ufvpaq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id p20-20020a639514000000b005ad6babc019si1793376pgd.479.2023.10.13.18.53.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 18:53:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Y2Ufvpaq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 4F3C68260C3B; Fri, 13 Oct 2023 18:53:02 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232786AbjJNBwc (ORCPT + 99 others); Fri, 13 Oct 2023 21:52:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232730AbjJNBw1 (ORCPT ); Fri, 13 Oct 2023 21:52:27 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F41D8B7; Fri, 13 Oct 2023 18:52:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697248345; x=1728784345; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ucms9PcDVzc6u5A1kJWl+5kF+z6+f70CH8rXovuIyGc=; b=Y2UfvpaqUupmXv+pBetGePWhYNhOqtx7S2e7e3GrFo5oiBe1uyQOh2T/ B466VuG0O+BtoyiPmvOyoBFRVnphyVfV0KmSG2fH6IWyibpoY7cOhOyWf a4fbg5WrwXIK39Vafhmi1htPUf7jXfEvjRBN8PE6Fmo0jVB7ugZJZbCRb vUdQQDwypYpJU08PNSRcLUGaGYt/VGtn/ZQ2FLHPYgGPw8lP4un4Bvh4z IaL9hc/ukwl5crWBeue4ObU2pwhnU5bF4MTetlmkRMYAApwzSflSWgSRb PkrRIiCZT8q6eiLBaY129E7PRt0ki7WSygdeQE6y0j4X9/x2JZHB4gMGf A==; X-IronPort-AV: E=McAfee;i="6600,9927,10862"; a="389154702" X-IronPort-AV: E=Sophos;i="6.03,223,1694761200"; d="scan'208";a="389154702" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2023 18:52:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10862"; a="731565676" X-IronPort-AV: E=Sophos;i="6.03,223,1694761200"; d="scan'208";a="731565676" Received: from b49691a75598.jf.intel.com ([10.54.34.22]) by orsmga006.jf.intel.com with ESMTP; 13 Oct 2023 18:52:19 -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 , Yang Jihong Subject: [RFC PATCH v2 07/17] perf stat: Add functions to set counter bitmaps for hardware-grouping method Date: Fri, 13 Oct 2023 18:51:52 -0700 Message-Id: <20231014015202.1175377-8-weilin.wang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231014015202.1175377-1-weilin.wang@intel.com> References: <20231014015202.1175377-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 agentk.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 (agentk.vger.email [0.0.0.0]); Fri, 13 Oct 2023 18:53:02 -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 | 196 +++++++++++++++++++++++++++++++++- tools/perf/util/metricgroup.h | 27 +++++ 2 files changed, 220 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 8d4e29eb1..6af8a7341 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -1432,6 +1432,182 @@ 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. It is helpful for + * assigning 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 = TRANSFER_FIRST_BYTE(pos); + else + pos = TRANSFER_SEC_BYTE(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); + } + +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 +1621,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 +1713,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..3704545c9 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,32 @@ struct metric_expr { int runtime; }; +/* Maximum number of counters per PMU*/ +#define NR_COUNTERS 16 +/* + * Transfer bit position in the bitmap to ensure start assigning counter from + * the last GP counter to the first. + * bit15 <---> bit0 + * [GP8-GP15] [GP0-GP7] + */ +#define TRANSFER_FIRST_BYTE(pos) (7 - pos) +#define TRANSFER_SEC_BYTE(pos) (23 - pos) + +/** + * 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