From patchwork Mon Sep 18 11:52:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jing Zhang X-Patchwork-Id: 141381 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp2603696vqi; Mon, 18 Sep 2023 05:06:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGTMVFbfA3e02YVcltgTfPPeQFS6InuNbp1snelX9gnokzH0RalGoEATN/ehhKradV8A0EH X-Received: by 2002:a05:6830:1553:b0:6b9:68fb:5b73 with SMTP id l19-20020a056830155300b006b968fb5b73mr9000049otp.1.1695038806955; Mon, 18 Sep 2023 05:06:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695038806; cv=none; d=google.com; s=arc-20160816; b=PKRaOJ7F/tROl2m+kfnzCKNXd/tB+Zh6fsXTlIW0XkttPa1pPZKsthiggfDGTHWwY+ NBZ3tOeP2YshDvmeLgIGdNVoJ1QakK9/u6RuJDEbubmqgcKkYXS3EOj+h+ySYRcr6p42 t4QBeUrxafS/DKJ4YPAkRSeeoYHebmbM6cxgX/7cXXA+ofqwgfVdYDhzsM8juSQTuhUf gbWRrt0W2JV4JMj+qL0avSw2ONfGdgdwdFaR0N9ao85/oL0q0hWocFVnHsjcGuV3Y6sL VCE1ofJLvPigAov06lcUK4vyaYFkIhzpZ/VzeQklm1YrAPubVF6XksNMRa/NHbMw4emJ KfGA== 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=ZK2f8nFVgR14IJKGWpfppHgBY96nLH+q4JS2iFHYyxQ=; fh=9KkEy5BETl+n6HvtEwBLK4NkRgCt0Iv6FwLxABl1azE=; b=wtOCNp1aol3MLvpRa7ccfqB4L+Q3AeW1h+vIjQes26YR29oXcft76fqhiOU+BPHb1t IFZbyYyFe7exhsIp2DCbgaklm7S2lSQsw3KR6NIij1JzGBLgEevlcOvUD7mTf6iZgdQe XaywkX77AvYBQYE+m/OOvUK3brJ0SW5bl8L0vpmQOFXKp2HZlYaAvjwN0h9m5Faq0OZm 3uhUIFyBGfISjDoptrZ9qZqEj6wPkz5ApjahwUTJFY7F4GNSqXkpCr8KZoWRGmRGkG4x tcYyHKCPHn1LdYSol3Dyggt7X9JDQDVZhs1SuhlEY6ZQfuoigcoINp7l3DbF7B3bwlRz T1pQ== 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:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id az1-20020a056a02004100b0056aaf86a023si179918pgb.321.2023.09.18.05.06.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 05:06:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (Postfix) with ESMTP id 939F680C77B1; Mon, 18 Sep 2023 04:53:44 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241792AbjIRLxO (ORCPT + 27 others); Mon, 18 Sep 2023 07:53:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241756AbjIRLw6 (ORCPT ); Mon, 18 Sep 2023 07:52:58 -0400 Received: from out30-119.freemail.mail.aliyun.com (out30-119.freemail.mail.aliyun.com [115.124.30.119]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8A23E1; Mon, 18 Sep 2023 04:52:52 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R971e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046051;MF=renyu.zj@linux.alibaba.com;NM=1;PH=DS;RN=21;SR=0;TI=SMTPD_---0VsMQsjw_1695037965; Received: from srmbuffer011165236051.sqa.net(mailfrom:renyu.zj@linux.alibaba.com fp:SMTPD_---0VsMQsjw_1695037965) by smtp.aliyun-inc.com; Mon, 18 Sep 2023 19:52:46 +0800 From: Jing Zhang To: John Garry , Ian Rogers Cc: 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 , Jing Zhang , Shuai Xue Subject: [PATCH v9 2/7] perf metric: "Compat" supports regular expression matching identifiers Date: Mon, 18 Sep 2023 19:52:30 +0800 Message-Id: <1695037955-107983-3-git-send-email-renyu.zj@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1695037955-107983-1-git-send-email-renyu.zj@linux.alibaba.com> References: <1695037955-107983-1-git-send-email-renyu.zj@linux.alibaba.com> X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,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 fry.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 (fry.vger.email [0.0.0.0]); Mon, 18 Sep 2023 04:53:44 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777377012107979856 X-GMAIL-MSGID: 1777377012107979856 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 metric. Since a Compat value can only match one identifier, when adding the same metric 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 multiple identifiers for uncore PMU metric. Signed-off-by: Jing Zhang Reviewed-by: John Garry Reviewed-by: Ian Rogers --- tools/perf/util/metricgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 6231044..0484736 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -498,7 +498,7 @@ static int metricgroup__sys_event_iter(const struct pmu_metric *pm, while ((pmu = perf_pmus__scan(pmu))) { - if (!pmu->id || strcmp(pmu->id, pm->compat)) + if (!pmu->id || !pmu_uncore_identifier_match(pm->compat, pmu->id)) continue; return d->fn(pm, table, d->data);