perf callchain: Switch callchain_param_setup from an arch to an e_machine

Increase use of e_machine by replacing callchain_param_setup's arch
argument to be an e_machine typically read from the session.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Leo Yan <leo.yan@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Shimin Guo <shimin.guo@skydio.com>
Cc: Yujie Liu <yujie.liu@intel.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 2e936928e8c052a1e8085c212066049c60aa5d71..810ffd66b11c34cddba041d4b3ac2954e0ae7935 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -448,7 +448,7 @@ static int report__setup_sample_type(struct report *rep)
                }
        }
 
-       callchain_param_setup(sample_type, perf_env__arch(perf_session__env(rep->session)));
+       callchain_param_setup(sample_type, perf_session__e_machine(session));
 
        if (rep->stitch_lbr && (callchain_param.record_mode != CALLCHAIN_LBR)) {
                ui__warning("Can't find LBR callchain. Switch off --stitch-lbr.\n"
@@ -1283,7 +1283,6 @@ static int process_attr(const struct perf_tool *tool __maybe_unused,
                        struct evlist **pevlist)
 {
        struct perf_session *session;
-       struct perf_env *env;
        u64 sample_type;
        int err;
 
@@ -1297,8 +1296,7 @@ static int process_attr(const struct perf_tool *tool __maybe_unused,
         */
        sample_type = evlist__combined_sample_type(*pevlist);
        session = (*pevlist)->session;
-       env = perf_session__env(session);
-       callchain_param_setup(sample_type, perf_env__arch(env));
+       callchain_param_setup(sample_type, perf_session__e_machine(session));
        return 0;
 }
 

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 69af25780fc54269bd6699b5f7ba9d4c7f96c830..c7d5a325b5cb48cfde2fa264c05296e75f2d676f 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -2859,7 +2859,7 @@ static int process_attr(const struct perf_tool *tool, union perf_event *event,
         * on events sample_type.
         */
        sample_type = evlist__combined_sample_type(evlist);
-       callchain_param_setup(sample_type, perf_env__arch(perf_session__env(scr->session)));
+       callchain_param_setup(sample_type, perf_session__e_machine(evsel__session(evsel)));
 
        /* Enable fields for callchain entries */
        if (symbol_conf.use_callchain &&
@@ -3834,7 +3834,7 @@ static void script__setup_sample_type(struct perf_script *script)
        struct perf_session *session = script->session;
        u64 sample_type = evlist__combined_sample_type(session->evlist);
 
-       callchain_param_setup(sample_type, perf_env__arch(session->machines.host.env));
+       callchain_param_setup(sample_type, perf_session__e_machine(session));
 
        if (script->stitch_lbr && (callchain_param.record_mode != CALLCHAIN_LBR)) {
                pr_warning("Can't find LBR callchain. Switch off --stitch-lbr.\n"

diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 515bb8b5da017fe462d50a4b3aac83310dab7141..8ff0898799ee0cc00e47383f055705f0852947db 100644 (file)
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -1681,7 +1681,7 @@ void callchain_cursor_reset(struct callchain_cursor *cursor)
                map_symbol__exit(&node->ms);
 }
 
-void callchain_param_setup(u64 sample_type, const char *arch)
+void callchain_param_setup(u64 sample_type, uint16_t e_machine)
 {
        if (symbol_conf.use_callchain || symbol_conf.cumulate_callchain) {
                if ((sample_type & PERF_SAMPLE_REGS_USER) &&
@@ -1703,7 +1703,7 @@ void callchain_param_setup(u64 sample_type, const char *arch)
         * erroneous entries. Always skipping the LR and starting from the FP
         * can result in missing entries.
         */
-       if (callchain_param.record_mode == CALLCHAIN_FP && !strcmp(arch, "arm64"))
+       if (callchain_param.record_mode == CALLCHAIN_FP && e_machine == EM_AARCH64)
                dwarf_callchain_users = true;
 }
 

diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h
index 2a52af8c80ace33cc3015d57ae5579e076798418..df54ddb8c0cb107492119afa12c0349bc853a675 100644 (file)
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@ -303,7 +303,7 @@ int callchain_branch_counts(struct callchain_root *root,
                            u64 *branch_count, u64 *predicted_count,
                            u64 *abort_count, u64 *cycles_count);
 
-void callchain_param_setup(u64 sample_type, const char *arch);
+void callchain_param_setup(u64 sample_type, uint16_t e_machine);
 
 bool callchain_cnode_matched(struct callchain_node *base_cnode,
                             struct callchain_node *pair_cnode);

diff --git a/tools/perf/util/sample.c b/tools/perf/util/sample.c
index 6d70a5db00a2fd02865531a23a4000c97ed007f9..8f82aaf1aab6e1c2cf258418048e807eef2f903e 100644 (file)
--- a/tools/perf/util/sample.c
+++ b/tools/perf/util/sample.c
@@ -98,7 +98,7 @@ void perf_sample__fetch_insn(struct perf_sample *sample,
        if (!sample->ip || sample->insn_len != 0)
                return;
 
-       e_machine = thread__e_machine(thread, machine);
+       e_machine = thread__e_machine(thread, machine, /*e_flags=*/NULL);
        len = elf_machine_max_instruction_length(e_machine);
        len = thread__memcpy(thread, machine, sample->insn,
                             sample->ip, len,