Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp928412rdh; Sun, 24 Sep 2023 19:20:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGN1k4zcHRlyDbPKYo0bREwNLRqu3h7ot5WrMjpIjS8BfQfClQTYVqo5fySTCs3BWJyfqOX X-Received: by 2002:a05:6a00:1a56:b0:68f:cc47:fcd7 with SMTP id h22-20020a056a001a5600b0068fcc47fcd7mr6921927pfv.28.1695608420960; Sun, 24 Sep 2023 19:20:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695608420; cv=none; d=google.com; s=arc-20160816; b=iGFBA0EumI40syVhvFeiafgbwEngjyJn3cr8zPAeJ9DGMbN2DKxbp2AKIkw9Sc4KX7 V/Dj+LS2eZuUAJtnHpiWljIrn5mQKddpgBSFv2G96sqSyJ/6rB7aok8MDBMCMAPm2Osx b+W4+poW4uaRsIeHOPmnSuZVGrW2xIDD8b1QG67tFr8hjgfeHS74E3C3nL3OnTzoBs0G T+/Kr/n1jTutNjyyvnHcbItrz/Cf9of7MH3m7DujGiBerv42HLcvTJUlxQBkDO7cOnqb 7+GCDK55R1rHMpgvgTSgj79Loc5oJ2QRxXiDRt+MwFaJfcJ/DSmMMniKG8l9PZVjHsIe BokA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:subject:user-agent:mime-version:date:message-id; bh=fdWR/OL88NQYuAbMRwBR6TSKNyURH8uN2jK0/yYo2RA=; fh=lIlTeq0oiELndf6343Fi20K0hVEYEaY0WHJs02YKlPk=; b=LQjCUIUWs9zM6jR+u08v3zV0z+1ayz/2mjoV1sSWqpLJ1VF57Bbevb+ICvAGDENBgV 9rcRwzmwARNVz/ExoZKOwOqPaLbrD6uHLIYh6Y9H4uNp32m7D6VYEmPetpawxbH/3mVh i6vx9MNDmfgLIW2dfE0lybLbjqO4XiUxiwwA1Jwtez+koGp/Z0KABzUbBRAq2X8ijCvI RUku25mDgnYedEp+GerDGYFl8HeA7+cyQT8D7NEccOSIQcCfS7XgRkWWXMdjk1bk2cqD UfW86rRYbZSGX7KhO3qRNMzZPw9xq9p5zdgd3cKveOxWV1XkhsCQCn3+yulcAo4C+OUC oo9w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id cn6-20020a056a00340600b0069100e4252csi7745373pfb.105.2023.09.24.19.20.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 19:20:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 5B10D818C7AE; Sun, 24 Sep 2023 19:20:18 -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 S231532AbjIYCUK (ORCPT + 99 others); Sun, 24 Sep 2023 22:20:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229561AbjIYCUK (ORCPT ); Sun, 24 Sep 2023 22:20:10 -0400 Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03E6FCF; Sun, 24 Sep 2023 19:20:01 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R101e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045192;MF=renyu.zj@linux.alibaba.com;NM=1;PH=DS;RN=20;SR=0;TI=SMTPD_---0VsjlH5P_1695608397; Received: from 30.221.145.8(mailfrom:renyu.zj@linux.alibaba.com fp:SMTPD_---0VsjlH5P_1695608397) by smtp.aliyun-inc.com; Mon, 25 Sep 2023 10:19:59 +0800 Message-ID: Date: Mon, 25 Sep 2023 10:19:55 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Subject: Re: [PATCH v9 1/7] perf pmu: "Compat" supports regular expression matching identifiers To: Ian Rogers Cc: John Garry , Will Deacon , James Clark , Arnaldo Carvalho de Melo , Mark Rutland , Mike Leach , Leo Yan , Namhyung Kim , Peter Zijlstra , Ingo Molnar , Alexander Shishkin , Jiri Olsa , Adrian Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-doc@vger.kernel.org, Zhuo Song , Shuai Xue References: <1695037955-107983-1-git-send-email-renyu.zj@linux.alibaba.com> <1695037955-107983-2-git-send-email-renyu.zj@linux.alibaba.com> <0f5bbe93-1875-ff9b-a1d8-8518a8cf3e84@linux.alibaba.com> From: Jing Zhang In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.2 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY 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]); Sun, 24 Sep 2023 19:20:18 -0700 (PDT) 在 2023/9/22 下午10:58, Ian Rogers 写道: > On Fri, Sep 22, 2023 at 1:19 AM Jing Zhang wrote: >> >> >> >> 在 2023/9/21 上午2:36, Ian Rogers 写道: >>> On Mon, Sep 18, 2023 at 4:52 AM Jing Zhang wrote: >>>> >>>> The jevent "Compat" is used for uncore PMU alias or metric definitions. >>>> >>>> The same PMU driver has different PMU identifiers due to different >>>> hardware versions and types, but they may have some common PMU event. >>>> Since a Compat value can only match one identifier, when adding the >>>> same event alias to PMUs with different identifiers, each identifier >>>> needs to be defined once, which is not streamlined enough. >>>> >>>> So let "Compat" support using regular expression to match identifiers >>>> for uncore PMU alias. For example, if the "Compat" value is set to >>>> "43401|43c01", it would be able to match PMU identifiers such as "43401" >>>> or "43c01", which correspond to CMN600_r0p0 or CMN700_r0p0. >>>> >>>> Signed-off-by: Jing Zhang >>>> --- >>>> tools/perf/util/pmu.c | 23 +++++++++++++++++++++-- >>>> tools/perf/util/pmu.h | 1 + >>>> 2 files changed, 22 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c >>>> index e215985..7e2242f 100644 >>>> --- a/tools/perf/util/pmu.c >>>> +++ b/tools/perf/util/pmu.c >>>> @@ -28,6 +28,7 @@ >>>> #include "strbuf.h" >>>> #include "fncache.h" >>>> #include "util/evsel_config.h" >>>> +#include >>>> >>>> struct perf_pmu perf_pmu__fake = { >>>> .name = "fake", >>>> @@ -875,6 +876,24 @@ static bool pmu_uncore_alias_match(const char *pmu_name, const char *name) >>>> return res; >>>> } >>>> >>>> +bool pmu_uncore_identifier_match(const char *compat, const char *id) >>>> +{ >>>> + regex_t re; >>>> + regmatch_t pmatch[1]; >>>> + int match; >>>> + >>>> + if (regcomp(&re, compat, REG_EXTENDED) != 0) { >>>> + /* Warn unable to generate match particular string. */ >>>> + pr_info("Invalid regular expression %s\n", compat); >>>> + return false; >>>> + } >>>> + >>>> + match = !regexec(&re, id, 1, pmatch, 0); >>> >>> I wonder if we can make the regular expressions like >>> "^(434|436|43c|43a)" more like "(434|436|43c|43a).*", so that we fully >>> match the id string, by here doing: >>> >>> if (match) { >>> /* Ensure a full match. */ >>> match = pmatch[0].rm_so == 0 && pmatch[0].rm_eo == strlen(id); >>> } >>> >> >> Ok, will do. >> >> >>> I think longer term we can use jevents.py to generate a pmu-events.l, >>> which would have a contents something like: >>> >>> (434|436|43c|43a).* { return PMU_....;} >>> >>> That should make the matching faster but may add some restrictions >>> onto the regular expression. >> >> Could you please describe the function of pmu-event.l in more detail? I may not fully understand it. > > So for now there's no need for a pmu-event.l, I'm fine with the code > as-is. The issue for using regular expressions is that we need to > compile (regcomp) then use them (regexec), and in this new code the > result of the parsing is discarded - perhaps we can save on some > compiling with a 1 element cache, let's wait to see performance data > saying it is an issue. If we were to compile the regular expressions > at build time with flex then the runtime cost, any caching, etc. is > unnecessary. > I see, thanks for the explanation. Thanks, Jing > Hope this makes sense. Thanks, > Ian > >> Thanks, >> Jing >> >>> >>> Thanks, >>> Ian >>> >>>> + regfree(&re); >>>> + >>>> + return match; >>>> +} >>>> + >>>> static int pmu_add_cpu_aliases_map_callback(const struct pmu_event *pe, >>>> const struct pmu_events_table *table __maybe_unused, >>>> void *vdata) >>>> @@ -915,8 +934,8 @@ static int pmu_add_sys_aliases_iter_fn(const struct pmu_event *pe, >>>> if (!pe->compat || !pe->pmu) >>>> return 0; >>>> >>>> - if (!strcmp(pmu->id, pe->compat) && >>>> - pmu_uncore_alias_match(pe->pmu, pmu->name)) { >>>> + if (pmu_uncore_alias_match(pe->pmu, pmu->name) && >>>> + pmu_uncore_identifier_match(pe->compat, pmu->id)) { >>>> perf_pmu__new_alias(pmu, >>>> pe->name, >>>> pe->desc, >>>> diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h >>>> index bd5d804..fc155ce 100644 >>>> --- a/tools/perf/util/pmu.h >>>> +++ b/tools/perf/util/pmu.h >>>> @@ -240,6 +240,7 @@ void pmu_add_cpu_aliases_table(struct perf_pmu *pmu, >>>> char *perf_pmu__getcpuid(struct perf_pmu *pmu); >>>> const struct pmu_events_table *pmu_events_table__find(void); >>>> const struct pmu_metrics_table *pmu_metrics_table__find(void); >>>> +bool pmu_uncore_identifier_match(const char *compat, const char *id); >>>> >>>> int perf_pmu__convert_scale(const char *scale, char **end, double *sval); >>>> >>>> -- >>>> 1.8.3.1 >>>>