Changes in uspace/app/perf/malloc/malloc1.c [d5caf79:e131833c] in mainline

File:

• uspace/app/perf/malloc/malloc1.c (modified) (1 diff)

uspace/app/perf/malloc/malloc1.c

@@ -30 +30 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "../benchlist.h"
+#include <time.h>
+#include <errno.h>
 #include "../perf.h"
 
-static bool runner(stopwatch_t *stopwatch, uint64_t size,
-    char *error, size_t error_size)
+#define MIN_DURATION_SECS  10
+#define NUM_SAMPLES 10
+
+static errno_t malloc1_measure(uint64_t niter, uint64_t *rduration)
 {
-        stopwatch_start(stopwatch);
-        for (uint64_t i = 0; i < size; i++) {
-                void *p = malloc(1);
-                if (p == NULL) {
-                        snprintf(error, error_size,
-                            "failed to allocate 1B in run %" PRIu64 " (out of %" PRIu64 ")",
-                            i, size);
-                        return false;
-                }
+        struct timespec start;
+        uint64_t count;
+        void *p;
+
+        getuptime(&start);
+
+        for (count = 0; count < niter; count++) {
+                p = malloc(1);
+                if (p == NULL)
+                        return ENOMEM;
                 free(p);
         }
-        stopwatch_stop(stopwatch);
 
-        return true;
+        struct timespec now;
+        getuptime(&now);
+
+        *rduration = ts_sub_diff(&now, &start) / 1000;
+        return EOK;
 }
 
-benchmark_t bench_malloc1 = {
-        .name = "malloc1",
-        .desc = "User-space memory allocator benchmark, repeatedly allocate one block",
-        .entry = &runner,
-        .setup = NULL,
-        .teardown = NULL
-};
+static void malloc1_report(uint64_t niter, uint64_t duration)
+{
+        printf("Completed %" PRIu64 " allocations and deallocations in %" PRIu64 " us",
+            niter, duration);
+
+        if (duration > 0) {
+                printf(", %" PRIu64 " cycles/s.\n", niter * 1000 * 1000 / duration);
+        } else {
+                printf(".\n");
+        }
+}
+
+const char *bench_malloc1(void)
+{
+        errno_t rc;
+        uint64_t duration;
+        uint64_t dsmp[NUM_SAMPLES];
+        const char *msg;
+
+        printf("Warm up and determine work size...\n");
+
+        struct timespec start;
+        getuptime(&start);
+
+        uint64_t niter = 1;
+
+        while (true) {
+                rc = malloc1_measure(niter, &duration);
+                if (rc != EOK) {
+                        msg = "Failed.";
+                        goto error;
+                }
+
+                malloc1_report(niter, duration);
+
+                if (duration >= MIN_DURATION_SECS * 1000000)
+                        break;
+
+                niter *= 2;
+        }
+
+        printf("Measure %d samples...\n", NUM_SAMPLES);
+
+        int i;
+
+        for (i = 0; i < NUM_SAMPLES; i++) {
+                rc = malloc1_measure(niter, &dsmp[i]);
+                if (rc != EOK) {
+                        msg = "Failed.";
+                        goto error;
+                }
+
+                malloc1_report(niter, dsmp[i]);
+        }
+
+        double sum = 0.0;
+
+        for (i = 0; i < NUM_SAMPLES; i++)
+                sum += (double)niter / ((double)dsmp[i] / 1000000.0l);
+
+        double avg = sum / NUM_SAMPLES;
+
+        double qd = 0.0;
+        double d;
+        for (i = 0; i < NUM_SAMPLES; i++) {
+                d = (double)niter / ((double)dsmp[i] / 1000000.0l) - avg;
+                qd += d * d;
+        }
+
+        double stddev = qd / (NUM_SAMPLES - 1); // XXX sqrt
+
+        printf("Average: %.0f cycles/s Std.dev^2: %.0f cycles/s Samples: %d\n",
+            avg, stddev, NUM_SAMPLES);
+
+        return NULL;
+error:
+        return msg;
+}