[PATCH 02/37] perf intel-pt: Add default config for pass-through branch enable

[Adrian Hunter]

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 
---
 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 f630de0206a1..007621a7e420 100644
--- a/tools/perf/arch/x86/util/intel-pt.c
+++ b/tools/perf/arch/x86/util/intel-pt.c
@@ -196,6 +196,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");
 
@@ -229,6 +230,10 @@ static u64 intel_pt_default_config(struct perf_pmu 
*intel_pt_pmu)
}
}
 
+   if (perf_pmu__scan_file(intel_pt_pmu, "format/pt", "%c", ) == 1 &&
+   perf_pmu__scan_file(intel_pt_pmu, "format/branch", "%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(_pt_pmu->format, buf, );
-- 
1.9.1

[PATCH 02/37] perf intel-pt: Add default config for pass-through branch enable

[Adrian Hunter]

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 
---
 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 f630de0206a1..007621a7e420 100644
--- a/tools/perf/arch/x86/util/intel-pt.c
+++ b/tools/perf/arch/x86/util/intel-pt.c
@@ -196,6 +196,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");
 
@@ -229,6 +230,10 @@ static u64 intel_pt_default_config(struct perf_pmu 
*intel_pt_pmu)
}
}
 
+   if (perf_pmu__scan_file(intel_pt_pmu, "format/pt", "%c", ) == 1 &&
+   perf_pmu__scan_file(intel_pt_pmu, "format/branch", "%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(_pt_pmu->format, buf, );
-- 
1.9.1