perf script: Make itrace script default to all calls

By default 'perf script' for itrace outputs sampled instructions or
branches. In my experience this is confusing to users because it's hard
to correlate with real program behavior. The sampling makes sense for
tools like 'perf report' that actually sample to reduce the run time,
but run time is normally not a problem for 'perf script'.  It's better
to give an accurate representation of the program flow.

Default 'perf script' to output all calls for itrace. That's a much saner
default. The old behavior can be still requested with 'perf script'
--itrace=ibxwpe100000

v2: Fix ETM build failure
v3: Really fix ETM build failure (Kim Phillips)

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Kim Phillips <kim.phillips@arm.com>
Cc: Leo Yan <leo.yan@linaro.org>
Link: http://lkml.kernel.org/r/20180920180540.14039-3-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/Documentation/itrace.txt b/tools/perf/Documentation/itrace.txt
index a3abe04c779d03615a9ba3815337bf1345b45082..c2182cbabde3a07196b26e44a3a8c6a0165d3cb4 100644 (file)
--- a/tools/perf/Documentation/itrace.txt
+++ b/tools/perf/Documentation/itrace.txt
@@ -11,10 +11,11 @@
                l       synthesize last branch entries (use with i or x)
                s       skip initial number of events
 
-       The default is all events i.e. the same as --itrace=ibxwpe
+       The default is all events i.e. the same as --itrace=ibxwpe,
+       except for perf script where it is --itrace=ce
 
-       In addition, the period (default 100000) for instructions events
-       can be specified in units of:
+       In addition, the period (default 100000, except for perf script where it is 1)
+       for instructions events can be specified in units of:
 
                i       instructions
                t       ticks

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 411ea175bcaf0c4e002224f75145284fc4eab1c1..6099c722a6796c5d059232bc29de83eae3d4426c 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -3131,7 +3131,10 @@ int cmd_script(int argc, const char **argv)
        char *rec_script_path = NULL;
        char *rep_script_path = NULL;
        struct perf_session *session;
-       struct itrace_synth_opts itrace_synth_opts = { .set = false, };
+       struct itrace_synth_opts itrace_synth_opts = {
+               .set = false,
+               .default_no_sample = true,
+       };
        char *script_path = NULL;
        const char **__argv;
        int i, j, err = 0;

diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
index c4617bcfd521f0ecdcf1dd3b5216014419dcdc2a..72d5ba2479bf19ba1ec9e92d576fc3b8db953ca9 100644 (file)
--- a/tools/perf/util/auxtrace.c
+++ b/tools/perf/util/auxtrace.c
@@ -962,16 +962,23 @@ s64 perf_event__process_auxtrace(struct perf_session *session,
 #define PERF_ITRACE_DEFAULT_LAST_BRANCH_SZ     64
 #define PERF_ITRACE_MAX_LAST_BRANCH_SZ         1024
 
-void itrace_synth_opts__set_default(struct itrace_synth_opts *synth_opts)
+void itrace_synth_opts__set_default(struct itrace_synth_opts *synth_opts,
+                                   bool no_sample)
 {
-       synth_opts->instructions = true;
        synth_opts->branches = true;
        synth_opts->transactions = true;
        synth_opts->ptwrites = true;
        synth_opts->pwr_events = true;
        synth_opts->errors = true;
-       synth_opts->period_type = PERF_ITRACE_DEFAULT_PERIOD_TYPE;
-       synth_opts->period = PERF_ITRACE_DEFAULT_PERIOD;
+       if (no_sample) {
+               synth_opts->period_type = PERF_ITRACE_PERIOD_INSTRUCTIONS;
+               synth_opts->period = 1;
+               synth_opts->calls = true;
+       } else {
+               synth_opts->instructions = true;
+               synth_opts->period_type = PERF_ITRACE_DEFAULT_PERIOD_TYPE;
+               synth_opts->period = PERF_ITRACE_DEFAULT_PERIOD;
+       }
        synth_opts->callchain_sz = PERF_ITRACE_DEFAULT_CALLCHAIN_SZ;
        synth_opts->last_branch_sz = PERF_ITRACE_DEFAULT_LAST_BRANCH_SZ;
        synth_opts->initial_skip = 0;
@@ -999,7 +1006,7 @@ int itrace_parse_synth_opts(const struct option *opt, const char *str,
        }
 
        if (!str) {
-               itrace_synth_opts__set_default(synth_opts);
+               itrace_synth_opts__set_default(synth_opts, false);
                return 0;
        }
 

diff --git a/tools/perf/util/auxtrace.h b/tools/perf/util/auxtrace.h
index d88f6e9eb4611ab7344eb480a11c14bd2c79afe7..8e50f96d4b23de86e4939d7276e024f7c353aa81 100644 (file)
--- a/tools/perf/util/auxtrace.h
+++ b/tools/perf/util/auxtrace.h
@@ -58,6 +58,7 @@ enum itrace_period_type {
 /**
  * struct itrace_synth_opts - AUX area tracing synthesis options.
  * @set: indicates whether or not options have been set
+ * @default_no_sample: Default to no sampling.
  * @inject: indicates the event (not just the sample) must be fully synthesized
  *          because 'perf inject' will write it out
  * @instructions: whether to synthesize 'instructions' events
@@ -82,6 +83,7 @@ enum itrace_period_type {
  */
 struct itrace_synth_opts {
        bool                    set;
+       bool                    default_no_sample;
        bool                    inject;
        bool                    instructions;
        bool                    branches;
@@ -528,7 +530,8 @@ int perf_event__process_auxtrace_error(struct perf_session *session,
                                       union perf_event *event);
 int itrace_parse_synth_opts(const struct option *opt, const char *str,
                            int unset);
-void itrace_synth_opts__set_default(struct itrace_synth_opts *synth_opts);
+void itrace_synth_opts__set_default(struct itrace_synth_opts *synth_opts,
+                                   bool no_sample);
 
 size_t perf_event__fprintf_auxtrace_error(union perf_event *event, FILE *fp);
 void perf_session__auxtrace_error_inc(struct perf_session *session,

diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c
index 2ae640257fdbbe897d8c398d1dfeeb406d1c9fb1..3b37d66dc5337056e64f21f9a4e8d3a3fdc86d22 100644 (file)
--- a/tools/perf/util/cs-etm.c
+++ b/tools/perf/util/cs-etm.c
@@ -1432,7 +1432,8 @@ int cs_etm__process_auxtrace_info(union perf_event *event,
        if (session->itrace_synth_opts && session->itrace_synth_opts->set) {
                etm->synth_opts = *session->itrace_synth_opts;
        } else {
-               itrace_synth_opts__set_default(&etm->synth_opts);
+               itrace_synth_opts__set_default(&etm->synth_opts,
+                               session->itrace_synth_opts->default_no_sample);
                etm->synth_opts.callchain = false;
        }
 

diff --git a/tools/perf/util/intel-bts.c b/tools/perf/util/intel-bts.c
index 7f0c83b6332bfd94ca92eac2723c700421cf119a..3b3a3d55dca18483a7aa9b77d35213e6be69f699 100644 (file)
--- a/tools/perf/util/intel-bts.c
+++ b/tools/perf/util/intel-bts.c
@@ -910,7 +910,8 @@ int intel_bts_process_auxtrace_info(union perf_event *event,
        if (session->itrace_synth_opts && session->itrace_synth_opts->set) {
                bts->synth_opts = *session->itrace_synth_opts;
        } else {
-               itrace_synth_opts__set_default(&bts->synth_opts);
+               itrace_synth_opts__set_default(&bts->synth_opts,
+                               session->itrace_synth_opts->default_no_sample);
                if (session->itrace_synth_opts)
                        bts->synth_opts.thread_stack =
                                session->itrace_synth_opts->thread_stack;

diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index 48c1d415c6b069004dacddafdb759f25efb2b176..ffa385a029b3fa2613c7629752b1c49d7e4a3ec9 100644 (file)
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -2559,7 +2559,8 @@ int intel_pt_process_auxtrace_info(union perf_event *event,
        if (session->itrace_synth_opts && session->itrace_synth_opts->set) {
                pt->synth_opts = *session->itrace_synth_opts;
        } else {
-               itrace_synth_opts__set_default(&pt->synth_opts);
+               itrace_synth_opts__set_default(&pt->synth_opts,
+                               session->itrace_synth_opts->default_no_sample);
                if (use_browser != -1) {
                        pt->synth_opts.branches = false;
                        pt->synth_opts.callchain = true;