5 files changed, 47 insertions, 29 deletions

diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 2d0462d89a97..cabbea5f0bc2 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -611,9 +611,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix __maybe_unused)
 
         setup_pager();
 
-        sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "dso", NULL);
-        sort_entry__setup_elide(&sort_comm, symbol_conf.comm_list, "comm", NULL);
-        sort_entry__setup_elide(&sort_sym, symbol_conf.sym_list, "symbol", NULL);
+        sort__setup_elide(NULL);
 
         return __cmd_diff();
 }
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 669405c9b8a2..d45bf9b0361d 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -937,25 +937,7 @@ repeat:
                 report.symbol_filter_str = argv[0];
         }
 
-        sort_entry__setup_elide(&sort_comm, symbol_conf.comm_list, "comm", stdout);
-
-        if (sort__mode == SORT_MODE__BRANCH) {
-                sort_entry__setup_elide(&sort_dso_from, symbol_conf.dso_from_list, "dso_from", stdout);
-                sort_entry__setup_elide(&sort_dso_to, symbol_conf.dso_to_list, "dso_to", stdout);
-                sort_entry__setup_elide(&sort_sym_from, symbol_conf.sym_from_list, "sym_from", stdout);
-                sort_entry__setup_elide(&sort_sym_to, symbol_conf.sym_to_list, "sym_to", stdout);
-        } else {
-                if (report.mem_mode) {
-                        sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "symbol_daddr", stdout);
-                        sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "dso_daddr", stdout);
-                        sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "mem", stdout);
-                        sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "local_weight", stdout);
-                        sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "tlb", stdout);
-                        sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "snoop", stdout);
-                }
-                sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "dso", stdout);
-                sort_entry__setup_elide(&sort_sym, symbol_conf.sym_list, "symbol", stdout);
-        }
+        sort__setup_elide(stdout);
 
         ret = __cmd_report(&report);
         if (ret == K_SWITCH_INPUT_DATA) {
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 67bdb9f14ad6..2eb272d8753c 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1200,9 +1200,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
         if (symbol__init() < 0)
                 return -1;
 
-        sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "dso", stdout);
-        sort_entry__setup_elide(&sort_comm, symbol_conf.comm_list, "comm", stdout);
-        sort_entry__setup_elide(&sort_sym, symbol_conf.sym_list, "symbol", stdout);
+        sort__setup_elide(stdout);
 
         /*
          * Avoid annotation data structures overhead when symbols aren't on the
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 1dbf16949250..701ab1d84894 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -1,5 +1,6 @@
 #include "sort.h"
 #include "hist.h"
+#include "symbol.h"
 
 regex_t         parent_regex;
 const char      default_parent_pattern[] = "^sys_|^do_page_fault";
@@ -1009,8 +1010,9 @@ int setup_sorting(void)
         return ret;
 }
 
-void sort_entry__setup_elide(struct sort_entry *self, struct strlist *list,
-                             const char *list_name, FILE *fp)
+static void sort_entry__setup_elide(struct sort_entry *self,
+                                    struct strlist *list,
+                                    const char *list_name, FILE *fp)
 {
         if (list && strlist__nr_entries(list) == 1) {
                 if (fp != NULL)
@@ -1019,3 +1021,42 @@ void sort_entry__setup_elide(struct sort_entry *self, struct strlist *list,
                 self->elide = true;
         }
 }
+
+void sort__setup_elide(FILE *output)
+{
+        sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list,
+                                "dso", output);
+        sort_entry__setup_elide(&sort_comm, symbol_conf.comm_list,
+                                "comm", output);
+        sort_entry__setup_elide(&sort_sym, symbol_conf.sym_list,
+                                "symbol", output);
+
+        if (sort__mode == SORT_MODE__BRANCH) {
+                sort_entry__setup_elide(&sort_dso_from,
+                                        symbol_conf.dso_from_list,
+                                        "dso_from", output);
+                sort_entry__setup_elide(&sort_dso_to,
+                                        symbol_conf.dso_to_list,
+                                        "dso_to", output);
+                sort_entry__setup_elide(&sort_sym_from,
+                                        symbol_conf.sym_from_list,
+                                        "sym_from", output);
+                sort_entry__setup_elide(&sort_sym_to,
+                                        symbol_conf.sym_to_list,
+                                        "sym_to", output);
+        } else if (sort__mode == SORT_MODE__MEMORY) {
+                sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list,
+                                        "symbol_daddr", output);
+                sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list,
+                                        "dso_daddr", output);
+                sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list,
+                                        "mem", output);
+                sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list,
+                                        "local_weight", output);
+                sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list,
+                                        "tlb", output);
+                sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list,
+                                        "snoop", output);
+        }
+
+}
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index 0232d476da87..51f1b5a854e7 100644
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -181,7 +181,6 @@ extern struct list_head hist_entry__sort_list;
 
 int setup_sorting(void);
 extern int sort_dimension__add(const char *);
-void sort_entry__setup_elide(struct sort_entry *self, struct strlist *list,
-                             const char *list_name, FILE *fp);
+void sort__setup_elide(FILE *fp);
 
 #endif  /* __PERF_SORT_H */