From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752754AbbEUELr (ORCPT ); Thu, 21 May 2015 00:11:47 -0400 Received: from mga03.intel.com ([134.134.136.65]:64180 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750870AbbEUELl (ORCPT ); Thu, 21 May 2015 00:11:41 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,466,1427785200"; d="scan'208";a="732845301" From: Andi Kleen To: sukadev@linux.vnet.ibm.com Cc: jolsa@redhat.com, acme@kernel.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, Andi Kleen Subject: [PATCH 3/6] perf, tools: Support CPU id matching for x86 Date: Wed, 20 May 2015 21:11:30 -0700 Message-Id: <1432181493-18743-4-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1432181493-18743-1-git-send-email-andi@firstfloor.org> References: <1432181493-18743-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen 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 --- tools/perf/arch/x86/util/header.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/tools/perf/arch/x86/util/header.c b/tools/perf/arch/x86/util/header.c index 146d12a..28d8c08 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,20 @@ 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$"); +} + +bool arch_pmu_events_match_cpu(const char *vfm, + const char *version __maybe_unused, + const char *type __maybe_unused) +{ + char buf[128]; + + if (__get_cpuid(buf, sizeof buf, "%s-%u-%X$") < 0) + return false; + return !strcmp(vfm, buf); +} -- 2.1.0