[PATCH 07/11] perf intel-pt: Use itrace debug log flags to suppress some messages

Adrian Hunter
2020-07-09T17:37:46Z

The "d" option may be followed by a number which has the following effect:
1 Suppress logging of perf events

Suppressing perf events is useful for decreasing the size of the log.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
tools/perf/Documentation/perf-intel-pt.txt | 4 +++-
tools/perf/util/intel-pt.c | 19 ++++++++++++-------
2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/tools/perf/Documentation/perf-intel-pt.txt b/tools/perf/Documentation/perf-intel-pt.txt
index 0fcd8ad897b0..85a2ff804900 100644
--- a/tools/perf/Documentation/perf-intel-pt.txt
+++ b/tools/perf/Documentation/perf-intel-pt.txt
@@ -879,7 +879,9 @@ The values may be combined by bitwise OR'ing them.

The "d" option will cause the creation of a file "intel_pt.log" containing all
decoded packets and instructions. Note that this option slows down the decoder
-and that the resulting file may be very large.
+and that the resulting file may be very large. The "d" option may be followed
+by a number which has the following effect:
+ 1 Suppress logging of perf events

In addition, the period of the "instructions" event can be specified. e.g.

diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index a8e8e8acbcc8..d90375659244 100644
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -49,6 +49,8 @@
#define INTEL_PT_ERR_SUPPRESS_OVF 1
#define INTEL_PT_ERR_SUPPRESS_LOST 2

+#define INTEL_PT_LOG_SUPPRESS_EV 1
+
struct range {
u64 start;
u64 end;
@@ -252,6 +254,11 @@ static void intel_pt_dump_sample(struct perf_session *session,
intel_pt_dump(pt, sample->aux_sample.data, sample->aux_sample.size);
}

+static bool intel_pt_log_events(struct intel_pt *pt)
+{
+ return !(pt->synth_opts.log_flags & INTEL_PT_LOG_SUPPRESS_EV);
+}
+
static int intel_pt_do_fix_overlap(struct intel_pt *pt, struct auxtrace_buffer *a,
struct auxtrace_buffer *b)
{
@@ -2589,10 +2596,6 @@ static int intel_pt_context_switch(struct intel_pt *pt, union perf_event *event,
return -EINVAL;
}

- intel_pt_log("context_switch: cpu %d pid %d tid %d time %"PRIu64" tsc %#"PRIx64"\n",
- cpu, pid, tid, sample->time, perf_time_to_tsc(sample->time,
- &pt->tc));
-
ret = intel_pt_sync_switch(pt, cpu, tid, sample->time);
if (ret <= 0)
return ret;
@@ -2749,9 +2752,11 @@ static int intel_pt_process_event(struct perf_session *session,
if (!err && event->header.type == PERF_RECORD_TEXT_POKE)
err = intel_pt_text_poke(pt, event);

- intel_pt_log("event %u: cpu %d time %"PRIu64" tsc %#"PRIx64" ",
- event->header.type, sample->cpu, sample->time, timestamp);
- intel_pt_log_event(event);
+ if (intel_pt_enable_logging && intel_pt_log_events(pt)) {
+ intel_pt_log("event %u: cpu %d time %"PRIu64" tsc %#"PRIx64" ",
+ event->header.type, sample->cpu, sample->time, timestamp);
+ intel_pt_log_event(event);
+ }

return err;
}
--
2.25.1