From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754036AbcJDIQ0 (ORCPT ); Tue, 4 Oct 2016 04:16:26 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37698 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752726AbcJDIQY (ORCPT ); Tue, 4 Oct 2016 04:16:24 -0400 Date: Tue, 4 Oct 2016 01:15:42 -0700 From: tip-bot for Andi Kleen Message-ID: Cc: ak@linux.intel.com, linux-kernel@vger.kernel.org, jolsa@redhat.com, peterz@infradead.org, mingo@kernel.org, acme@redhat.com, maddy@linux.vnet.ibm.com, sukadev@linux.vnet.ibm.com, tglx@linutronix.de, hpa@zytor.com Reply-To: peterz@infradead.org, jolsa@redhat.com, linux-kernel@vger.kernel.org, ak@linux.intel.com, maddy@linux.vnet.ibm.com, sukadev@linux.vnet.ibm.com, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, acme@redhat.com In-Reply-To: <1473978296-20712-10-git-send-email-sukadev@linux.vnet.ibm.com> References: <1473978296-20712-10-git-send-email-sukadev@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf pmu: Add override support for event list CPUID Git-Commit-ID: fc06e2a5aad9fcf7efaabd7550ac31f648d2f2bc 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: fc06e2a5aad9fcf7efaabd7550ac31f648d2f2bc Gitweb: http://git.kernel.org/tip/fc06e2a5aad9fcf7efaabd7550ac31f648d2f2bc Author: Andi Kleen AuthorDate: Thu, 15 Sep 2016 15:24:46 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 3 Oct 2016 21:35:46 -0300 perf pmu: Add override support for event list CPUID Add a PERF_CPUID variable to override the CPUID of the current CPU (within the current architecture). This is useful for testing, so that all event lists can be tested on a single system. 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-10-git-send-email-sukadev@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/pmu.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 9dc3506..79242cf 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -501,10 +501,16 @@ static void pmu_add_cpu_aliases(struct list_head *head) struct pmu_event *pe; char *cpuid; - cpuid = get_cpuid_str(); + cpuid = getenv("PERF_CPUID"); + if (cpuid) + cpuid = strdup(cpuid); + if (!cpuid) + cpuid = get_cpuid_str(); if (!cpuid) return; + pr_debug("Using CPUID %s\n", cpuid); + i = 0; while (1) { map = &pmu_events_map[i++];