perf sort: Use perf_env to set arch sort keys and header

Previously arch_support_sort_key and arch_perf_header_entry used a
weak symbol to compile as appropriate for x86 and powerpc. A
limitation to this is that the handling of a data file could vary in
cross-platform development. Change to using the perf_env of the
current session to determine the architecture kind and set the sort
key and header entries as appropriate.

Signed-off-by: Ian Rogers <irogers@google.com>
Link: https://lore.kernel.org/r/20250724163302.596743-23-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

diff --git a/tools/perf/arch/powerpc/util/Build b/tools/perf/arch/powerpc/util/Build
index ed82715080f96a78df92c1daaed87264530b3dea..fdd6a77a3432c91b92e536ad518713a3c6e07fd9 100644 (file)
--- a/tools/perf/arch/powerpc/util/Build
+++ b/tools/perf/arch/powerpc/util/Build
@@ -5,7 +5,6 @@ perf-util-y += mem-events.o
 perf-util-y += pmu.o
 perf-util-y += sym-handling.o
 perf-util-y += evsel.o
-perf-util-y += event.o
 
 perf-util-$(CONFIG_LIBDW) += skip-callchain-idx.o
 

diff --git a/tools/perf/arch/powerpc/util/event.c b/tools/perf/arch/powerpc/util/event.c
deleted file mode 100644 (file)
index 024ac8b..0000000
--- a/tools/perf/arch/powerpc/util/event.c
+++ /dev/null
@@ -1,34 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/zalloc.h>
-
-#include "../../../util/event.h"
-#include "../../../util/synthetic-events.h"
-#include "../../../util/machine.h"
-#include "../../../util/tool.h"
-#include "../../../util/map.h"
-#include "../../../util/debug.h"
-#include "../../../util/sample.h"
-
-const char *arch_perf_header_entry(const char *se_header)
-{
-       if (!strcmp(se_header, "Local INSTR Latency"))
-               return "Finish Cyc";
-       else if (!strcmp(se_header, "INSTR Latency"))
-               return "Global Finish_cyc";
-       else if (!strcmp(se_header, "Local Pipeline Stage Cycle"))
-               return "Dispatch Cyc";
-       else if (!strcmp(se_header, "Pipeline Stage Cycle"))
-               return "Global Dispatch_cyc";
-       return se_header;
-}
-
-int arch_support_sort_key(const char *sort_key)
-{
-       if (!strcmp(sort_key, "p_stage_cyc"))
-               return 1;
-       if (!strcmp(sort_key, "local_p_stage_cyc"))
-               return 1;
-       return 0;
-}

diff --git a/tools/perf/arch/x86/util/event.c b/tools/perf/arch/x86/util/event.c
index 576c1c36046ca6a89074ada04ad64d4c358fd0c4..3cd384317739a2828f7f157ef6df2fb7db362c16 100644 (file)
--- a/tools/perf/arch/x86/util/event.c
+++ b/tools/perf/arch/x86/util/event.c
@@ -91,22 +91,3 @@ int perf_event__synthesize_extra_kmaps(const struct perf_tool *tool,
 }
 
 #endif
-
-const char *arch_perf_header_entry(const char *se_header)
-{
-       if (!strcmp(se_header, "Local Pipeline Stage Cycle"))
-               return "Local Retire Latency";
-       else if (!strcmp(se_header, "Pipeline Stage Cycle"))
-               return "Retire Latency";
-
-       return se_header;
-}
-
-int arch_support_sort_key(const char *sort_key)
-{
-       if (!strcmp(sort_key, "p_stage_cyc"))
-               return 1;
-       if (!strcmp(sort_key, "local_p_stage_cyc"))
-               return 1;
-       return 0;
-}

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 326593862998e8cd9f8a023571fb1714ee443b3e..5d57d2913f3d9a3353efcb9b442f8111895a22c6 100644 (file)
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -947,7 +947,7 @@ int cmd_annotate(int argc, const char **argv)
                        annotate_opts.show_br_cntr = true;
        }
 
