Received: by 2002:a05:7412:37c9:b0:e2:908c:2ebd with SMTP id jz9csp2556307rdb; Fri, 22 Sep 2023 01:59:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHnXEt5dKHcwXRspqfZ/Uu5ghbYBEg3R90penmM7ntvLUWTBEutQpIXwuVGp359J0V0CNLo X-Received: by 2002:a67:e352:0:b0:44e:a9b6:5290 with SMTP id s18-20020a67e352000000b0044ea9b65290mr8879586vsm.19.1695373177261; Fri, 22 Sep 2023 01:59:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695373177; cv=none; d=google.com; s=arc-20160816; b=RCaTS5h8gvsQSseBlx2RrMr0D8LqOaGEtW7eIvqstpqEa/R/X/Vle9JfXr6RRrB1IA /xWde3haMORX2rVTFFhJ7/REJ05khfOzGwbHQlkh5V0gv3CsQZnnCoWLnpXsZnI3cW7X KsYipGGO+mbEtZby0XvvGViEzIIdADNlhlC+tmBXcX3T0BvRDncqLoTWR0pviRP/WkUc yLORVgeA7Ye8fo/iGg5shFetO8rYNEGEPkv3B+Pu80wnU0pENIBH1J1SZ6Yg4DAr9xoY N4FLfZvMRM09yrWP9SJhP4vzcXQ8ZJ+yUeLI65z/kKhCp9Ta0Xm+QoiXoBu+j40z9rkr tWVA== 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=RpR5N7FFMkP6kkMcplbnoCmsvx8ZHTxsogkfeQRNkus=; fh=lIlTeq0oiELndf6343Fi20K0hVEYEaY0WHJs02YKlPk=; b=nhVrGby0cUsQCeYp+lpOHU2n8yVpEDgJbku112+NeD+i8zINidnlfpSOMRaLEYu+XC FWMedGJrLfCKUszuts4sUK/R8EPEKirjavNPi7smJl9T82C+752wXiJPH4xepLgrZ4rn UyBkaOmqJsX7VQ27qRJI2cUiRp8yKhhfY5Fsmk36xwTW+qTqatkRUPvXj1+7/k1L4xN1 gfew+wr3SgmPXebldiLKPLq71vEBFeXxi0bzcTg89GIuFVQBNljRlehMOadzjZ9L1vYq JkIGChxcD6XgW14Dw7pHDqtLEu3GgnidxYUupOgkUzEnUwpU5UMnggd0C1ALwj+VHRJx OKgg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id bz14-20020a056a02060e00b00578e7a37c44si3970729pgb.42.2023.09.22.01.59.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 01:59:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id 2662483DD681; Fri, 22 Sep 2023 01:19:55 -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 S232047AbjIVITb (ORCPT + 99 others); Fri, 22 Sep 2023 04:19:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229645AbjIVITa (ORCPT ); Fri, 22 Sep 2023 04:19:30 -0400 Received: from out30-99.freemail.mail.aliyun.com (out30-99.freemail.mail.aliyun.com [115.124.30.99]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B18EF7; Fri, 22 Sep 2023 01:19:22 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R641e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046060;MF=renyu.zj@linux.alibaba.com;NM=1;PH=DS;RN=20;SR=0;TI=SMTPD_---0VscqxyT_1695370757; Received: from 30.221.145.107(mailfrom:renyu.zj@linux.alibaba.com fp:SMTPD_---0VscqxyT_1695370757) by smtp.aliyun-inc.com; Fri, 22 Sep 2023 16:19:19 +0800 Message-ID: <0f5bbe93-1875-ff9b-a1d8-8518a8cf3e84@linux.alibaba.com> Date: Fri, 22 Sep 2023 16:19:17 +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> 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,URIBL_BLOCKED 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]); Fri, 22 Sep 2023 01:19:55 -0700 (PDT) 在 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. 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 >>