1 files changed, 19 insertions, 0 deletions

diff --git a/tools/perf/builtin-bench.c b/tools/perf/builtin-bench.c
index cae9a5fd2ecf..77298bf892b8 100644
--- a/tools/perf/builtin-bench.c
+++ b/tools/perf/builtin-bench.c
@@ -35,6 +35,18 @@ struct bench_suite {
 /* sentinel: easy for help */
 #define suite_all { "all", "Test all benchmark suites", NULL }
 
+#ifdef LIBNUMA_SUPPORT
+static struct bench_suite numa_suites[] = {
+        { "mem",
+          "Benchmark for NUMA workloads",
+          bench_numa },
+        suite_all,
+        { NULL,
+          NULL,
+          NULL                  }
+};
+#endif
+
 static struct bench_suite sched_suites[] = {
         { "messaging",
           "Benchmark for scheduler and IPC mechanisms",
@@ -68,6 +80,11 @@ struct bench_subsys {
 };
 
 static struct bench_subsys subsystems[] = {
+#ifdef LIBNUMA_SUPPORT
+        { "numa",
+          "NUMA scheduling and MM behavior",
+          numa_suites },
+#endif
         { "sched",
           "scheduler and IPC mechanism",
           sched_suites },
@@ -159,6 +176,7 @@ static void all_suite(struct bench_subsys *subsys)	  /* FROM HERE */
                 printf("# Running %s/%s benchmark...\n",
                        subsys->name,
                        suites[i].name);
+                fflush(stdout);
 
                 argv[1] = suites[i].name;
                 suites[i].fn(1, argv, NULL);
@@ -225,6 +243,7 @@ int cmd_bench(int argc, const char **argv, const char *prefix __maybe_unused)
                                 printf("# Running %s/%s benchmark...\n",
                                        subsystems[i].name,
                                        subsystems[i].suites[j].name);
+                        fflush(stdout);
                         status = subsystems[i].suites[j].fn(argc - 1,
                                                             argv + 1, prefix);
                         goto end;