perf evsel: Know if byte swap is needed

Instead of passing it around for parsing as an explicit parameter, will
help with reading tracepoint fields when not using a perf session or
pevent structure, i.e. for non perf.data centered workflows.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-qa67ikv2sm49cwa7dyjhhp6g@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

9 files changed, 24 insertions, 18 deletions

diff --git a/tools/perf/builtin-test.c b/tools/perf/builtin-test.c
index 78b47a75a7c9..2fd2c031f627 100644
--- a/tools/perf/builtin-test.c
+++ b/tools/perf/builtin-test.c
@@ -564,7 +564,7 @@ static int test__basic_mmap(void)
                         goto out_munmap;
                 }
 
-                err = perf_evlist__parse_sample(evlist, event, &sample, false);
+                err = perf_evlist__parse_sample(evlist, event, &sample);
                 if (err) {
                         pr_err("Can't parse sample, err = %d\n", err);
                         goto out_munmap;
@@ -781,7 +781,7 @@ static int test__PERF_RECORD(void)
                                 if (type < PERF_RECORD_MAX)
                                         nr_events[type]++;
 
-                                err = perf_evlist__parse_sample(evlist, event, &sample, false);
+                                err = perf_evlist__parse_sample(evlist, event, &sample);
                                 if (err < 0) {
                                         if (verbose)
                                                 perf_event__fprintf(event, stderr);
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 5550754c05f2..e434a16bb5ac 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -823,7 +823,7 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)
         int ret;
 
         while ((event = perf_evlist__mmap_read(top->evlist, idx)) != NULL) {
-                ret = perf_evlist__parse_sample(top->evlist, event, &sample, false);
+                ret = perf_evlist__parse_sample(top->evlist, event, &sample);
                 if (ret) {
                         pr_err("Can't parse sample, err = %d\n", ret);
                         continue;
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 27f6de3aab16..704bd91ce05d 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -884,10 +884,10 @@ int perf_evlist__start_workload(struct perf_evlist *evlist)
 }
 
 int perf_evlist__parse_sample(struct perf_evlist *evlist, union perf_event *event,
-                              struct perf_sample *sample, bool swapped)
+                              struct perf_sample *sample)
 {
         struct perf_evsel *evsel = perf_evlist__first(evlist);
-        return perf_evsel__parse_sample(evsel, event, sample, swapped);
+        return perf_evsel__parse_sample(evsel, event, sample);
 }
 
 size_t perf_evlist__fprintf(struct perf_evlist *evlist, FILE *fp)
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 3f2e1e4ccdd5..008a95702bf7 100644
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -125,7 +125,7 @@ bool perf_evlist__sample_id_all(struct perf_evlist *evlist);
 u16 perf_evlist__id_hdr_size(struct perf_evlist *evlist);
 
 int perf_evlist__parse_sample(struct perf_evlist *evlist, union perf_event *event,
-                              struct perf_sample *sample, bool swapped);
+                              struct perf_sample *sample);
 
 bool perf_evlist__valid_sample_type(struct perf_evlist *evlist);
 bool perf_evlist__valid_sample_id_all(struct perf_evlist *evlist);
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 2467eaf2968f..fe9581b0323c 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -767,11 +767,13 @@ int perf_evsel__open_per_thread(struct perf_evsel *evsel,
         return __perf_evsel__open(evsel, &empty_cpu_map.map, threads);
 }
 
-static int perf_event__parse_id_sample(const union perf_event *event, u64 type,
-                                       struct perf_sample *sample,
-                                       bool swapped)
+static int perf_evsel__parse_id_sample(const struct perf_evsel *evsel,
+                                       const union perf_event *event,
+                                       struct perf_sample *sample)
 {
+        u64 type = evsel->attr.sample_type;
         const u64 *array = event->sample.array;
+        bool swapped = evsel->needs_swap;
         union u64_swap u;
 
         array += ((event->header.size -
@@ -832,10 +834,11 @@ static bool sample_overlap(const union perf_event *event,
 }
 
 int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event,
-                             struct perf_sample *data, bool swapped)
+                             struct perf_sample *data)
 {
         u64 type = evsel->attr.sample_type;
         u64 regs_user = evsel->attr.sample_regs_user;
+        bool swapped = evsel->needs_swap;
         const u64 *array;
 
         /*
@@ -852,7 +855,7 @@ int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event,
         if (event->header.type != PERF_RECORD_SAMPLE) {
                 if (!evsel->attr.sample_id_all)
                         return 0;
-                return perf_event__parse_id_sample(event, type, data, swapped);
+                return perf_evsel__parse_id_sample(evsel, event, data);
         }
 
         array = event->sample.array;
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index bb445d1cbc7b..60d28853748e 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -69,6 +69,7 @@ struct perf_evsel {
         struct cpu_map          *cpus;
         unsigned int            sample_size;
         bool                    supported;
+        bool                    needs_swap;
         /* parse modifier helper */
         int                     exclude_GH;
         struct perf_evsel       *leader;
@@ -205,7 +206,7 @@ static inline int perf_evsel__read_scaled(struct perf_evsel *evsel,
 void hists__init(struct hists *hists);
 
 int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event,
-                             struct perf_sample *sample, bool swapped);
+                             struct perf_sample *sample);
 
 static inline struct perf_evsel *perf_evsel__next(struct perf_evsel *evsel)
 {
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 6aae3290358e..7daad237dea5 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -1256,8 +1256,10 @@ read_event_desc(struct perf_header *ph, int fd)
                 if (ret != (ssize_t)sizeof(nr))
                         goto error;
 
-                if (ph->needs_swap)
+                if (ph->needs_swap) {
                         nr = bswap_32(nr);
+                        evsel->needs_swap = true;
+                }
 
                 evsel->name = do_read_string(fd, ph);
 
@@ -2626,6 +2628,8 @@ int perf_session__read_header(struct perf_session *session, int fd)
 
                 if (evsel == NULL)
                         goto out_delete_evlist;
+
+                evsel->needs_swap = header->needs_swap;
                 /*
                  * Do it before so that if perf_evsel__alloc_id fails, this
                  * entry gets purged too at perf_evlist__delete().
diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
i