32 files changed, 560 insertions, 390 deletions

diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 326a26e5fc1c..8a9ca3836043 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -487,6 +487,7 @@ ifndef NO_SLANG
   LIB_OBJS += $(OUTPUT)ui/tui/util.o
   LIB_OBJS += $(OUTPUT)ui/tui/helpline.o
   LIB_OBJS += $(OUTPUT)ui/tui/progress.o
+  LIB_H += ui/tui/tui.h
   LIB_H += ui/browser.h
   LIB_H += ui/browsers/map.h
   LIB_H += ui/keysyms.h
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 03cfa592071f..6c5ae57831f6 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -118,11 +118,11 @@ static int hist_entry__tty_annotate(struct hist_entry *he,
                                     ann->print_line, ann->full_paths, 0, 0);
 }
 
-static void hists__find_annotations(struct hists *self,
+static void hists__find_annotations(struct hists *hists,
                                     struct perf_evsel *evsel,
                                     struct perf_annotate *ann)
 {
-        struct rb_node *nd = rb_first(&self->entries), *next;
+        struct rb_node *nd = rb_first(&hists->entries), *next;
         int key = K_RIGHT;
 
         while (nd) {
@@ -247,7 +247,7 @@ static int __cmd_annotate(struct perf_annotate *ann)
 
                 if (nr_samples > 0) {
                         total_nr_samples += nr_samples;
-                        hists__collapse_resort(hists);
+                        hists__collapse_resort(hists, NULL);
                         hists__output_resort(hists);
 
                         if (symbol_conf.event_group &&
diff --git a/tools/perf/builtin-bench.c b/tools/perf/builtin-bench.c
index 33af80fa49cf..e47f90cc7b98 100644
--- a/tools/perf/builtin-bench.c
+++ b/tools/perf/builtin-bench.c
@@ -1,21 +1,18 @@
 /*
- *
  * builtin-bench.c
  *
- * General benchmarking subsystem provided by perf
+ * General benchmarking collections provided by perf
  *
  * Copyright (C) 2009, Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>
- *
  */
 
 /*
+ * Available benchmark collection list:
  *
- * Available subsystem list:
- *  sched ... scheduler and IPC mechanism
+ *  sched ... scheduler and IPC performance
  *  mem   ... memory access performance
- *
+ *  numa  ... NUMA scheduling and MM performance
  */
-
 #include "perf.h"
 #include "util/util.h"
 #include "util/parse-options.h"
@@ -25,112 +22,92 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/prctl.h>
 
-struct bench_suite {
-        const char *name;
-        const char *summary;
-        int (*fn)(int, const char **, const char *);
+typedef int (*bench_fn_t)(int argc, const char **argv, const char *prefix);
+
+struct bench {
+        const char      *name;
+        const char      *summary;
+        bench_fn_t      fn;
 };
-                                                \
-/* sentinel: easy for help */
-#define suite_all { "all", "Test all benchmark suites", NULL }
 
 #ifdef HAVE_LIBNUMA_SUPPORT
-static struct bench_suite numa_suites[] = {
-        { "mem",
-          "Benchmark for NUMA workloads",
-          bench_numa },
-        suite_all,
-        { NULL,
-          NULL,
-          NULL                  }
+static struct bench numa_benchmarks[] = {
+        { "mem",        "Benchmark for NUMA workloads",                 bench_numa              },
+        { "all",        "Test all NUMA benchmarks",                     NULL                    },
+        { NULL,         NULL,                                           NULL                    }
 };
 #endif
 
-static struct bench_suite sched_suites[] = {
-        { "messaging",
-          "Benchmark for scheduler and IPC mechanisms",
-          bench_sched_messaging },
-        { "pipe",
-          "Flood of communication over pipe() between two processes",
-          bench_sched_pipe      },
-        suite_all,
-        { NULL,
-          NULL,
-          NULL                  }
+static struct bench sched_benchmarks[] = {
+        { "messaging",  "Benchmark for scheduling and IPC",             bench_sched_messaging   },
+        { "pipe",       "Benchmark for pipe() between two processes",   bench_sched_pipe        },
+        { "all",        "Test all scheduler benchmarks",                NULL                    },
+        { NULL,         NULL,                                           NULL                    }
 };
 
-static struct bench_suite mem_suites[] = {
-        { "memcpy",
-          "Simple memory copy in various ways",
-          bench_mem_memcpy },
-        { "memset",
-          "Simple memory set in various ways",
-          bench_mem_memset },
-        suite_all,
-        { NULL,
-          NULL,
-          NULL             }
+static struct bench mem_benchmarks[] = {
+        { "memcpy",     "Benchmark for memcpy()",                       bench_mem_memcpy        },
+        { "memset",     "Benchmark for memset() tests",                 bench_mem_memset        },
+        { "all",        "Test all memory benchmarks",                   NULL                    },
+        { NULL,         NULL,                                           NULL                    }
 };
 
-struct bench_subsys {
-        const char *name;
+struct collection {
+        const char