-       if (setup_sorting(NULL) < 0)
+       if (setup_sorting(/*evlist=*/NULL, perf_session__env(annotate.session)) < 0)
                usage_with_options(annotate_usage, options);
 
        ret = __cmd_annotate(&annotate);

diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c
index 8cb36d9433f850376a4e0a6a3046c42b831ad00c..9e9ff471ddd16e46c5dff4e1cf2527b05a896256 100644 (file)
--- a/tools/perf/builtin-c2c.c
+++ b/tools/perf/builtin-c2c.c
@@ -195,12 +195,14 @@ static struct hist_entry_ops c2c_entry_ops = {
 
 static int c2c_hists__init(struct c2c_hists *hists,
                           const char *sort,
-                          int nr_header_lines);
+                          int nr_header_lines,
+                          struct perf_env *env);
 
 static struct c2c_hists*
 he__get_c2c_hists(struct hist_entry *he,
                  const char *sort,
-                 int nr_header_lines)
+                 int nr_header_lines,
+                 struct perf_env *env)
 {
        struct c2c_hist_entry *c2c_he;
        struct c2c_hists *hists;
@@ -214,7 +216,7 @@ he__get_c2c_hists(struct hist_entry *he,
        if (!hists)
                return NULL;
 
-       ret = c2c_hists__init(hists, sort, nr_header_lines);
+       ret = c2c_hists__init(hists, sort, nr_header_lines, env);
        if (ret) {
                free(hists);
                return NULL;
@@ -350,7 +352,7 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused,
 
                mi = mi_dup;
 
-               c2c_hists = he__get_c2c_hists(he, c2c.cl_sort, 2);
+               c2c_hists = he__get_c2c_hists(he, c2c.cl_sort, 2, machine->env);
                if (!c2c_hists)
                        goto free_mi;
 
@@ -1966,7 +1968,8 @@ static struct c2c_fmt *get_format(const char *name)
        return c2c_fmt;
 }
 
-static int c2c_hists__init_output(struct perf_hpp_list *hpp_list, char *name)
+static int c2c_hists__init_output(struct perf_hpp_list *hpp_list, char *name,
+                                 struct perf_env *env __maybe_unused)
 {
        struct c2c_fmt *c2c_fmt = get_format(name);
        int level = 0;
@@ -1980,14 +1983,14 @@ static int c2c_hists__init_output(struct perf_hpp_list *hpp_list, char *name)
        return 0;
 }
 
-static int c2c_hists__init_sort(struct perf_hpp_list *hpp_list, char *name)
+static int c2c_hists__init_sort(struct perf_hpp_list *hpp_list, char *name, struct perf_env *env)
 {
        struct c2c_fmt *c2c_fmt = get_format(name);
        struct c2c_dimension *dim;
 
        if (!c2c_fmt) {
                reset_dimensions();
-               return sort_dimension__add(hpp_list, name, NULL, 0);
+               return sort_dimension__add(hpp_list, name, /*evlist=*/NULL, env, /*level=*/0);
        }
 
        dim = c2c_fmt->dim;
@@ -2008,7 +2011,7 @@ static int c2c_hists__init_sort(struct perf_hpp_list *hpp_list, char *name)
                                                                                \
                for (tok = strtok_r((char *)_list, ", ", &tmp);                 \
                                tok; tok = strtok_r(NULL, ", ", &tmp)) {        \
-                       ret = _fn(hpp_list, tok);                               \
+                       ret = _fn(hpp_list, tok, env);                          \
                        if (ret == -EINVAL) {                                   \
                                pr_err("Invalid --fields key: `%s'", tok);      \
                                break;                                          \
@@ -2021,7 +2024,8 @@ static int c2c_hists__init_sort(struct perf_hpp_list *hpp_list, char *name)
 
 static int hpp_list__parse(struct perf_hpp_list *hpp_list,
                           const char *output_,
-                          const char *sort_)
+                          const char *sort_,
+                          struct perf_env *env)
 {
        char *output = output_ ? strdup(output_) : NULL;
        char *sort   = sort_   ? strdup(sort_) : NULL;
@@ -2052,7 +2056,8 @@ static int hpp_list__parse(struct perf_hpp_list *hpp_list,
 
 static int c2c_hists__init(struct c2c_hists *hists,
                           const char *sort,
-                          int nr_header_lines)
+                          int nr_header_lines,
+                          struct perf_env *env)
 {
        __hists__init(&hists->hists, &hists->list);
 
@@ -2066,15 +2071,16 @@ static int c2c_hists__init(struct c2c_hists *hists,
        /* Overload number of header lines.*/
        hists->list.nr_header_lines = nr_header_lines;
 
-       return hpp_list__parse(&hists->list, NULL, sort);
+       return hpp_list__parse(&hists->list, /*output=*/NULL, sort, env);
 }
 
 static int c2c_hists__reinit(struct c2c_hists *c2c_hists,
                             const char *output,
-                            const char *sort)
+                            const char *sort,
+                            struct perf_env *env)
 {
        perf_hpp__reset_output_field(&c2c_hists->list);
-       return hpp_list__parse(&c2c_hists->list, output, sort);
+       return hpp_list__parse(&c2c_hists->list, output, sort, env);
 }
 
 #define DISPLAY_LINE_LIMIT  0.001
@@ -2207,8 +2213,9 @@ static int filter_cb(struct hist_entry *he, void *arg __maybe_unused)
        return 0;
 }
 
-static int resort_cl_cb(struct hist_entry *he, void *arg __maybe_unused)
+static int resort_cl_cb(struct hist_entry *he, void *arg)
 {
+       struct perf_env *env = arg;
        struct c2c_hist_entry *c2c_he;
        struct c2c_hists *c2c_hists;
        bool display = he__display(he, &c2c.shared_clines_stats);
@@ -2222,7 +2229,7 @@ static int resort_cl_cb(struct hist_entry *he, void *arg __maybe_unused)
                c2c_he->cacheline_idx = idx++;
                calc_width(c2c_he);
 
-               c2c_hists__reinit(c2c_hists, c2c.cl_output, c2c.cl_resort);
+               c2c_hists__reinit(c2c_hists, c2c.cl_output, c2c.cl_resort, env);
 
                hists__collapse_resort(&c2c_hists->hists, NULL);
                hists__output_resort_cb(&c2c_hists->hists, NULL, filter_cb);
@@ -2334,7 +2341,7 @@ static int resort_shared_cl_cb(struct hist_entry *he, void *arg __maybe_unused)
        return 0;
 }
 
-static int hists__iterate_cb(struct hists *hists, hists__resort_cb_t cb)
+static int hists__iterate_cb(struct hists *hists, hists__resort_cb_t cb, void *arg)
 {
        struct rb_node *next = rb_first_cached(&hists->entries);
        int ret = 0;
@@ -2343,7 +2350,7 @@ static int hists__iterate_cb(struct hists *hists, hists__resort_cb_t cb)
                struct hist_entry *he;
 
                he = rb_entry(next, struct hist_entry, rb_node);
-               ret = cb(he, NULL);
+               ret = cb(he, arg);
                if (ret)
                        break;
                next = rb_next(&he->rb_node);
@@ -2449,7 +2456,7 @@ static void print_cacheline(struct c2c_hists *c2c_hists,
        hists__fprintf(&c2c_hists->hists, false, 0, 0, 0, out, false);
 }
 
-static void print_pareto(FILE *out)
+static void print_pareto(FILE *out, struct perf_env *env)
 {
        struct perf_hpp_list hpp_list;
        struct rb_node *nd;
@@ -2474,7 +2481,7 @@ static void print_pareto(FILE *out)
                            "dcacheline";
 
        perf_hpp_list__init(&hpp_list);
-       ret = hpp_list__parse(&hpp_list, cl_output, NULL);
+       ret = hpp_list__parse(&hpp_list, cl_output, /*evlist=*/NULL, env);
 
        if (WARN_ONCE(ret, "failed to setup sort entries\n"))
                return;
@@ -2539,7 +2546,7 @@ static void perf_c2c__hists_fprintf(FILE *out, struct perf_session *session)
        fprintf(out, "=================================================\n");
        fprintf(out, "#\n");
 
-       print_pareto(out);
+       print_pareto(out, perf_session__env(session));
 }
 
 #ifdef HAVE_SLANG_SUPPORT
@@ -3097,7 +3104,7 @@ static int perf_c2c__report(int argc, const char **argv)
                goto out_session;
        }
 
-       err = c2c_hists__init(&c2c.hists, "dcacheline", 2);
+       err = c2c_hists__init(&c2c.hists, "dcacheline", 2, perf_session__env(session));
        if (err) {
                pr_debug("Failed to initialize hists\n");
                goto out_session;
@@ -3181,13 +3188,13 @@ static int perf_c2c__report(int argc, const char **argv)
        else if (c2c.display == DISPLAY_SNP_PEER)
                sort_str = "tot_peer";
 
-       c2c_hists__reinit(&c2c.hists, output_str, sort_str);
+       c2c_hists__reinit(&c2c.hists, output_str, sort_str, perf_session__env(session));
 
        ui_progress__init(&prog, c2c.hists.hists.nr_entries, "Sorting...");
 
        hists__collapse_resort(&c2c.hists.hists, NULL);
        hists__output_resort_cb(&c2c.hists.hists, &prog, resort_shared_cl_cb);
-       hists__iterate_cb(&c2c.hists.hists, resort_cl_cb);
+       hists__iterate_cb(&c2c.hists.hists, resort_cl_cb, perf_session__env(session));
 
        ui_progress__finish();
 

diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index ae490d58af9203b87d71ab3bb0ac21ddfbfab407..53d5ea4a6a4f7b540d14d81f3601bfa764e4ebd9 100644 (file)
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -2003,7 +2003,7 @@ int cmd_diff(int argc, const char **argv)
                sort__mode = SORT_MODE__DIFF;
        }
 
-       if (setup_sorting(NULL) < 0)
+       if (setup_sorting(/*evlist=*/NULL, perf_session__env(data__files[0].session)) < 0)
                usage_with_options(diff_usage, options);
 
        setup_pager();

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index ada8e0166c781010089f721401d91b9d2325b8c9..35df04dad2fd08fec1f16bf19ce28429ffde1713 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -1790,7 +1790,7 @@ repeat:
        }
 
        if ((last_key != K_SWITCH_INPUT_DATA && last_key != K_RELOAD) &&
-           (setup_sorting(session->evlist) < 0)) {
+           (setup_sorting(session->evlist, perf_session__env(session)) < 0)) {
                if (sort_order)
                        parse_options_usage(report_usage, options, "s", 1);
                if (field_order)

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index e9743f17bd0ce8952a93ce3012eca701c9c28ab6..a11f629c7d76a24cc22e90d397ef006170c64ff6 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1767,7 +1767,17 @@ int cmd_top(int argc, const char **argv)
 
        setup_browser(false);
 
-       if (setup_sorting(top.evlist) < 0) {
+       top.session = __perf_session__new(/*data=*/NULL, /*tool=*/NULL,
+                                         /*trace_event_repipe=*/false,
+                                         &host_env);
+       if (IS_ERR(top.session)) {
+               status = PTR_ERR(top.session);
+               top.session = NULL;
+               goto out_delete_evlist;
+       }
+       top.evlist->session = top.session;
+
+       if (setup_sorting(top.evlist, perf_session__env(top.session)) < 0) {
                if (sort_order)
                        parse_options_usage(top_usage, options, "s", 1);
                if (field_order)
@@ -1842,16 +1852,6 @@ int cmd_top(int argc, const char **argv)
                signal(SIGWINCH, winch_sig);
        }
 
-       top.session = __perf_session__new(/*data=*/NULL, /*tool=*/NULL,
-                                         /*trace_event_repipe=*/false,
-                                         &host_env);
-       if (IS_ERR(top.session)) {
-               status = PTR_ERR(top.session);
-               top.session = NULL;
-               goto out_delete_evlist;
-       }
-       top.evlist->session = top.session;
-
        if (!evlist__needs_bpf_sb_event(top.evlist))
                top.record_opts.no_bpf_event = true;
 

diff --git a/tools/perf/tests/hists_cumulate.c b/tools/perf/tests/hists_cumulate.c
index 1e0f5a310fd5e367e694b70d33beb8ef9ac6591f..3eb9ef8d7ec634cbb22227c3670e017fb72a897f 100644 (file)
--- a/tools/perf/tests/hists_cumulate.c
+++ b/tools/perf/tests/hists_cumulate.c
@@ -295,7 +295,7 @@ static int test1(struct evsel *evsel, struct machine *machine)
        symbol_conf.cumulate_callchain = false;
        evsel__reset_sample_bit(evsel, CALLCHAIN);
 
-       setup_sorting(NULL);
+       setup_sorting(/*evlist=*/NULL, machine->env);
        callchain_register_param(&callchain_param);
 
        err = add_hist_entries(hists, machine);
@@ -442,7 +442,7 @@ static int test2(struct evsel *evsel, struct machine *machine)
        symbol_conf.cumulate_callchain = false;
        evsel__set_sample_bit(evsel, CALLCHAIN);
 
-       setup_sorting(NULL);
+       setup_sorting(/*evlist=*/NULL, machine->env);
        callchain_register_param(&callchain_param);
 
        err = add_hist_entries(hists, machine);
@@ -500,7 +500,7 @@ static int test3(struct evsel *evsel, struct machine *machine)
        symbol_conf.cumulate_callchain = true;
        evsel__reset_sample_bit(evsel, CALLCHAIN);
 
-       setup_sorting(NULL);
+       setup_sorting(/*evlist=*/NULL, machine->env);
        callchain_register_param(&callchain_param);
 
        err = add_hist_entries(hists, machine);
@@ -684,7 +684,7 @@ static int test4(struct evsel *evsel, struct machine *machine)
        symbol_conf.cumulate_callchain = true;
        evsel__set_sample_bit(evsel, CALLCHAIN);
 
-       setup_sorting(NULL);
+       setup_sorting(/*evlist=*/NULL, machine->env);
 
        callchain_param = callchain_param_default;
        callchain_register_param(&callchain_param);

diff --git a/tools/perf/tests/hists_filter.c b/tools/perf/tests/hists_filter.c
index 4b2e4f2fbe4854306d94d362c42ce7003ab30b61..1cebd20cc91c031fde4f7e5e6c33dadf5279025d 100644 (file)
--- a/tools/perf/tests/hists_filter.c
+++ b/tools/perf/tests/hists_filter.c
@@ -131,10 +131,6 @@ static int test__hists_filter(struct test_suite *test __maybe_unused, int subtes
                goto out;
        err = TEST_FAIL;
 
-       /* default sort order (comm,dso,sym) will be used */
-       if (setup_sorting(NULL) < 0)
-               goto out;
-
        machines__init(&machines);
 
        /* setup threads/dso/map/symbols also */
@@ -145,6 +141,10 @@ static int test__hists_filter(struct test_suite *test __maybe_unused, int subtes
        if (verbose > 1)
                machine__fprintf(machine, stderr);
 
+       /* default sort order (comm,dso,sym) will be used */
+       if (setup_sorting(evlist, machine->env) < 0)
+               goto out;
+
        /* process sample events */
        err = add_hist_entries(evlist, machine);
        if (err < 0)

diff --git a/tools/perf/tests/hists_link.c b/tools/perf/tests/hists_link.c
index 5b6f1e883466ec08e410058699f5ee86e2b41471..996f5f0b3bd17fe5a18263273d65c218af191c4d 100644 (file)
--- a/tools/perf/tests/hists_link.c
+++ b/tools/perf/tests/hists_link.c
@@ -303,10 +303,6 @@ static int test__hists_link(struct test_suite *test __maybe_unused, int subtest
                goto out;
 
        err = TEST_FAIL;
-       /* default sort order (comm,dso,sym) will be used */
-       if (setup_sorting(NULL) < 0)
-               goto out;
-
        machines__init(&machines);
 
        /* setup threads/dso/map/symbols also */
@@ -317,6 +313,10 @@ static int test__hists_link(struct test_suite *test __maybe_unused, int subtest
        if (verbose > 1)
                machine__fprintf(machine, stderr);
 
+       /* default sort order (comm,dso,sym) will be used */
+       if (setup_sorting(evlist, machine->env) < 0)
+               goto out;
+
        /* process sample events */
        err = add_hist_entries(evlist, machine);
        if (err < 0)

diff --git a/tools/perf/tests/hists_output.c b/tools/perf/tests/hists_output.c
index 33b5cc8352a70f8232447ffca18cacad27979d0f..ee5ec8bda60e5cd8661d9f4dd72328a502c4ce1b 100644 (file)
--- a/tools/perf/tests/hists_output.c
+++ b/tools/perf/tests/hists_output.c
@@ -146,7 +146,7 @@ static int test1(struct evsel *evsel, struct machine *machine)
        field_order = NULL;
        sort_order = NULL; /* equivalent to sort_order = "comm,dso,sym" */
 
-       setup_sorting(NULL);
+       setup_sorting(/*evlist=*/NULL, machine->env);
 
        /*
         * expected output:
@@ -248,7 +248,7 @@ static int test2(struct evsel *evsel, struct machine *machine)
        field_order = "overhead,cpu";
        sort_order = "pid";
 
-       setup_sorting(NULL);
+       setup_sorting(/*evlist=*/NULL, machine->env);
 
        /*
         * expected output:
@@ -304,7 +304,7 @@ static int test3(struct evsel *evsel, struct machine *machine)
        field_order = "comm,overhead,dso";
        sort_order = NULL;
 
-       setup_sorting(NULL);
+       setup_sorting(/*evlist=*/NULL, machine->env);
 
        /*
         * expected output:
@@ -378,7 +378,7 @@ static int test4(struct evsel *evsel, struct machine *machine)
        field_order = "dso,sym,comm,overhead,dso";
        sort_order = "sym";
 
-       setup_sorting(NULL);
+       setup_sorting(/*evlist=*/NULL, machine->env);
 
        /*
         * expected output:
@@ -480,7 +480,7 @@ static int test5(struct evsel *evsel, struct machine *machine)
        field_order = "cpu,pid,comm,dso,sym";
        sort_order = "dso,pid";
 
-       setup_sorting(NULL);
+       setup_sorting(/*evlist=*/NULL, machine->env);
 
        /*
         * expected output:

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index b13385a6068bf399edff63203066956718692c1e..e40d16d3246c67f6555057ad7e043fa704af5d2c 100644 (file)
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -391,9 +391,6 @@ extern unsigned int proc_map_timeout;
 #define PAGE_SIZE_NAME_LEN     32
 char *get_page_size_name(u64 size, char *str);
 
-const char *arch_perf_header_entry(const char *se_header);
-int arch_support_sort_key(const char *sort_key);
-
 static inline bool perf_event_header__cpumode_is_guest(u8 cpumode)
 {
        return cpumode == PERF_RECORD_MISC_GUEST_KERNEL ||

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 0ba2ce1b1c0707ccedf6543ad4b8177d94e3b167..f3a565b0e2307a8adf159725f803df5fef0dff83 100644 (file)
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -2530,19 +2530,44 @@ struct sort_dimension {
        int                     taken;
 };
 
-int __weak arch_support_sort_key(const char *sort_key __maybe_unused)
+static int arch_support_sort_key(const char *sort_key, struct perf_env *env)
 {
+       const char *arch = perf_env__arch(env);
+
+       if (!strcmp("x86", arch) || !strcmp("powerpc", arch)) {
+               if (!strcmp(sort_key, "p_stage_cyc"))
+                       return 1;
+               if (!strcmp(sort_key, "local_p_stage_cyc"))
+                       return 1;
+       }
        return 0;
 }
 
-const char * __weak arch_perf_header_entry(const char *se_header)
-{
+static const char *arch_perf_header_entry(const char *se_header, struct perf_env *env)
+{
+       const char *arch = perf_env__arch(env);
+
+       if (!strcmp("x86", arch)) {
+               if (!strcmp(se_header, "Local Pipeline Stage Cycle"))
+                       return "Local Retire Latency";
+               else if (!strcmp(se_header, "Pipeline Stage Cycle"))
+                       return "Retire Latency";
+       } else if (!strcmp("powerpc", arch)) {
+               if (!strcmp(se_header, "Local INSTR Latency"))
+                       return "Finish Cyc";
+               else if (!strcmp(se_header, "INSTR Latency"))
+                       return "Global Finish_cyc";
+               else if (!strcmp(se_header, "Local Pipeline Stage Cycle"))
+                       return "Dispatch Cyc";
+               else if (!strcmp(se_header, "Pipeline Stage Cycle"))
+                       return "Global Dispatch_cyc";
+       }
        return se_header;
 }
 
-static void sort_dimension_add_dynamic_header(struct sort_dimension *sd)
+static void sort_dimension_add_dynamic_header(struct sort_dimension *sd, struct perf_env *env)
 {
-       sd->entry->se_header = arch_perf_header_entry(sd->entry->se_header);
+       sd->entry->se_header = arch_perf_header_entry(sd->entry->se_header, env);
 }
 
 #define DIM(d, n, func) [d] = { .name = n, .entry = &(func) }
@@ -3594,7 +3619,7 @@ int hpp_dimension__add_output(unsigned col, bool implicit)
 }
 
 int sort_dimension__add(struct perf_hpp_list *list, const char *tok,
-                       struct evlist *evlist,
+                       struct evlist *evlist, struct perf_env *env,
                        int level)
 {
        unsigned int i, j;
@@ -3607,7 +3632,7 @@ int sort_dimension__add(struct perf_hpp_list *list, const char *tok,
         */
        for (j = 0; j < ARRAY_SIZE(arch_specific_sort_keys); j++) {
                if (!strcmp(arch_specific_sort_keys[j], tok) &&
-                               !arch_support_sort_key(tok)) {
+                   !arch_support_sort_key(tok, env)) {
                        return 0;
                }
        }
@@ -3620,7 +3645,7 @@ int sort_dimension__add(struct perf_hpp_list *list, const char *tok,
 
                for (j = 0; j < ARRAY_SIZE(dynamic_headers); j++) {
                        if (sd->name && !strcmp(dynamic_headers[j], sd->name))
-                               sort_dimension_add_dynamic_header(sd);
+                               sort_dimension_add_dynamic_header(sd, env);
                }
 
                if (sd->entry == &sort_parent && parent_pattern) {
@@ -3716,13 +3741,13 @@ int sort_dimension__add(struct perf_hpp_list *list, const char *tok,
 }
 
 /* This should match with sort_dimension__add() above */
-static bool is_hpp_sort_key(const char *key)
+static bool is_hpp_sort_key(const char *key, struct perf_env *env)
 {
        unsigned i;
 
        for (i = 0; i < ARRAY_SIZE(arch_specific_sort_keys); i++) {
                if (!strcmp(arch_specific_sort_keys[i], key) &&
-                   !arch_support_sort_key(key)) {
+                   !arch_support_sort_key(key, env)) {
                        return false;
                }
        }
@@ -3744,7 +3769,7 @@ static bool is_hpp_sort_key(const char *key)
 }
 
 static int setup_sort_list(struct perf_hpp_list *list, char *str,
-                          struct evlist *evlist)
+                          struct evlist *evlist, struct perf_env *env)
 {
        char *tmp, *tok;
        int ret = 0;
@@ -3773,7 +3798,7 @@ static int setup_sort_list(struct perf_hpp_list *list, char *str,
                }
 
                if (*tok) {
-                       if (is_hpp_sort_key(tok)) {
+                       if (is_hpp_sort_key(tok, env)) {
                                /* keep output (hpp) sort keys in the same level */
                                if (prev_was_hpp) {
                                        bool next_same = (level == next_level);
@@ -3786,7 +3811,7 @@ static int setup_sort_list(struct perf_hpp_list *list, char *str,
                                prev_was_hpp = false;
                        }
 
-                       ret = sort_dimension__add(list, tok, evlist, level);
+                       ret = sort_dimension__add(list, tok, evlist, env, level);
                        if (ret == -EINVAL) {
                                if (!cacheline_size() && !strncasecmp(tok, "dcacheline", strlen(tok)))
                                        ui__error("The \"dcacheline\" --sort key needs to know the cacheline size and it couldn't be determined on this system");
@@ -3915,7 +3940,7 @@ static char *setup_overhead(char *keys)
        return keys;
 }
 
-static int __setup_sorting(struct evlist *evlist)
+static int __setup_sorting(struct evlist *evlist, struct perf_env *env)
 {
        char *str;
        const char *sort_keys;
@@ -3955,7 +3980,7 @@ static int __setup_sorting(struct evlist *evlist)
                }
        }
 
-       ret = setup_sort_list(&perf_hpp_list, str, evlist);
+       ret = setup_sort_list(&perf_hpp_list, str, evlist, env);
 
        free(str);
        return ret;
@@ -4191,16 +4216,16 @@ out:
        return ret;
 }
 
-int setup_sorting(struct evlist *evlist)
+int setup_sorting(struct evlist *evlist, struct perf_env *env)
 {
        int err;
 
-       err = __setup_sorting(evlist);
+       err = __setup_sorting(evlist, env);
        if (err < 0)
                return err;
 
        if (parent_pattern != default_parent_pattern) {
-               err = sort_dimension__add(&perf_hpp_list, "parent", evlist, -1);
+               err = sort_dimension__add(&perf_hpp_list, "parent", evlist, env, -1);
                if (err < 0)
                        return err;
        }

diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index a742ab7f3c677f48f2043d8923f20f1cf1dbbac7..d7787958e06b9e524aa15775cd9c829bb9172510 100644 (file)
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -6,6 +6,7 @@
 #include "hist.h"
 
 struct option;
+struct perf_env;
 
 extern regex_t parent_regex;
 extern const char *sort_order;
@@ -130,7 +131,7 @@ extern struct sort_entry sort_thread;
 
 struct evlist;
 struct tep_handle;
-int setup_sorting(struct evlist *evlist);
+int setup_sorting(struct evlist *evlist, struct perf_env *env);
 int setup_output_field(void);
 void reset_output_field(void);
 void sort__setup_elide(FILE *fp);
@@ -145,7 +146,7 @@ bool is_strict_order(const char *order);
 int hpp_dimension__add_output(unsigned col, bool implicit);
 void reset_dimensions(void);
 int sort_dimension__add(struct perf_hpp_list *list, const char *tok,
-                       struct evlist *evlist,
+                       struct evlist *evlist, struct perf_env *env,
                        int level);
 int output_field_add(struct perf_hpp_list *list, const char *tok, int *level);
 int64_t