[PATCH v4 5/7] perf intel-pt: Process options for PEBS event synthesis

[Alexander Shishkin]

From: Adrian Hunter <adrian.hun...@intel.com>

Process synth_opts.other_events and attr.aux_source to set up for
synthesizing PEBs via Intel PT events.

Signed-off-by: Adrian Hunter <adrian.hun...@intel.com>
Signed-off-by: Alexander Shishkin <alexander.shish...@linux.intel.com>
---
 tools/perf/arch/x86/util/intel-pt.c | 23 +++++++++++++++++++++++
 tools/perf/util/intel-pt.c          | 18 ++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/tools/perf/arch/x86/util/intel-pt.c 
b/tools/perf/arch/x86/util/intel-pt.c
index 609088c01e3a..c92ece8af3b8 100644
--- a/tools/perf/arch/x86/util/intel-pt.c
+++ b/tools/perf/arch/x86/util/intel-pt.c
@@ -548,6 +548,26 @@ static int intel_pt_validate_config(struct perf_pmu 
*intel_pt_pmu,
                                        evsel->attr.config);
 }
 
+/*
+ * Currently, there is not enough information to disambiguate different PEBS
+ * events, so only allow one.
+ */
+static bool intel_pt_too_many_aux_source(struct perf_evlist *evlist)
+{
+       struct perf_evsel *evsel;
+       int aux_source_cnt = 0;
+
+       evlist__for_each_entry(evlist, evsel)
+               aux_source_cnt += !!evsel->attr.aux_source;
+
+       if (aux_source_cnt > 1) {
+               pr_err(INTEL_PT_PMU_NAME " supports at most one event with 
aux-source\n");
+               return true;
+       }
+
+       return false;
+}
+
 static int intel_pt_recording_options(struct auxtrace_record *itr,
                                      struct perf_evlist *evlist,
                                      struct record_opts *opts)
@@ -588,6 +608,9 @@ static int intel_pt_recording_options(struct 
auxtrace_record *itr,
                return -EINVAL;
        }
 
+       if (intel_pt_too_many_aux_source(evlist))
+               return -EINVAL;
+
        if (!opts->full_auxtrace)
                return 0;
 
diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index df061599fef4..587a2dfb416b 100644
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -2894,6 +2894,22 @@ static int intel_pt_synth_events(struct intel_pt *pt,
        return 0;
 }
 
+static void intel_pt_setup_pebs_events(struct intel_pt *pt)
+{
+       struct perf_evsel *evsel;
+
+       if (!pt->synth_opts.other_events)
+               return;
+
+       evlist__for_each_entry(pt->session->evlist, evsel) {
+               if (evsel->attr.aux_source && evsel->id) {
+                       pt->sample_pebs = true;
+                       pt->pebs_evsel = evsel;
+                       return;
+               }
+       }
+}
+
 static struct perf_evsel *intel_pt_find_sched_switch(struct perf_evlist 
*evlist)
 {
        struct perf_evsel *evsel;
@@ -3263,6 +3279,8 @@ int intel_pt_process_auxtrace_info(union perf_event 
*event,
        if (err)
                goto err_delete_thread;
 
+       intel_pt_setup_pebs_events(pt);
+
        err = auxtrace_queues__process_index(&pt->queues, session);
        if (err)
                goto err_delete_thread;
-- 
2.20.1