perf tools: Add aux-output config term

Expose the aux_output attribute flag to the user to configure, by adding a
config term 'aux-output'. For events that support it, selection of
'aux-output' causes the generation of AUX records instead of event records.
This requires that an AUX area event is also provided.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190806084606.4021-7-alexander.shishkin@linux.intel.com
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt
index d5e58e0a2bca6add2ff14d391f97533e7a5ea5b5..c6f9f31b603984b0187972d2db1dac338e46a5c4 100644 (file)
--- a/tools/perf/Documentation/perf-record.txt
+++ b/tools/perf/Documentation/perf-record.txt
@@ -60,6 +60,8 @@ OPTIONS
          - 'name' : User defined event name. Single quotes (') may be used to
                    escape symbols in the name from parsing by shell and tool
                    like this: name=\'CPU_CLK_UNHALTED.THREAD:cmask=0x1\'.
+         - 'aux-output': Generate AUX records instead of events. This requires
+                         that an AUX area event is also provided.
 
           See the linkperf:perf-list[1] man page for more parameters.
 

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 897a97af2d81d1a2ae5718afc50f5694c2fcff27..5da40511546b84bc746d37ac736410d115f530f4 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -833,6 +833,9 @@ static void apply_config_terms(struct evsel *evsel,
                        break;
                case PERF_EVSEL__CONFIG_TERM_PERCORE:
                        break;
+               case PERF_EVSEL__CONFIG_TERM_AUX_OUTPUT:
+                       attr->aux_output = term->val.aux_output ? 1 : 0;
+                       break;
                default:
                        break;
                }

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 3cf35aa782b93707be960bd40f9a346266e412d7..8a316dd54cd0bd0a07b36a68e3d9a54067256936 100644 (file)
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -52,6 +52,7 @@ enum term_type {
        PERF_EVSEL__CONFIG_TERM_DRV_CFG,
        PERF_EVSEL__CONFIG_TERM_BRANCH,
        PERF_EVSEL__CONFIG_TERM_PERCORE,
+       PERF_EVSEL__CONFIG_TERM_AUX_OUTPUT,
 };
 
 struct perf_evsel_config_term {
@@ -70,6 +71,7 @@ struct perf_evsel_config_term {
                char    *branch;
                unsigned long max_events;
                bool    percore;
+               bool    aux_output;
        } val;
        bool weak;
 };

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 2cfec3b7a982bc1c9e22c6068e911febabba889d..9101568946d25340b59cca15f33fe10b9db6359f 100644 (file)
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -963,6 +963,7 @@ static const char *config_term_names[__PARSE_EVENTS__TERM_TYPE_NR] = {
        [PARSE_EVENTS__TERM_TYPE_NOOVERWRITE]           = "no-overwrite",
        [PARSE_EVENTS__TERM_TYPE_DRV_CFG]               = "driver-config",
        [PARSE_EVENTS__TERM_TYPE_PERCORE]               = "percore",
+       [PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT]            = "aux-output",
 };
 
 static bool config_term_shrinked;
@@ -1083,6 +1084,9 @@ do {                                                                         \
                        return -EINVAL;
                }
                break;
+       case PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT:
+               CHECK_TYPE_VAL(NUM);
+               break;
        default:
                err->str = strdup("unknown term");
                err->idx = term->err_term;
@@ -1133,6 +1137,7 @@ static int config_term_tracepoint(struct perf_event_attr *attr,
        case PARSE_EVENTS__TERM_TYPE_MAX_EVENTS:
        case PARSE_EVENTS__TERM_TYPE_OVERWRITE:
        case PARSE_EVENTS__TERM_TYPE_NOOVERWRITE:
+       case PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT:
                return config_term_common(attr, term, err);
        default:
                if (err) {
@@ -1225,6 +1230,9 @@ do {                                                              \
                        ADD_CONFIG_TERM(PERCORE, percore,
                                        term->val.num ? true : false);
                        break;
+               case PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT:
+                       ADD_CONFIG_TERM(AUX_OUTPUT, aux_output, term->val.num ? 1 : 0);
+                       break;
                default:
                        break;
                }

diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index 48111b8fc232cf9fcec3daa326f46be2c8f55a55..616ca1eda0eb335d42875776df7c5e7b9ef395ba 100644 (file)
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -76,6 +76,7 @@ enum {
        PARSE_EVENTS__TERM_TYPE_OVERWRITE,
        PARSE_EVENTS__TERM_TYPE_DRV_CFG,
        PARSE_EVENTS__TERM_TYPE_PERCORE,
+       PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT,
        __PARSE_EVENTS__TERM_TYPE_NR,
 };
 

diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l
index ca6098874fe21d98ae45262c9b3986545647dc0f..7469497cd28e4c25b873c3b02ec9c09b8846a368 100644 (file)
--- a/tools/perf/util/parse-events.l
+++ b/tools/perf/util/parse-events.l
@@ -284,6 +284,7 @@ no-inherit          { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_NOINHERIT); }
 overwrite              { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_OVERWRITE); }
 no-overwrite           { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_NOOVERWRITE); }
 percore                        { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_PERCORE); }
+aux-output             { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT); }
 ,                      { return ','; }
 "/"                    { BEGIN(INITIAL); return '/'; }
 {name_minus}           { return str(yyscanner, PE_NAME); }