Changeset 3fea752 in mainline for uspace/app

Timestamp:

2019-01-28T07:46:58Z (7 years ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

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

Children:

67bcd81

Parents:

182487c6 (diff), 871cff9a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge changes to benchmarking tool (PR #151)

This merges refactoring and other changes to the perf/hbench tool.

The changes include:

• Factor out all the duplicate code in individual benchmarks into a common harness
• Properly compute average throughput
  • Added an awful function to compute square root until proper implementation is available (for the precision we need it is quite sufficient) [sqrt is needed to compute standard deviation]
• Added option to dump data to CSV for further processing
• Added option to specify minimal duration of a loop and number of runs to execute.
• Added simple benchmark for fibril mutexes
• Merged benchmarks from bnchmark application and removed it
  • These benchmarks are FS-related and IMHO are quite badly designed (they really stress only the block cache and not the FS on top of it; but still they might be useful as IPC benchmark of large data volumes)
• Renamed perf to hbench to stress that it is a benchmarking application rather than a generic performance measurement tool (compared to perf in GNU/Linux)
• Extended documentation a little bit
• Added function for measuring wall-clock time (internally pass-through to uptime but available for other applications as the right API for this in HelenOS)

Location:

uspace/app

Files:

• bnchmark/Makefile (deleted)
• bnchmark/bnchmark.c (deleted)
• bnchmark/doc/doxygroups.h (deleted)
• hbench/Makefile (moved) (moved from uspace/app/perf/Makefile ) (1 diff)
• hbench/benchlist.c (moved) (moved from uspace/app/perf/perf.h ) (2 diffs)
• hbench/csv.c (added)
• hbench/doc/doxygroups.h (added)
• hbench/env.c (added)
• hbench/fs/dirread.c (added)
• hbench/fs/fileread.c (added)
• hbench/hbench.h (added)
• hbench/ipc/ns_ping.c (added)
• hbench/ipc/ping_pong.c (added)
• hbench/main.c (added)
• hbench/malloc/malloc1.c (added)
• hbench/malloc/malloc2.c (added)
• hbench/synch/fibril_mutex.c (added)
• hbench/utils.c (added)
• perf/doc/doxygroups.h (deleted)
• perf/ipc/ns_ping.c (deleted)
• perf/ipc/ns_ping.def (deleted)
• perf/ipc/ping_pong.c (deleted)
• perf/ipc/ping_pong.def (deleted)
• perf/malloc/malloc1.c (deleted)
• perf/malloc/malloc1.def (deleted)
• perf/malloc/malloc2.c (deleted)
• perf/malloc/malloc2.def (deleted)
• perf/perf.c (deleted)
• tester/tester.c (modified) (3 diffs)

uspace/app/hbench/Makefile

@@ -31 +31 @@
 LIBS = math
 
-BINARY = perf
+BINARY = hbench
 
 SOURCES = \
-        perf.c \
+        benchlist.c \
+        csv.c \
+        env.c \
+        main.c \
+        utils.c \
+        fs/dirread.c \
+        fs/fileread.c \
         ipc/ns_ping.c \
         ipc/ping_pong.c \
         malloc/malloc1.c \
-        malloc/malloc2.c
+        malloc/malloc2.c \
+        synch/fibril_mutex.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/hbench/benchlist.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2018 Jiri Svoboda
+ * Copyright (c) 2018 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +28 @@
  */
 
-/** @addtogroup perf
+/** @addtogroup hbench
  * @{
  */
-/** @file
+/**
+ * @file
  */
 
-#ifndef PERF_H_
-#define PERF_H_
+#include <stdlib.h>
+#include "hbench.h"
 
-#include <stdbool.h>
+benchmark_t *benchmarks[] = {
+        &benchmark_dir_read,
+        &benchmark_fibril_mutex,
+        &benchmark_file_read,
+        &benchmark_malloc1,
+        &benchmark_malloc2,
+        &benchmark_ns_ping,
+        &benchmark_ping_pong
+};
 
-typedef const char *(*benchmark_entry_t)(void);
-
-typedef struct {
-        const char *name;
-        const char *desc;
-        benchmark_entry_t entry;
-} benchmark_t;
-
-extern const char *bench_malloc1(void);
-extern const char *bench_malloc2(void);
-extern const char *bench_ns_ping(void);
-extern const char *bench_ping_pong(void);
-
-extern benchmark_t benchmarks[];
-
-#endif
+size_t benchmark_count = sizeof(benchmarks) / sizeof(benchmarks[0]);
 
 /** @}

uspace/app/tester/tester.c

@@ -35 +35 @@
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <stddef.h>
@@ -40 +41 @@
 #include <str.h>
 #include <io/log.h>
+#include <types/casting.h>
 #include "tester.h"
 
@@ -144 +146 @@
         }
 
-        unsigned int _len = (unsigned int) len;
-        if ((_len != len) || (((int) _len) < 0)) {
-                printf("Command length overflow\n");
-                return;
-        }
+        assert(can_cast_size_t_to_int(len) && "test name length overflow");
 
         for (test = tests; test->name != NULL; test++)
-                printf("%-*s %s%s\n", _len, test->name, test->desc,
+                printf("%-*s %s%s\n", (int) len, test->name, test->desc,
                     (test->safe ? "" : " (unsafe)"));
 
-        printf("%-*s Run all safe tests\n", _len, "*");
+        printf("%-*s Run all safe tests\n", (int) len, "*");
 }