Changes in uspace/app/perf/ipc/ping_pong.c [d5caf79:e131833c] in mainline

File:

• uspace/app/perf/ipc/ping_pong.c (modified) (1 diff)

uspace/app/perf/ipc/ping_pong.c

@@ -27 +27 @@
  */
 
+#include <math.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
 #include <ipc_test.h>
 #include <async.h>
 #include <errno.h>
-#include <str_error.h>
-#include "../benchlist.h"
 #include "../perf.h"
 
-static ipc_test_t *test = NULL;
+#define MIN_DURATION_SECS  10
+#define NUM_SAMPLES 10
 
-static bool setup(char *error, size_t error_size)
+static errno_t ping_pong_measure(ipc_test_t *test, uint64_t niter,
+    uint64_t *rduration)
 {
-        errno_t rc = ipc_test_create(&test);
-        if (rc != EOK) {
-                snprintf(error, error_size,
-                    "failed contacting IPC test server: %s (%d)",
-                    str_error(rc), rc);
-                return false;
-        }
+        struct timespec start;
+        uint64_t count;
 
-        return true;
-}
+        getuptime(&start);
 
-static bool teardown(char *error, size_t error_size)
-{
-        ipc_test_destroy(test);
-        return true;
-}
+        for (count = 0; count < niter; count++) {
+                errno_t retval = ipc_test_ping(test);
 
-static bool runner(stopwatch_t *stopwatch, uint64_t niter,
-    char *error, size_t error_size)
-{
-        stopwatch_start(stopwatch);
-
-        for (uint64_t count = 0; count < niter; count++) {
-                errno_t rc = ipc_test_ping(test);
-
-                if (rc != EOK) {
-                        snprintf(error, error_size,
-                            "failed sending ping message: %s (%d)",
-                            str_error(rc), rc);
-                        return false;
+                if (retval != EOK) {
+                        printf("Error sending ping message.\n");
+                        return EIO;
                 }
         }
 
-        stopwatch_stop(stopwatch);
+        struct timespec now;
+        getuptime(&now);
 
-        return true;
+        *rduration = ts_sub_diff(&now, &start) / 1000;
+        return EOK;
 }
 
-benchmark_t bench_ping_pong = {
-        .name = "ping_pong",
-        .desc = "IPC ping-pong benchmark",
-        .entry = &runner,
-        .setup = &setup,
-        .teardown = &teardown
-};
+static void ping_pong_report(uint64_t niter, uint64_t duration)
+{
+        printf("Completed %" PRIu64 " round trips in %" PRIu64 " us",
+            niter, duration);
+
+        if (duration > 0) {
+                printf(", %" PRIu64 " rt/s.\n", niter * 1000 * 1000 / duration);
+        } else {
+                printf(".\n");
+        }
+}
+
+const char *bench_ping_pong(void)
+{
+        errno_t rc;
+        uint64_t duration;
+        uint64_t dsmp[NUM_SAMPLES];
+        ipc_test_t *test;
+        const char *msg;
+
+        rc = ipc_test_create(&test);
+        if (rc != EOK)
+                return "Failed contacting IPC test server.";
+
+        printf("Warm up and determine work size...\n");
+
+        struct timespec start;
+        getuptime(&start);
+
+        uint64_t niter = 1;
+
+        while (true) {
+                rc = ping_pong_measure(test, niter, &duration);
+                if (rc != EOK) {
+                        msg = "Failed.";
+                        goto error;
+                }
+
+                ping_pong_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 = ping_pong_measure(test, niter, &dsmp[i]);
+                if (rc != EOK) {
+                        msg = "Failed.";
+                        goto error;
+                }
+
+                ping_pong_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 rt/s Std.dev^2: %.0f rt/s Samples: %d\n",
+            avg, stddev, NUM_SAMPLES);
+
+        ipc_test_destroy(test);
+        return NULL;
+error:
+        ipc_test_destroy(test);
+        return msg;
+}