From patchwork Wed Sep 27 05:59:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jing Zhang X-Patchwork-Id: 145200 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp2423778vqu; Tue, 26 Sep 2023 23:28:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG4RG79gaxBqrOlx8KGcHNAp63CkQ6HhZu4khx7KLvf022qozwBcyQSNo1F81QZPIEt6OUD X-Received: by 2002:a05:6870:c0c4:b0:1d6:5658:7989 with SMTP id e4-20020a056870c0c400b001d656587989mr1544484oad.19.1695796113792; Tue, 26 Sep 2023 23:28:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695796113; cv=none; d=google.com; s=arc-20160816; b=YJYNRSDF5fn1VExjlsm5oUeepNNrRRQ8PUXqlWxe5i3op+zUFS6p8IQjIgwMLyvyl+ HtAsJs7NjPNWm+kSS00lsXy47TRrOLWRuKIXmIWRcXdjqXvLhsidAu2nclh6lyOvHcUj +kcqhWAEVVnbeI2o/yPBp0BCilPBUt7lSUKMQHd1zDRmyk8QQxF9JJv1MRSb4yFtFI60 qo5552DFtTVJgLIeRUsP/easEsfujQnLaJtpq438w5YMFNss3ozz6K7adQXetS7vlDnk CPQmE5Pr10f01naDTcuLPKmYuO+sqGn6tdhHMtCA9hbE43WgJDedUkC0iLaq9Yi969Xb 1dRw== 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=sFDDLKquK77T2WKkxgYQ4z0bK1eLf1PsNnqDgQ25TeI=; fh=9KkEy5BETl+n6HvtEwBLK4NkRgCt0Iv6FwLxABl1azE=; b=0ojpDMNI3zzNlG7mKELDUFvpn1UmiI/JB1gOnDRN3oIMRhhIW2wx01ShuzYQCSOxhA a5kffUY4BnxViVf/uFIeDE+aj5J7giLC3Y7ABYQ7pWXXrR/3vIIqv811gT1LWe9KJiHG 0tn+d31UpXoaoJt/xSS0AOE4TbvhCA6M7XrjPAq8k+7UkLIMw0rpTTVPYmHRl9igEW9y Kxg3pn1Aq27Nm5jpogsH+6ZQtTbtOVuAz41A10FlYtdwyI5EE3OYiNQzA858kmhOBvWh LweiJlPABgWBqgt53fnDThQzoXWroo/U0hG3J8Ef0aBgonuU+zVZ7SeEzzhb7qPcbPNF QXaw== 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:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id s64-20020a635e43000000b0056ae965c533si14790811pgb.16.2023.09.26.23.28.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 23:28:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id EFA7B802D46F; Tue, 26 Sep 2023 23:00:35 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229672AbjI0GAR (ORCPT + 25 others); Wed, 27 Sep 2023 02:00:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229550AbjI0GAI (ORCPT ); Wed, 27 Sep 2023 02:00:08 -0400 Received: from out30-131.freemail.mail.aliyun.com (out30-131.freemail.mail.aliyun.com [115.124.30.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DAAAADE; Tue, 26 Sep 2023 23:00:06 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R161e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046056;MF=renyu.zj@linux.alibaba.com;NM=1;PH=DS;RN=21;SR=0;TI=SMTPD_---0VszCdNo_1695794403; Received: from srmbuffer011165236051.sqa.net(mailfrom:renyu.zj@linux.alibaba.com fp:SMTPD_---0VszCdNo_1695794403) by smtp.aliyun-inc.com; Wed, 27 Sep 2023 14:00:04 +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 v11 4/7] perf test: Make matching_pmu effective Date: Wed, 27 Sep 2023 13:59:48 +0800 Message-Id: <1695794391-34817-5-git-send-email-renyu.zj@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1695794391-34817-1-git-send-email-renyu.zj@linux.alibaba.com> References: <1695794391-34817-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,RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 26 Sep 2023 23:00:36 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778171105709135225 X-GMAIL-MSGID: 1778171105709135225 The perf_pmu_test_event.matching_pmu didn't work. No matter what its value is, it does not affect the test results. So let matching_pmu be used for matching perf_pmu_test_pmu.pmu.name. Signed-off-by: Jing Zhang Reviewed-by: John Garry Reviewed-by: Ian Rogers Tested-by: Ian Rogers --- tools/perf/tests/pmu-events.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index f5321fb..0cf572f 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -245,7 +245,7 @@ struct perf_pmu_test_pmu { }, .alias_str = "event=0x2b", .alias_long_desc = "ddr write-cycles event", - .matching_pmu = "uncore_sys_ddr_pmu", + .matching_pmu = "uncore_sys_ddr_pmu0", }; static const struct perf_pmu_test_event sys_ccn_pmu_read_cycles = { @@ -259,7 +259,7 @@ struct perf_pmu_test_pmu { }, .alias_str = "config=0x2c", .alias_long_desc = "ccn read-cycles event", - .matching_pmu = "uncore_sys_ccn_pmu", + .matching_pmu = "uncore_sys_ccn_pmu4", }; static const struct perf_pmu_test_event *sys_events[] = { @@ -615,6 +615,12 @@ static int __test_uncore_pmu_event_aliases(struct perf_pmu_test_pmu *test_pmu) .count = &matched_count, }; + if (strcmp(pmu_name, test_event.matching_pmu)) { + pr_debug("testing aliases uncore PMU %s: mismatched matching_pmu, %s vs %s\n", + pmu_name, test_event.matching_pmu, pmu_name); + return -1; + } + err = perf_pmu__find_event(pmu, event->name, &args, test_core_pmu_event_aliases_cb); if (err) {