From patchwork Fri Jan 13 09:22:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jing Zhang X-Patchwork-Id: 43107 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp171693wrt; Fri, 13 Jan 2023 01:30:54 -0800 (PST) X-Google-Smtp-Source: AMrXdXsJOz3Dhbk+EHY+2p62Wxjrd/bvdhBOX0MvWzSQ3bHyj5Mqt4dVnReDVA+ngsAaQVJqf8Xv X-Received: by 2002:a17:907:c203:b0:7ad:84c7:503a with SMTP id ti3-20020a170907c20300b007ad84c7503amr65922618ejc.72.1673602254698; Fri, 13 Jan 2023 01:30:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673602254; cv=none; d=google.com; s=arc-20160816; b=xc5yisW9owwp9ZEPNlJpv43N3zniiWe5jtuYfw4RL9uuJm11bpENtvi7bjzO719MJ+ jpn+2+DS8oSXtNezyBvwYwxeEUXTgcTwFAmn+X6LX2wSaCBmIYysFRQ79l+iVufWGo2l zrr/WtryGXwBo2O/PQ47wRJWL7fTJS/PzfexduZMbh1guBYic4ifZt4bkAcLxXFjXMnV vjhSiW2xW9sFgKjz3573yk7erQPegieCFUXRgFg6eK08/Qtee7Sypabyhe+gyra+SWOT 0Jn8FRuC5ptJ1mvR7DWHklOssMPpBLAIsBMJK24ewMGgs9itKNilK6NiEbv7pnCz06wD Sc+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=GsBzg0ChG5I9QnY7w6OGo69cPpZyL98hO3MsHndTAUc=; b=GGLjiu0EcbLQqgSoNsX5D+0rqyxgDaj/xNtNG9gZrPC2pVaUUxe7BXa7cUfWb3TCSr TOmr7oHEkNVQFF4fIeF3C801qlWLLyQY3SQPzMQwhzK1mTZaYNtp8Ljt3z27zjDd9Lgd dfMAKbBiMV7IkFwjrb6LoYWDWK/IRA7gUptDYoz+9oAuMLJK1ApGuZFC8hCoYvjRhGRR lDNgZQiTMYPqI3Kz9fs9ehFk15hN0LmbneGji0vzCHjpI6XaSYGHZ9XshSEAoo8Xr0tG WWEBB0PMDmy6gJwdzur23bxZk5XSLBvnXWlywxP6PH4tjkobolNg6NyYdQ456/QrfgEx FfWw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l16-20020a056402029000b00499c59c0ac1si9222518edv.148.2023.01.13.01.30.29; Fri, 13 Jan 2023 01:30:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241076AbjAMJ2g (ORCPT + 99 others); Fri, 13 Jan 2023 04:28:36 -0500 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 S231416AbjAMJ1R (ORCPT ); Fri, 13 Jan 2023 04:27:17 -0500 Received: from out30-97.freemail.mail.aliyun.com (out30-97.freemail.mail.aliyun.com [115.124.30.97]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4260E42E1A; Fri, 13 Jan 2023 01:22:39 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R601e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=renyu.zj@linux.alibaba.com;NM=1;PH=DS;RN=21;SR=0;TI=SMTPD_---0VZUDRTA_1673601753; Received: from srmbuffer011165236051.sqa.eu95(mailfrom:renyu.zj@linux.alibaba.com fp:SMTPD_---0VZUDRTA_1673601753) by smtp.aliyun-inc.com; Fri, 13 Jan 2023 17:22:34 +0800 From: Jing Zhang To: John Garry , Ian Rogers Cc: Xing Zhengjun , Will Deacon , James Clark , Mike Leach , Leo Yan , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Andrew Kilroy , Shuai Xue , Zhuo Song , Jing Zhang Subject: [PATCH v7 1/9] perf pmu: Add #slots literal support for arm64 Date: Fri, 13 Jan 2023 17:22:12 +0800 Message-Id: <1673601740-122788-2-git-send-email-renyu.zj@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1673601740-122788-1-git-send-email-renyu.zj@linux.alibaba.com> References: <1673601740-122788-1-git-send-email-renyu.zj@linux.alibaba.com> X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754899157464454052?= X-GMAIL-MSGID: =?utf-8?q?1754899157464454052?= The slots in each architecture may be different, so add #slots literal to obtain the slots of different architectures, and the #slots can be applied in the metric. Currently, The #slots just support for arm64, and other architectures will return NAN. On arm64, the value of slots is from the register PMMIR_EL1.SLOT, which I can read in /sys/bus/event_source/device/armv8_pmuv3_*/caps/slots. PMMIR_EL1.SLOT might read as zero if the PMU version is lower than ID_AA64DFR0_EL1_PMUVer_V3P4 or the STALL_SLOT event is not implemented. Signed-off-by: Jing Zhang --- tools/perf/arch/arm64/util/pmu.c | 34 ++++++++++++++++++++++++++++++++-- tools/perf/util/expr.c | 5 +++++ tools/perf/util/pmu.c | 6 ++++++ tools/perf/util/pmu.h | 1 + 4 files changed, 44 insertions(+), 2 deletions(-) diff --git a/tools/perf/arch/arm64/util/pmu.c b/tools/perf/arch/arm64/util/pmu.c index 477e513..5f8667b 100644 --- a/tools/perf/arch/arm64/util/pmu.c +++ b/tools/perf/arch/arm64/util/pmu.c @@ -3,8 +3,9 @@ #include #include "../../../util/cpumap.h" #include "../../../util/pmu.h" +#include -const struct pmu_events_table *pmu_events_table__find(void) +static struct perf_pmu *pmu_core__find_same(void) { struct perf_pmu *pmu = NULL; @@ -19,8 +20,37 @@ const struct pmu_events_table *pmu_events_table__find(void) if (pmu->cpus->nr != cpu__max_cpu().cpu) return NULL; - return perf_pmu__find_table(pmu); + return pmu; } return NULL; } + +const struct pmu_events_table *pmu_events_table__find(void) +{ + struct perf_pmu *pmu = pmu_core__find_same(); + + if (pmu) + return perf_pmu__find_table(pmu); + + return NULL; +} + +double perf_pmu__cpu_slots_per_cycle(void) +{ + char path[PATH_MAX]; + unsigned long long slots = 0; + struct perf_pmu *pmu = pmu_core__find_same(); + + if (pmu) { + scnprintf(path, PATH_MAX, + EVENT_SOURCE_DEVICE_PATH "%s/caps/slots", pmu->name); + /* + * The value of slots is not greater than 32 bits, but sysfs__read_int + * can't read value with 0x prefix, so use sysfs__read_ull instead. + */ + sysfs__read_ull(path, &slots); + } + + return (double)slots; +} diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c index 00dcde3..9d3076a 100644 --- a/tools/perf/util/expr.c +++ b/tools/perf/util/expr.c @@ -19,6 +19,7 @@ #include #include #include +#include "pmu.h" #ifdef PARSER_DEBUG extern int expr_debug; @@ -448,6 +449,10 @@ double expr__get_literal(const char *literal, const struct expr_scanner_ctx *ctx result = topology->core_cpus_lists; goto out; } + if (!strcmp("#slots", literal)) { + result = perf_pmu__cpu_slots_per_cycle() ?: NAN; + goto out; + } pr_err("Unrecognized literal '%s'", literal); out: diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 2bdeb89..cbb4fbf 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "debug.h" #include "evsel.h" #include "pmu.h" @@ -1993,3 +1994,8 @@ int perf_pmu__cpus_match(struct perf_pmu *pmu, struct perf_cpu_map *cpus, *ucpus_ptr = unmatched_cpus; return 0; } + +double __weak perf_pmu__cpu_slots_per_cycle(void) +{ + return NAN; +} diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 69ca000..fd414ba 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -259,4 +259,5 @@ int perf_pmu__cpus_match(struct perf_pmu *pmu, struct perf_cpu_map *cpus, char *pmu_find_real_name(const char *name); char *pmu_find_alias_name(const char *name); +double perf_pmu__cpu_slots_per_cycle(void); #endif /* __PMU_H */