From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753880AbcJDIOJ (ORCPT ); Tue, 4 Oct 2016 04:14:09 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37518 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752043AbcJDIOH (ORCPT ); Tue, 4 Oct 2016 04:14:07 -0400 Date: Tue, 4 Oct 2016 01:13:29 -0700 From: tip-bot for Andi Kleen Message-ID: Cc: hpa@zytor.com, acme@redhat.com, peterz@infradead.org, mingo@kernel.org, ak@linux.intel.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, maddy@linux.vnet.ibm.com, sukadev@linux.vnet.ibm.com, jolsa@redhat.com Reply-To: maddy@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, jolsa@redhat.com, sukadev@linux.vnet.ibm.com, hpa@zytor.com, tglx@linutronix.de, ak@linux.intel.com, peterz@infradead.org, mingo@kernel.org, acme@redhat.com In-Reply-To: <1473978296-20712-6-git-send-email-sukadev@linux.vnet.ibm.com> References: <1473978296-20712-6-git-send-email-sukadev@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Support CPU id matching for x86 v2 Git-Commit-ID: f33d1227197e0fe9d3682c5a766fdc74559da78e 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: f33d1227197e0fe9d3682c5a766fdc74559da78e Gitweb: http://git.kernel.org/tip/f33d1227197e0fe9d3682c5a766fdc74559da78e Author: Andi Kleen AuthorDate: Thu, 15 Sep 2016 15:24:42 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 3 Oct 2016 19:58:01 -0300 perf tools: Support CPU id matching for x86 v2 Implement the code to match CPU types to mapfile types for x86 based on CPUID. This extends an existing similar function, but changes it to use the x86 mapfile cpu description. This allows to resolve event lists generated by jevents. Signed-off-by: Andi Kleen Signed-off-by: Sukadev Bhattiprolu Acked-by: Ingo Molnar Acked-by: Jiri Olsa Cc: Madhavan Srinivasan Cc: Peter Zijlstra Cc: linuxppc-dev@lists.ozlabs.org Link: http://lkml.kernel.org/r/1473978296-20712-6-git-send-email-sukadev@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/arch/x86/util/header.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/tools/perf/arch/x86/util/header.c b/tools/perf/arch/x86/util/header.c index 146d12a..a74a48d 100644 --- a/tools/perf/arch/x86/util/header.c +++ b/tools/perf/arch/x86/util/header.c @@ -19,8 +19,8 @@ cpuid(unsigned int op, unsigned int *a, unsigned int *b, unsigned int *c, : "a" (op)); } -int -get_cpuid(char *buffer, size_t sz) +static int +__get_cpuid(char *buffer, size_t sz, const char *fmt) { unsigned int a, b, c, d, lvl; int family = -1, model = -1, step = -1; @@ -48,7 +48,7 @@ get_cpuid(char *buffer, size_t sz) if (family >= 0x6) model += ((a >> 16) & 0xf) << 4; } - nb = scnprintf(buffer, sz, "%s,%u,%u,%u$", vendor, family, model, step); + nb = scnprintf(buffer, sz, fmt, vendor, family, model, step); /* look for end marker to ensure the entire data fit */ if (strchr(buffer, '$')) { @@ -57,3 +57,21 @@ get_cpuid(char *buffer, size_t sz) } return -1; } + +int +get_cpuid(char *buffer, size_t sz) +{ + return __get_cpuid(buffer, sz, "%s,%u,%u,%u$"); +} + +char * +get_cpuid_str(void) +{ + char *buf = malloc(128); + + if (__get_cpuid(buf, 128, "%s-%u-%X$") < 0) { + free(buf); + return NULL; + } + return buf; +}