perf intel-pt: Move synth_opts initialization earlier

Move synth_opts initialization earlier, so it can be used earlier.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: https://lore.kernel.org/r/20210430070309.17624-3-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index 8658d42..eef8970 100644 (file)
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -3479,6 +3479,20 @@ int intel_pt_process_auxtrace_info(union perf_event *event,
 
        intel_pt_log_set_name(INTEL_PT_PMU_NAME);
 
+       if (session->itrace_synth_opts->set) {
+               pt->synth_opts = *session->itrace_synth_opts;
+       } else {
+               struct itrace_synth_opts *opts = session->itrace_synth_opts;
+
+               itrace_synth_opts__set_default(&pt->synth_opts, opts->default_no_sample);
+               if (!opts->default_no_sample && !opts->inject) {
+                       pt->synth_opts.branches = false;
+                       pt->synth_opts.callchain = true;
+                       pt->synth_opts.add_callchain = true;
+               }
+               pt->synth_opts.thread_stack = opts->thread_stack;
+       }
+
        pt->session = session;
        pt->machine = &session->machines.host; /* No kvm support */
        pt->auxtrace_type = auxtrace_info->type;
@@ -3609,21 +3623,6 @@ int intel_pt_process_auxtrace_info(union perf_event *event,
                goto err_delete_thread;
        }
 
-       if (session->itrace_synth_opts->set) {
-               pt->synth_opts = *session->itrace_synth_opts;
-       } else {
-               itrace_synth_opts__set_default(&pt->synth_opts,
-                               session->itrace_synth_opts->default_no_sample);
-               if (!session->itrace_synth_opts->default_no_sample &&
-                   !session->itrace_synth_opts->inject) {
-                       pt->synth_opts.branches = false;
-                       pt->synth_opts.callchain = true;
-                       pt->synth_opts.add_callchain = true;
-               }
-               pt->synth_opts.thread_stack =
-                               session->itrace_synth_opts->thread_stack;
-       }
-
        if (pt->synth_opts.log)
                intel_pt_log_enable();