From patchwork Wed Mar 8 00:27:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 65965 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp46335wrd; Tue, 7 Mar 2023 16:32:51 -0800 (PST) X-Google-Smtp-Source: AK7set/FZme1y5R8moiGXsRjEGsE9w/jBM4WCmo1Xy2y704QRF2LgaanY2MNvs4vU27Ck+4S+Nqt X-Received: by 2002:aa7:d29a:0:b0:4ac:c690:d637 with SMTP id w26-20020aa7d29a000000b004acc690d637mr15589396edq.31.1678235571483; Tue, 07 Mar 2023 16:32:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678235571; cv=none; d=google.com; s=arc-20160816; b=jTnzSh9AGgnSMr2JWtSKBMzDfpVvAMgGGBFjUbxPVwEsxjwxmbsgLfTWu7E+umy8fq nIznxXw3G5D84C8zwDkhH6WfZ95LakXLJjsMi+IofMqDm8GDGvFiUaunvMvSZetNhH70 mwCPIY6OV/vWeg0tL2IwPTG9B93wexk5+BJUZ4PHU4GhAMaZ0FXrvvdqlFCxeV8/DpF3 EjkFLxHCFQnn0N/oqqXLKGPRlTzpkHOwZQ2zNEkyK1TCaEDjqsRBiRkV6TucxPVs81ub dSEyJM+VcFrFCxILQ2G9JX77Gk6TzKrSJIw2XHQz7o7Uj4FfSR4kBRH51hjlX5FHLMGY X3KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:from:subject:mime-version:message-id:date :dkim-signature; bh=mWYo+xMJNjNNqpgF4TGynZqpAOyeMeI+jcBtHhYSVHg=; b=PcE0NhZJk/JcuHzLJd8uTDKhCvp6zOIuXHBtQ5B17UHwA2bJXN94dUjpZs1EzQtl2Z jKsp5GL6YmjxqjaNUaMCnKh9vCqBNMLtRMSIzyi6KmrkoOKO14rnMafQuLhPTQBqhU9d yHd/ZYKRwqf75QoEpJrku2/sYDMNwYpdq+SHVq+5AG2DrdhG9AwaF0KB/j/X3fs/1HgR 96g/1H1T/XJDuDCi+kGVwe7zbxVmanAi+8UQH1MVD29OSjatQp6cTDivTBa4z/tsPdLm kAk8QyIZbQJA/dXoRj9IHrdwJHwojizzBzVqJELzFFHLOtLWZFxMAE5i8lh3zGlCCDoD /9fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=C67RkmTN; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e1-20020a50fb81000000b004af6a815065si2897534edq.592.2023.03.07.16.32.27; Tue, 07 Mar 2023 16:32:51 -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; dkim=pass header.i=@google.com header.s=20210112 header.b=C67RkmTN; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229811AbjCHA1h (ORCPT + 99 others); Tue, 7 Mar 2023 19:27:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229684AbjCHA1f (ORCPT ); Tue, 7 Mar 2023 19:27:35 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC77BA1FD2 for ; Tue, 7 Mar 2023 16:27:33 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id n196-20020a2540cd000000b00889c54916f2so15961198yba.14 for ; Tue, 07 Mar 2023 16:27:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678235253; h=to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=mWYo+xMJNjNNqpgF4TGynZqpAOyeMeI+jcBtHhYSVHg=; b=C67RkmTNFLNA5Ch6vBhB0wpdWJqLfcFfPsxbzrVhPo3nAPTNH2h4YVolTieBJYsV/k PSyWbuH4HmNNDNfQpVVYxzaW3Y50KGhaIRWiIK0lAYgcAdSx4JxuvpgPS9cHqJ2Gmy/m 0pEYlk9ovA7NsB4eOqJEVYGOqKK5P/IMaNX1vU44PnQEAmV0VgOROo75Vt4CxLfuMXro Bb0P5/YRKNYpKaGwCRZUZfEmWkqESKqoISietCpJowZnEJhVONMLvOcR52YCEuVNAsXK mrcYV9UuTZoN5uYQdWOTwXW29ub28zxB8V9T7Jr6crsU9x+BBVQEeYmGCZIWpLfcAeCX fE0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678235253; h=to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=mWYo+xMJNjNNqpgF4TGynZqpAOyeMeI+jcBtHhYSVHg=; b=Q8kpG1CU1+Y8iS2bSYKMMTpzUMM7bRtC8H2JlbLL2D1uCAmDth3LgvD39niQ8XecA7 IQTdR/agY4E+sDuxOkUygXNBcFXhK0MgA+21SB6KI1+UQc/rXLP/y/GVwc/jWro7th3S Xy6UhmGNtRC7YCVI2Tx8+tLcrZs6y6rCQ9Lh89f+6TxOXPlfZHmZoa1YAQTDrU9TW7Rx 0SU2cHCwomUxjJXruyqM09hilzCuLLP2hUwnjd+TEoOVIsFq5GJHE8vPRF3aBOFKr4wy Q9XbpKAna6w8BdMjZ3cXoRKj2oXW8UVSGg+LldtsiPV/DnVuJ1sG7Qsy2C/+hNfa5hCv ZCzQ== X-Gm-Message-State: AO0yUKVFKDmQjlG48WFrD0tl6kwbjelodRaDK2XllC5iijO7hSc9+Kr7 d4jMs8Altr1bv44tD8naDVuVHSRwo6Ro X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:9a99:fbc4:7488:8b5f]) (user=irogers job=sendgmr) by 2002:a81:a783:0:b0:533:9b80:a30e with SMTP id e125-20020a81a783000000b005339b80a30emr10019722ywh.10.1678235253159; Tue, 07 Mar 2023 16:27:33 -0800 (PST) Date: Tue, 7 Mar 2023 16:27:14 -0800 Message-Id: <20230308002714.1755698-1-irogers@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.40.0.rc0.216.gc4246ad0f0-goog Subject: [PATCH v1] perf test: Fix "PMU event table sanity" for NO_JEVENTS=1 From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Kajol Jain , John Garry , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable 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?1759757542816925666?= X-GMAIL-MSGID: =?utf-8?q?1759757542816925666?= A table was renamed and needed to be renamed in the empty case. Fixes: 62774db2a05d ("perf jevents: Generate metrics and events as separate tables") Signed-off-by: Ian Rogers Reviewed-by: John Garry --- tools/perf/pmu-events/empty-pmu-events.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-events/empty-pmu-events.c index a938b74cf487..e74defb5284f 100644 --- a/tools/perf/pmu-events/empty-pmu-events.c +++ b/tools/perf/pmu-events/empty-pmu-events.c @@ -227,7 +227,7 @@ static const struct pmu_events_map pmu_events_map[] = { }, }; -static const struct pmu_event pme_test_soc_sys[] = { +static const struct pmu_event pmu_events__test_soc_sys[] = { { .name = "sys_ddr_pmu.write_cycles", .event = "event=0x2b", @@ -258,8 +258,8 @@ struct pmu_sys_events { static const struct pmu_sys_events pmu_sys_event_tables[] = { { - .table = { pme_test_soc_sys }, - .name = "pme_test_soc_sys", + .table = { pmu_events__test_soc_sys }, + .name = "pmu_events__test_soc_sys", }, { .table = { 0 }