Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755209AbcJETsF (ORCPT ); Wed, 5 Oct 2016 15:48:05 -0400 Received: from mga06.intel.com ([134.134.136.31]:21369 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754908AbcJETrR (ORCPT ); Wed, 5 Oct 2016 15:47:17 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,302,1473145200"; d="scan'208";a="16593407" From: Andi Kleen To: acme@kernel.org Cc: sukadev@linux.vnet.ibm.com, jolsa@redhat.com, linux-kernel@vger.kernel.org, Andi Kleen Subject: [PATCH 3/3] perf, tools: Fix Intel fixed counter conversions Date: Wed, 5 Oct 2016 12:47:12 -0700 Message-Id: <1475696832-9188-4-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1475696832-9188-1-git-send-email-andi@firstfloor.org> References: <1475696832-9188-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 890 Lines: 26 From: Andi Kleen 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 --- 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 79c2133bc534..41611d7f9873 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}, -- 2.5.5