Received: by 10.213.65.68 with SMTP id h4csp158556imn; Mon, 19 Mar 2018 23:27:03 -0700 (PDT) X-Google-Smtp-Source: AG47ELtjCJZCj10h86vax83lfD3iNFzHLMgnc/647tVWDhf43hgUuAN99GGpSu/3tZl02CnWYh5W X-Received: by 2002:a17:902:780d:: with SMTP id p13-v6mr14087832pll.281.1521527223276; Mon, 19 Mar 2018 23:27:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521527223; cv=none; d=google.com; s=arc-20160816; b=VA55aVIK+dTP23aXTWcZ6QMuI1rx+FypRg/uPcqpr9reciJjUJqmRVIxTObyf6W/ux BsDZ+F/4IPV4N90NEgxM30aebSWC0BuSeg4y6sRUqUBFmSzZpRDggkV7VDoJvtj1d3Pf kHNLAMx6GhVPyY873C4GxxfH3fVipAYaNzIrfCdvAXEiDjFI9wQWta2VBHYU9JWzWIoh rYxlU37/QxpqDU/Cc5sjegD6XnPAhYn6aeIqMylrheYfjr2uONRKN+aJHgGMo+BzDGcM isfGvy4dLrch1wjn7mP4aKwzzYXMU6W2vfUCt6q4MAmghQ+1E0sa0+HYvWR3LIyF9WHy SkIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-disposition :content-transfer-encoding:mime-version:robot-unsubscribe:robot-id :git-commit-id:subject:to:references:in-reply-to:reply-to:cc :message-id:from:date:arc-authentication-results; bh=tac7+bf5vFo1ZYJyQVT541UQ/vbmpOmX6z/4gRMN0jU=; b=L7s1fI3mztC/J6eJ1aQkOv59qlrvy4gRyZkA8aE4jdi0N/ctMipn1mJcbHqZys02w8 JCLH1CGX4vPJZoWn7nymkLYeIMr+vQYdr9rVS/ok+xz4ZFQHzFM4OSPgfiqDmGp7Ll7Y vemogmj8rDTqRNAjFq/SSfSqSX6ESAQF7OBBTIqvSE9MgGwvSq118fsBHJ7JfRVRCQgz fTli5bQrW/vm3bnhiT+1sdb0tzu1SJpqkmMKRhotO4Iq+d6q20OoSfVnry2pXZrDElnM xfUaoWDG6QQnEIDH7CiXl0bAzYiHRZGXPLZABe8gNtoRgF7J7hJfiOlTVs5ZYrUAEcSz WJzA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u189si789488pfu.212.2018.03.19.23.26.49; Mon, 19 Mar 2018 23:27:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751903AbeCTGZ5 (ORCPT + 99 others); Tue, 20 Mar 2018 02:25:57 -0400 Received: from terminus.zytor.com ([198.137.202.136]:38275 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751330AbeCTGZy (ORCPT ); Tue, 20 Mar 2018 02:25:54 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTP id w2K6PHbK030548; Mon, 19 Mar 2018 23:25:17 -0700 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id w2K6PFrx030543; Mon, 19 Mar 2018 23:25:15 -0700 Date: Mon, 19 Mar 2018 23:25:15 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for John Garry Message-ID: Cc: namhyung@kernel.org, ak@linux.intel.com, alexander.shishkin@linux.intel.com, wcohen@redhat.com, ganapatrao.kulkarni@cavium.com, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, acme@redhat.com, john.garry@huawei.com, jolsa@redhat.com, zhangshaokun@hisilicon.com, mingo@kernel.org, will.deacon@arm.com, peterz@infradead.org Reply-To: ak@linux.intel.com, namhyung@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, ganapatrao.kulkarni@cavium.com, hpa@zytor.com, wcohen@redhat.com, alexander.shishkin@linux.intel.com, john.garry@huawei.com, jolsa@redhat.com, acme@redhat.com, will.deacon@arm.com, peterz@infradead.org, mingo@kernel.org, zhangshaokun@hisilicon.com In-Reply-To: <1520506716-197429-10-git-send-email-john.garry@huawei.com> References: <1520506716-197429-10-git-send-email-john.garry@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf vendor events arm64: Fixup ThunderX2 to use recommended events Git-Commit-ID: ae43053bd2595dc98f0909505dc1d7e1ed8bd239 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on terminus.zytor.com Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: ae43053bd2595dc98f0909505dc1d7e1ed8bd239 Gitweb: https://git.kernel.org/tip/ae43053bd2595dc98f0909505dc1d7e1ed8bd239 Author: John Garry AuthorDate: Thu, 8 Mar 2018 18:58:34 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 16 Mar 2018 13:54:48 -0300 perf vendor events arm64: Fixup ThunderX2 to use recommended events This patch fixes the Cavium ThunderX2 JSON to use event definitions from the ARMv8 recommended events. Signed-off-by: John Garry Tested-by: Ganapatrao Kulkarni Cc: Alexander Shishkin Cc: Andi Kleen Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Shaokun Zhang Cc: Will Deacon Cc: William Cohen Cc: linux-arm-kernel@lists.infradead.org Cc: linuxarm@huawei.com Link: http://lkml.kernel.org/r/1520506716-197429-10-git-send-email-john.garry@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- .../arch/arm64/cavium/thunderx2/core-imp-def.json | 50 +++++----------------- 1 file changed, 10 insertions(+), 40 deletions(-) diff --git a/tools/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json b/tools/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json index 2db45c40ebc7..bc03c06c3918 100644 --- a/tools/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json +++ b/tools/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json @@ -1,62 +1,32 @@ [ { - "PublicDescription": "Attributable Level 1 data cache access, read", - "EventCode": "0x40", - "EventName": "l1d_cache_rd", - "BriefDescription": "L1D cache read", + "ArchStdEvent": "L1D_CACHE_RD", }, { - "PublicDescription": "Attributable Level 1 data cache access, write ", - "EventCode": "0x41", - "EventName": "l1d_cache_wr", - "BriefDescription": "L1D cache write", + "ArchStdEvent": "L1D_CACHE_WR", }, { - "PublicDescription": "Attributable Level 1 data cache refill, read", - "EventCode": "0x42", - "EventName": "l1d_cache_refill_rd", - "BriefDescription": "L1D cache refill read", + "ArchStdEvent": "L1D_CACHE_REFILL_RD", }, { - "PublicDescription": "Attributable Level 1 data cache refill, write", - "EventCode": "0x43", - "EventName": "l1d_cache_refill_wr", - "BriefDescription": "L1D refill write", + "ArchStdEvent": "L1D_CACHE_REFILL_WR", }, { - "PublicDescription": "Attributable Level 1 data TLB refill, read", - "EventCode": "0x4C", - "EventName": "l1d_tlb_refill_rd", - "BriefDescription": "L1D tlb refill read", + "ArchStdEvent": "L1D_TLB_REFILL_RD", }, { - "PublicDescription": "Attributable Level 1 data TLB refill, write", - "EventCode": "0x4D", - "EventName": "l1d_tlb_refill_wr", - "BriefDescription": "L1D tlb refill write", + "ArchStdEvent": "L1D_TLB_REFILL_WR", }, { - "PublicDescription": "Attributable Level 1 data or unified TLB access, read", - "EventCode": "0x4E", - "EventName": "l1d_tlb_rd", - "BriefDescription": "L1D tlb read", + "ArchStdEvent": "L1D_TLB_RD", }, { - "PublicDescription": "Attributable Level 1 data or unified TLB access, write", - "EventCode": "0x4F", - "EventName": "l1d_tlb_wr", - "BriefDescription": "L1D tlb write", + "ArchStdEvent": "L1D_TLB_WR", }, { - "PublicDescription": "Bus access read", - "EventCode": "0x60", - "EventName": "bus_access_rd", - "BriefDescription": "Bus access read", + "ArchStdEvent": "BUS_ACCESS_RD", }, { - "PublicDescription": "Bus access write", - "EventCode": "0x61", - "EventName": "bus_access_wr", - "BriefDescription": "Bus access write", + "ArchStdEvent": "BUS_ACCESS_WR", } ]