From patchwork Fri Dec 1 02:15:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilkka Koskinen X-Patchwork-Id: 172214 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp829939vqy; Thu, 30 Nov 2023 18:17:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IFSZN6Q+1r0HdHkd5juNqyHLBF6BeGUZ4Y87SkUN2nXtXkcO1mFTePSQMzs2y4akdPIz19F X-Received: by 2002:a17:90a:1944:b0:27d:c95:b0ad with SMTP id 4-20020a17090a194400b0027d0c95b0admr23029610pjh.21.1701397024934; Thu, 30 Nov 2023 18:17:04 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1701397024; cv=pass; d=google.com; s=arc-20160816; b=i60dzD/UNCfTYdULWwKKYt4Xke6m9c43i9TSvN5y3jplTXmZLRbHK2I0+q4AASb8EC 9U6s022MUJR2o4227wKEhuz5I2t3zsrcH6/P1DXn8aeKXVttaWfyBRGQ62Onn2tEX2TH yXucBf3d9ZeVfoBKL3DXqhk8vCxn3e8U84Fs8DrmHTT1i5tTD0agfve/J+TrtZ4x9yYk DtUmHQWp54nMvMzEQLWK3UZf6XOG65JEJ5vS5EWIp4fa+0bBYP8vMELmN1n4Lw9OU12Q QBhcaCcFbCNvClvYgvKycHdRCNHVnGcMFkbI8oY0aa/5Z7qRGadwOqWike6Wt2m1VKsM gGTA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pIL/FN43oocE4n6Xw3nZtui6M8Uk0Sc2EwkmHIPi2HA=; fh=p4jEIhpdISr5HNvEBrDVi8iY4Dg1BimZOpX2wuNrIaw=; b=TJ4Q5MYH9iGEYGh+3pQ26I37U/s5VH5TZxYq23//qRvRo9DatBcR+45Y2l/CgUp1xp 0lDqjKf0xuyYsRsdMBIdz5pIRfAh3XZhiWlkitC/aQG9pJDIdRrlJDBPjb7fGmF+ftBw tizmbB9MQCBV/eDp54cjbpdLzfazqCYOiSolrsVcKP2MhlAdgzLP9REhtSdk1z/mBRHw 21LfH0B3l8Rkj7Gf/u8yY/EZ3GhqjF4Ht5G0aRu6kJXPxaFhLk0ziek+lAPRyIAdfe7q Dva4PhaAOxROvE8kMYlBVfa9GskTcQm8Gul2XP+PefI+IK9+PQUwQAM94HsIR2fGSAMz AOOQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@os.amperecomputing.com header.s=selector2 header.b=Za4+8o9L; arc=pass (i=1 spf=pass spfdomain=os.amperecomputing.com dkim=pass dkdomain=os.amperecomputing.com dmarc=pass fromdomain=os.amperecomputing.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=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amperecomputing.com Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id jk21-20020a170903331500b001cc5ada2b94si2193013plb.366.2023.11.30.18.17.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 18:17:04 -0800 (PST) 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; dkim=pass header.i=@os.amperecomputing.com header.s=selector2 header.b=Za4+8o9L; arc=pass (i=1 spf=pass spfdomain=os.amperecomputing.com dkim=pass dkdomain=os.amperecomputing.com dmarc=pass fromdomain=os.amperecomputing.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=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amperecomputing.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 021C78096449; Thu, 30 Nov 2023 18:16:34 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376712AbjLACQW (ORCPT + 99 others); Thu, 30 Nov 2023 21:16:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229523AbjLACQV (ORCPT ); Thu, 30 Nov 2023 21:16:21 -0500 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2092.outbound.protection.outlook.com [40.107.94.92]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD4BB131; Thu, 30 Nov 2023 18:16:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hTyn5TvkVVyAgLnvV/ktPJMLlJ7vuNik2Iia9b529xOUMRKJTRZqzSZBOmY1tHPHXPMkPOaegU5n4ozDvCGFs3O59q7GzMLr8ICe3OTOfPX+jJWOmC0dciw8qT7H8hMeBB18hDK2WMc/OeEDPT96Mo1r6ZWBy7Vxvg1AxduH7ZvoacaWCxIAKNznHLXK8stlTzM0RL613j4WJLwhzU91nf9tZ6JmQGshNqKgMCWKUmingmciP6AX4JkHQHdouJXG5gng+NZTovKKNgywQ4/EufGFaxbQnRRZP7SJt45A+UNMz+fWQwKs2KnU9PDRamSbULoDIrHffwoYQhTqEE6HvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pIL/FN43oocE4n6Xw3nZtui6M8Uk0Sc2EwkmHIPi2HA=; b=icX4n8rZfs9JsHWw5/VUo1NZpopZcW+FQGMW82TrWcf5QNkLksTqDcVgwPhL/Zlba5kM1j2s5coy0UU0+HuCuDjx8B9RSKuFxvkO9lmpJ9MVpQsxvPlyNGI/CpN/Ifnfu+9ZZPtggVAiGO/2WQsBKcD7bndi2iKNLu/kzjINfp8gbwQaBA5ETE33+HAOfzDv4aZVUL+lFzwTAVsqGpncPYA9HB7+upg4eu3nhC6dcuvqLOtFnbcENjgLuMYFf124G2bwql+up1eDr5so1iMPtK8qaxYAqaoKKvFRqHlFxJamZxARQuCLelKqTywVxiPd21wwoD6jqPdMhoeewoZ8XQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=os.amperecomputing.com; dmarc=pass action=none header.from=os.amperecomputing.com; dkim=pass header.d=os.amperecomputing.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=os.amperecomputing.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pIL/FN43oocE4n6Xw3nZtui6M8Uk0Sc2EwkmHIPi2HA=; b=Za4+8o9LudQUbr1xbcwcT5m28WCBTwB0tJK1oMlQlqoHKv2h04NkjUI68F7AMXzE4aJj0zYGm3cXMkL6W69vyc7TfTmuhmsunhitBdWayFR/IrxCJUX5ecLwSei15PuQ8YjmQjqEILEd1YFVQBKg9cH1xCCrOjYMIJUzZJqCSWw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=os.amperecomputing.com; Received: from DM5PR0102MB3590.prod.exchangelabs.com (2603:10b6:4:a4::25) by MW4PR01MB6196.prod.exchangelabs.com (2603:10b6:303:71::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.24; Fri, 1 Dec 2023 02:16:24 +0000 Received: from DM5PR0102MB3590.prod.exchangelabs.com ([fe80::49fa:8dc0:6fd1:72e6]) by DM5PR0102MB3590.prod.exchangelabs.com ([fe80::49fa:8dc0:6fd1:72e6%4]) with mapi id 15.20.7046.024; Fri, 1 Dec 2023 02:16:24 +0000 From: Ilkka Koskinen To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Ilkka Koskinen Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org Subject: [PATCH 1/3] perf vendor events arm64: AmpereOne: Add missing DefaultMetricgroupName fields Date: Thu, 30 Nov 2023 18:15:48 -0800 Message-ID: <20231201021550.1109196-2-ilkka@os.amperecomputing.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231201021550.1109196-1-ilkka@os.amperecomputing.com> References: <20231201021550.1109196-1-ilkka@os.amperecomputing.com> X-ClientProxiedBy: CH3P221CA0024.NAMP221.PROD.OUTLOOK.COM (2603:10b6:610:1e7::33) To DM5PR0102MB3590.prod.exchangelabs.com (2603:10b6:4:a4::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR0102MB3590:EE_|MW4PR01MB6196:EE_ X-MS-Office365-Filtering-Correlation-Id: 9e91845d-8331-404e-89db-08dbf213849c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FClBCqeTigeMOe5m8aaDQTGmeS0QZumY2i22TUHWzzU5nDlTO6Du118X1k9eRkvx/ga6Ll57DJRIIxFbDIYiEBu/9pWXH6Btpz+S8AL1/1JIGgC5ai+o5QX7JqEiu61YlNBifXLJhMbfqjudM21z9U2QueDlhfRJHZgLBduyo4fEf28hcc3GvXYZWtup5diN9VPfkTLx0OTcGK7GorI6VgpVnxraD9A/e8REHgPQsI4qxGOqBdICZ43bdi9qikA+64topwaLmUGnYzBK7bamOdtf3Wofvmc7RKSpvwFcqKMfFqoJtylhz/0WqiHyh795cULFt6FHq6opJrKE6AKyDldVSd8coe7aWd8r49NsijiTY4gEOpgB+BDlWSgBb4BvRPNoNsiBbmx/o2HFcFgfva4VEsUAjPr4/NZSaSqZKd/vI+763f8Fxq2PMWzURsdqBKQxl0RBVWY6OXgjZmQJViSrvH9uOp90ZVrwM/azCy/EPKMeTO/Se3rk2okbzc08PPE587YxdJIR2s7xCZHZVp/bShUUkRymFk/T5Alz9Xd1ucRdjPSJQRakP40ydvYRqu0Tg+tZuF3gZ/pPU5VTfKpKAb4GQJ+XZOkT86+CzGLhaLBIXG7Hb+onoHlncumKNMnfB/k/Wu25r/fDzYYwtQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR0102MB3590.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(39850400004)(376002)(396003)(366004)(136003)(230922051799003)(64100799003)(186009)(1800799012)(451199024)(1076003)(921008)(26005)(38350700005)(38100700002)(41300700001)(7049001)(52116002)(6512007)(2616005)(6666004)(6486002)(5660300002)(2906002)(7416002)(316002)(6506007)(66556008)(110136005)(66476007)(66946007)(478600001)(86362001)(8936002)(8676002)(4326008);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qll1no8fdODESlL3dttyxFi67d4wkq/fKodC4lk3bC76b1SkYnjvmTHY9SSSmcIWqJlPzqg5DpSG4/Rqqf1wqSVt6p7k7YHdM6zFA2ZBlFsNu35bQCtVAlUMDjRy7ntPwH9unUw4on5RqB9bz7/pSTW2pN0WHKS4LOAq7mSaACc8j6/O4ahsIL16FJaDpd3pQ24bjLknsuZEBFYG9RGvUeexu7gQ7ujvBPKBijuctewyVCmJO5kAoC7YN926RZjyGdYhcKAIVqpgOxfcgNqIGd7V1E9kTNimfUZnqpOjL4SRjkjrJlNNvjndCICcfizzxkyEKN1zY1DT0Pb6+SuyZf2d5Z7w1V1BU/Ie+WzpV/XOTViawBYlZ8M678tzwvsgp8DcOM89q/o3nM3MrnWekYMuSPUGwH1zcJLjQLfud7LjDHufKWCF8aRzEs+QqxzGsyzFtu9Kb9TUSTqYU00Grcl+NP6ai8vS885gbNQ99oe1x8S5vR+lCaCtJLP0BatQXilT4r9Lo8PeOvcwTsKpY9V6mnvdIir34+SYEZk6HZ3hO/rPPzjggPzgkVM8Q1i1c/d1+NydtFGuPg9j0M3eIRpYIrN3I6IKR491/wlLhKqapeDX/kJn7X1J5dDLPjdpcZwxZ37y28IlhGaLqPpldmP66DpMYkf9lfT6WfsMoYNu4isSRxo9Sxo6qHghNIbn72uS3BJWrk5UkeLyfegKZ5cQ+3VdypHlRAIVJFczz7RFJ+q4ehGQVF4Bdd2/VVkjrXJYn0ebC2Cm5Kzoo1XEIXvDdmZKLQXyL7hsLO8PP+Dq6ZVIL8Foz++Zt+m4+1oAG1Ip6xtynKFk5ul8E59elSMdc7IT0t39mDuEKhwDK8OC8OeVqDE+DdSbUf8EAWzh2l5JbTyfTFiC4BvHwgPN57g58FmIAdk98HzQ4Sibb3X4/+Q0/naPw4e8niAT11HanbtUp9+Kk5mHNoLO7ybKaLrNiKORb8jfk3yz4JCuv6LUwjLElsrIGwKegjug75pJpHNOnm/ae7u6iOfQQgDVfQHlGCcJ9zlrFAqeGBrVvrNfzLTwn8fIxEc1AznUdg0suNtPMoLfVCTGWHmbkU1hQT1TuhXhX2BQEAX8d6gGQSMvCmvgSRcIrNLjFZa8etI47248j6S60ER/zJp/pLyotfsVfikgVGPii2a4HliciAXYW6VaktMYSHjBQVFCCtiwzCHinW2FpBPT80u0pBwpyWFIn5W+kuTC8gwD3Zo9dmrbBDFl53xhWOKUZYIftpcSfLrus6CN72poJ894HoxjuP5FdJGbcLeoPuAWUTGUOnhTKvTpqeaZWVbY3ro6OzPF3URxQs9rSaTVpCXvBKlRoovwyLh0PearT8nccdoAsi7gXNch66xIgfi34PdzkZHkNfiKOViK89q69ZTPvkCGttpAsDxol0CrQLTorl0BvQjbUpJkgHcxiEr2u69jklGsxZ9GBmVWjmBIhrGzWfkbe2drNbn3fPc9bP/8rC70ZK07HgCFqMFv+gR6zZSZWvlC3O1ZRW9GqbSjiBN8/HH8UZpT5B7Ij3UdDP7PFxp4vylqJY+9eHgQj79M3F3I/f+wmvlBGi72vGdv9S8WMCgFJuNzyxYEGiRUUvzs86n4zNo= X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e91845d-8331-404e-89db-08dbf213849c X-MS-Exchange-CrossTenant-AuthSource: DM5PR0102MB3590.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2023 02:16:24.7427 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wmsdV52D7z5M+ZXal6/4Zd3FuZ86pMSvQATP5S58bUPxC64MjZAuaoGUMh8iK5Il5gGN9tN1P3JVoRSspcO4Zxf21i3XO5Suj0k9ygSxotobM8cXiLY+x347eqeeTFVO X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR01MB6196 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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]); Thu, 30 Nov 2023 18:16:34 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784044087150760531 X-GMAIL-MSGID: 1784044087150760531 AmpereOne metrics were missing DefaultMetricgroupName from metrics with "Default" in group name resulting perf to segfault. Add the missing field to address the issue. Fixes: 59faeaf80d02 ("perf vendor events arm64: Fix for AmpereOne metrics") Signed-off-by: Ilkka Koskinen Reviewed-by: Ian Rogers --- tools/perf/pmu-events/arch/arm64/ampere/ampereone/metrics.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/perf/pmu-events/arch/arm64/ampere/ampereone/metrics.json b/tools/perf/pmu-events/arch/arm64/ampere/ampereone/metrics.json index e2848a9d4848..afcdad58ef89 100644 --- a/tools/perf/pmu-events/arch/arm64/ampere/ampereone/metrics.json +++ b/tools/perf/pmu-events/arch/arm64/ampere/ampereone/metrics.json @@ -231,6 +231,7 @@ "MetricName": "slots_lost_misspeculation_fraction", "MetricExpr": "100 * ((OP_SPEC - OP_RETIRED) / (CPU_CYCLES * #slots))", "BriefDescription": "Fraction of slots lost due to misspeculation", + "DefaultMetricgroupName": "TopdownL1", "MetricGroup": "Default;TopdownL1", "ScaleUnit": "1percent of slots" }, @@ -238,6 +239,7 @@ "MetricName": "retired_fraction", "MetricExpr": "100 * (OP_RETIRED / (CPU_CYCLES * #slots))", "BriefDescription": "Fraction of slots retiring, useful work", + "DefaultMetricgroupName": "TopdownL1", "MetricGroup": "Default;TopdownL1", "ScaleUnit": "1percent of slots" },