Changeset d5caf79 in mainline

Timestamp:

2018-12-28T13:56:05Z (6 years ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

980611d5

Parents:

c7de81b

git-author:

Vojtech Horky <vojtech.horky@…> (2018-12-28 13:54:23)

git-committer:

Vojtech Horky <vojtech.horky@…> (2018-12-28 13:56:05)

Message:

perf: hide more benchmark implementation

It is much easier to maintain the benchmark if all the definitions etc.
are in a single file.

Location:

uspace/app/perf

Files:

• Makefile (modified) (1 diff)
• benchlist.c (added)
• benchlist.h (added)
• ipc/ns_ping.c (modified) (2 diffs)
• ipc/ns_ping.def (deleted)
• ipc/ping_pong.c (modified) (4 diffs)
• ipc/ping_pong.def (deleted)
• malloc/malloc1.c (modified) (2 diffs)
• malloc/malloc1.def (deleted)
• malloc/malloc2.c (modified) (2 diffs)
• malloc/malloc2.def (deleted)
• perf.c (modified) (7 diffs)
• perf.h (modified) (1 diff)

uspace/app/perf/Makefile

@@ -34 +34 @@
 
 SOURCES = \
+        benchlist.c \
         perf.c \
         ipc/ns_ping.c \

uspace/app/perf/ipc/ns_ping.c

@@ -32 +32 @@
 #include <errno.h>
 #include <str_error.h>
+#include "../benchlist.h"
 #include "../perf.h"
 
-bool bench_ns_ping(stopwatch_t *stopwatch, uint64_t niter,
+static bool runner(stopwatch_t *stopwatch, uint64_t niter,
     char *error, size_t error_size)
 {
@@ -54 +55 @@
         return true;
 }
+
+benchmark_t bench_ns_ping = {
+        .name = "ns_ping",
+        .desc = "Name service IPC ping-pong benchmark",
+        .entry = &runner,
+        .setup = NULL,
+        .teardown = NULL
+};

uspace/app/perf/ipc/ping_pong.c

@@ -32 +32 @@
 #include <errno.h>
 #include <str_error.h>
+#include "../benchlist.h"
 #include "../perf.h"
 
 static ipc_test_t *test = NULL;
 
-bool bench_ping_pong_setup(char *error, size_t error_size)
+static bool setup(char *error, size_t error_size)
 {
         errno_t rc = ipc_test_create(&test);
@@ -49 +50 @@
 }
 
-bool bench_ping_pong_teardown(char *error, size_t error_size)
+static bool teardown(char *error, size_t error_size)
 {
         ipc_test_destroy(test);
@@ -55 +56 @@
 }
 
-bool bench_ping_pong(stopwatch_t *stopwatch, uint64_t niter,
+static bool runner(stopwatch_t *stopwatch, uint64_t niter,
     char *error, size_t error_size)
 {
@@ -75 +76 @@
         return true;
 }
+
+benchmark_t bench_ping_pong = {
+        .name = "ping_pong",
+        .desc = "IPC ping-pong benchmark",
+        .entry = &runner,
+        .setup = &setup,
+        .teardown = &teardown
+};

uspace/app/perf/malloc/malloc1.c

@@ -30 +30 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include "../benchlist.h"
 #include "../perf.h"
 
-bool bench_malloc1(stopwatch_t *stopwatch, uint64_t size,
+static bool runner(stopwatch_t *stopwatch, uint64_t size,
     char *error, size_t error_size)
 {
@@ -50 +51 @@
         return true;
 }
+
+benchmark_t bench_malloc1 = {
+        .name = "malloc1",
+        .desc = "User-space memory allocator benchmark, repeatedly allocate one block",
+        .entry = &runner,
+        .setup = NULL,
+        .teardown = NULL
+};

uspace/app/perf/malloc/malloc2.c

@@ -29 +29 @@
 #include <stdlib.h>
 #include <stdio.h>
+#include "../benchlist.h"
 #include "../perf.h"
 
-bool bench_malloc2(stopwatch_t *stopwatch, uint64_t niter,
+static bool runner(stopwatch_t *stopwatch, uint64_t niter,
     char *error, size_t error_size)
 {
@@ -67 +68 @@
         return true;
 }
+
+benchmark_t bench_malloc2 = {
+        .name = "malloc2",
+        .desc = "User-space memory allocator benchmark, allocate many small blocks",
+        .entry = &runner,
+        .setup = NULL,
+        .teardown = NULL
+};

uspace/app/perf/perf.c

@@ -43 +43 @@
 #include <perf.h>
 #include "perf.h"
+#include "benchlist.h"
 
 #define MIN_DURATION_SECS 10
 #define NUM_SAMPLES 10
 #define MAX_ERROR_STR_LENGTH 1024
-
-benchmark_t benchmarks[] = {
-#include "ipc/ns_ping.def"
-#include "ipc/ping_pong.def"
-#include "malloc/malloc1.def"
-#include "malloc/malloc2.def"
-        { NULL, NULL, NULL, NULL, NULL }
-};
 
 static void short_report(stopwatch_t *stopwatch, int run_index,
@@ -179 +172 @@
 static int run_benchmarks(void)
 {
-        benchmark_t *bench;
         unsigned int i = 0;
         unsigned int n = 0;
@@ -187 +179 @@
         printf("\n*** Running all benchmarks ***\n\n");
 
-        for (bench = benchmarks; bench->name != NULL; bench++) {
-                printf("%s (%s)\n", bench->name, bench->desc);
-                if (run_benchmark(bench)) {
+        for (size_t it = 0; it < benchmark_count; it++) {
+                printf("%s (%s)\n", benchmarks[it]->name, benchmarks[it]->desc);
+                if (run_benchmark(benchmarks[it])) {
                         i++;
                         continue;
@@ -195 +187 @@
 
                 if (!failed_names) {
-                        failed_names = str_dup(bench->name);
+                        failed_names = str_dup(benchmarks[it]->name);
                 } else {
                         char *f = NULL;
-                        asprintf(&f, "%s, %s", failed_names, bench->name);
+                        asprintf(&f, "%s, %s", failed_names, benchmarks[it]->name);
                         if (!f) {
                                 printf("Out of memory.\n");
@@ -219 +211 @@
 {
         size_t len = 0;
-        benchmark_t *bench;
-        for (bench = benchmarks; bench->name != NULL; bench++) {
-                if (str_length(bench->name) > len)
-                        len = str_length(bench->name);
+        for (size_t i = 0; i < benchmark_count; i++) {
+                size_t len_now = str_length(benchmarks[i]->name);
+                if (len_now > len)
+                        len = len_now;
         }
 
@@ -231 +223 @@
         }
 
-        for (bench = benchmarks; bench->name != NULL; bench++)
-                printf("%-*s %s\n", _len, bench->name, bench->desc);
+        for (size_t i = 0; i < benchmark_count; i++)
+                printf("%-*s %s\n", _len, benchmarks[i]->name, benchmarks[i]->desc);
 
         printf("%-*s Run all benchmarks\n", _len, "*");
@@ -250 +242 @@
         }
 
-        benchmark_t *bench;
-        for (bench = benchmarks; bench->name != NULL; bench++) {
-                if (str_cmp(argv[1], bench->name) == 0) {
-                        return (run_benchmark(bench) ? 0 : -1);
+        for (size_t i = 0; i < benchmark_count; i++) {
+                if (str_cmp(argv[1], benchmarks[i]->name) == 0) {
+                        return (run_benchmark(benchmarks[i]) ? 0 : -1);
                 }
         }

uspace/app/perf/perf.h

@@ -51 +51 @@
 } benchmark_t;
 
-extern bool bench_malloc1(stopwatch_t *, uint64_t, char *, size_t);
-extern bool bench_malloc2(stopwatch_t *, uint64_t, char *, size_t);
-extern bool bench_ns_ping(stopwatch_t *, uint64_t, char *, size_t);
-extern bool bench_ping_pong(stopwatch_t *, uint64_t, char *, size_t);
-extern bool bench_ping_pong_setup(char *, size_t);
-extern bool bench_ping_pong_teardown(char *, size_t);
-
-extern benchmark_t benchmarks[];
-
 #endif