From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752247AbdFUS1c (ORCPT ); Wed, 21 Jun 2017 14:27:32 -0400 Received: from terminus.zytor.com ([65.50.211.136]:55711 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751143AbdFUS1b (ORCPT ); Wed, 21 Jun 2017 14:27:31 -0400 Date: Wed, 21 Jun 2017 11:25:20 -0700 From: tip-bot for Adrian Hunter Message-ID: Cc: hpa@zytor.com, mingo@kernel.org, acme@redhat.com, ak@linux.intel.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de Reply-To: adrian.hunter@intel.com, ak@linux.intel.com, acme@redhat.com, mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org In-Reply-To: <1495786658-18063-12-git-send-email-adrian.hunter@intel.com> References: <1495786658-18063-12-git-send-email-adrian.hunter@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf intel-pt: Add default config for pass-through branch enable Git-Commit-ID: 9fd629f9a6d0eded133f5f9866226f6bbfe5f50d 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: 9fd629f9a6d0eded133f5f9866226f6bbfe5f50d Gitweb: http://git.kernel.org/tip/9fd629f9a6d0eded133f5f9866226f6bbfe5f50d Author: Adrian Hunter AuthorDate: Fri, 26 May 2017 11:17:12 +0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 21 Jun 2017 11:35:48 -0300 perf intel-pt: Add default config for pass-through branch enable Branch tracing is enabled by default, so a fake config bit called 'pt' (pass-through) was added to allow the 'branch enable' bit to have affect. Add default config 'pt,branch' which will allow users to disable branch tracing using 'branch=0' instead of having to specify 'pt,branch=0'. Signed-off-by: Adrian Hunter Cc: Andi Kleen Link: http://lkml.kernel.org/r/1495786658-18063-12-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/arch/x86/util/intel-pt.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c index 6fe667b..9535be5 100644 --- a/tools/perf/arch/x86/util/intel-pt.c +++ b/tools/perf/arch/x86/util/intel-pt.c @@ -192,6 +192,7 @@ static u64 intel_pt_default_config(struct perf_pmu *intel_pt_pmu) int psb_cyc, psb_periods, psb_period; int pos = 0; u64 config; + char c; pos += scnprintf(buf + pos, sizeof(buf) - pos, "tsc"); @@ -225,6 +226,10 @@ static u64 intel_pt_default_config(struct perf_pmu *intel_pt_pmu) } } + if (perf_pmu__scan_file(intel_pt_pmu, "format/pt", "%c", &c) == 1 && + perf_pmu__scan_file(intel_pt_pmu, "format/branch", "%c", &c) == 1) + pos += scnprintf(buf + pos, sizeof(buf) - pos, ",pt,branch"); + pr_debug2("%s default config: %s\n", intel_pt_pmu->name, buf); intel_pt_parse_terms(&intel_pt_pmu->format, buf, &config);