From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754118AbcJDITa (ORCPT ); Tue, 4 Oct 2016 04:19:30 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37866 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754100AbcJDIT2 (ORCPT ); Tue, 4 Oct 2016 04:19:28 -0400 Date: Tue, 4 Oct 2016 01:18:46 -0700 From: tip-bot for Andi Kleen Message-ID: Cc: ak@linux.intel.com, tglx@linutronix.de, sukadev@linux.vnet.ibm.com, hpa@zytor.com, linux-kernel@vger.kernel.org, maddy@linux.vnet.ibm.com, mingo@kernel.org, acme@redhat.com, peterz@infradead.org Reply-To: acme@redhat.com, peterz@infradead.org, mingo@kernel.org, maddy@linux.vnet.ibm.com, hpa@zytor.com, linux-kernel@vger.kernel.org, sukadev@linux.vnet.ibm.com, tglx@linutronix.de, ak@linux.intel.com In-Reply-To: <1473978296-20712-18-git-send-email-sukadev@linux.vnet.ibm.com> References: <1473978296-20712-18-git-send-email-sukadev@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf pmu-events: Fix fixed counters on Intel Git-Commit-ID: 0b1db474314c883d0bfc6720278667a6155e995a 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 Commit-ID: 0b1db474314c883d0bfc6720278667a6155e995a Gitweb: http://git.kernel.org/tip/0b1db474314c883d0bfc6720278667a6155e995a Author: Andi Kleen AuthorDate: Thu, 15 Sep 2016 15:24:54 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 3 Oct 2016 21:52:00 -0300 perf pmu-events: Fix fixed counters on Intel The JSON event lists use a different encoding for fixed counters than perf for instructions and cycles (ref-cycles is ok) This lead to some common events like inst_retired.any or cpu_clk_unhalted.thread not counting, when specified with their JSON name. Special case these events in the jevents conversion process. I prefer to not touch the JSON files for this, as it's intended that standard JSON files can be just dropped into the perf build without changes. Signed-off-by: Andi Kleen Signed-off-by: Sukadev Bhattiprolu [Fix minor compile error] Acked-by: Ingo Molnar Cc: Madhavan Srinivasan Cc: Peter Zijlstra Cc: linuxppc-dev@lists.ozlabs.org Link: http://lkml.kernel.org/r/1473978296-20712-18-git-send-email-sukadev@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/pmu-events/jevents.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c index 13f4284..04e106e 100644 --- a/tools/perf/pmu-events/jevents.c +++ b/tools/perf/pmu-events/jevents.c @@ -306,6 +306,29 @@ static void print_events_table_suffix(FILE *outfp) close_table = 0; } +static struct fixed { + const char *name; + const char *event; +} fixed[] = { + { "inst_retired.any", "event=0xc0" }, + { "cpu_clk_unhalted.thread", "event=0x3c" }, + { "cpu_clk_unhalted.thread_any", "event=0x3c,any=1" }, + { NULL, NULL}, +}; + +/* + * Handle different fixed counter encodings between JSON and perf. + */ +static char *real_event(const char *name, char *event) +{ + int i; + + for (i = 0; fixed[i].name; i++) + if (!strcasecmp(name, fixed[i].name)) + return (char *)fixed[i].event; + return event; +} + /* Call func with each event in the json file */ int json_events(const char *fn, int (*func)(void *data, char *name, char *event, char *desc, @@ -392,7 +415,7 @@ int json_events(const char *fn, addfield(map, &event, ",", msr->pname, msrval); fixname(name); - err = func(data, name, event, desc, long_desc); + err = func(data, name, real_event(name, event), desc, long_desc); free(event); free(desc); free(name);