Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935426AbcJFWmG (ORCPT ); Thu, 6 Oct 2016 18:42:06 -0400 Received: from terminus.zytor.com ([198.137.202.10]:46348 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933672AbcJFWl5 (ORCPT ); Thu, 6 Oct 2016 18:41:57 -0400 Date: Thu, 6 Oct 2016 15:41:48 -0700 From: tip-bot for Andi Kleen Message-ID: Cc: tglx@linutronix.de, ak@linux.intel.com, sukadev@linux.vnet.ibm.com, acme@redhat.com, linux-kernel@vger.kernel.org, jolsa@redhat.com, hpa@zytor.com, mingo@kernel.org Reply-To: ak@linux.intel.com, sukadev@linux.vnet.ibm.com, acme@redhat.com, tglx@linutronix.de, jolsa@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org In-Reply-To: <1475696832-9188-4-git-send-email-andi@firstfloor.org> References: <1475696832-9188-4-git-send-email-andi@firstfloor.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf jevents: Fix Intel JSON fixed counter conversions Git-Commit-ID: 72c6ff2583fba824dc38c0ce87b838631cdb8294 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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1434 Lines: 35 Commit-ID: 72c6ff2583fba824dc38c0ce87b838631cdb8294 Gitweb: http://git.kernel.org/tip/72c6ff2583fba824dc38c0ce87b838631cdb8294 Author: Andi Kleen AuthorDate: Wed, 5 Oct 2016 12:47:12 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 5 Oct 2016 18:41:06 -0300 perf jevents: Fix Intel JSON fixed counter conversions Intel fixed counters are special cases in the JSON conversion process because their decoding differs between perf and the event files. Add some missing entries in the conversion table. Signed-off-by: Andi Kleen Cc: Jiri Olsa Cc: Sukadev Bhattiprolu Link: http://lkml.kernel.org/r/1475696832-9188-4-git-send-email-andi@firstfloor.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/pmu-events/jevents.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c index 79c2133..41611d7 100644 --- a/tools/perf/pmu-events/jevents.c +++ b/tools/perf/pmu-events/jevents.c @@ -312,6 +312,8 @@ static struct fixed { const char *event; } fixed[] = { { "inst_retired.any", "event=0xc0" }, + { "inst_retired.any_p", "event=0xc0" }, + { "cpu_clk_unhalted.ref", "event=0x0,umask=0x03" }, { "cpu_clk_unhalted.thread", "event=0x3c" }, { "cpu_clk_unhalted.thread_any", "event=0x3c,any=1" }, { NULL, NULL},