perf script: Print raw ip instead of binary offset for callchain

Before this, the raw ip is printed for non-callchain and dso offset for
callchain. This inconsistent output for address may confuse people. And
mostly what we expect is the raw ip.

'dso offset' is printed in callchain:

  $ perf script
  ...
  ls 1341034 2739463.008343:    2162417 cycles:
          ffffffff99d657a7 [unknown] ([unknown])
          ffffffff99e00b67 [unknown] ([unknown])
                     235d3 memset+0x53 (/usr/lib/x86_64-linux-gnu/ld-2.31.so)  # dso offset
                      a61b _dl_map_object+0x1bb (/usr/lib/x86_64-linux-gnu/ld-2.31.so)

raw ip is printed for non-callchain:

  $ perf script  -G
  	...
          ls 1341034 2739463.008876:    2053304 cycles:  ffffffffc1596923 [unknown] ([unknown])
          ls 1341034 2739463.009381:    1917049 cycles:      14def8e149e6 __strcoll_l+0xd96 (/usr/lib/x86_64-linux-gnu/libc-2.31.so) # raw ip

Let's have consistent output for it. Later I'll add a new field 'dsoff' to
print dso offset.

Signed-off-by: Changbin Du <[email protected]>
Acked-by: Adrian Hunter <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Cc: Hui Wang <[email protected]>
Cc: Ian Rogers <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Mark Rutland <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --git a/tools/perf/util/evsel_fprintf.c b/tools/perf/util/evsel_fprintf.c
index a09ac00810b7fd93db9903639eba1800f3441963..cc80ec554c0a9929217fd3d7402c8f8e31497ab8 100644 (file)
--- a/tools/perf/util/evsel_fprintf.c
+++ b/tools/perf/util/evsel_fprintf.c
@@ -153,13 +153,8 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,
                        if (map)
                                addr = map__map_ip(map, node->ip);
 
-                       if (print_ip) {
-                               /* Show binary offset for userspace addr */
-                               if (map && !map__dso(map)->kernel)
-                                       printed += fprintf(fp, "%c%16" PRIx64, s, addr);
-                               else
-                                       printed += fprintf(fp, "%c%16" PRIx64, s, node->ip);
-                       }
+                       if (print_ip)
+                               printed += fprintf(fp, "%c%16" PRIx64, s, node->ip);
 
                        if (print_sym) {
                                printed += fprintf(fp, " ");