benchmark to run on pound

2 files changed, 73 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 37f7d57..7a95b91 100644
--- a/Makefile
+++ b/Makefile
@@ -220,7 +220,7 @@ obj-colortest = colortest.o color.o
 lib-colortest = -static
 
 obj-colorbench = colorbench.o color.o
-lib-colorbench = -lpthread -static
+lib-colorbench = -lpthread -lrt
 
 # ##############################################################################
 # Build everything that depends on liblitmus.
diff --git a/bin/colorbench.c b/bin/colorbench.c
index 8547bef..0212d9c 100644
--- a/bin/colorbench.c
+++ b/bin/colorbench.c
@@ -6,6 +6,8 @@
 #include <sys/mman.h>
 #include <errno.h>
 #include <stdio.h>
+#include <time.h>
+#include <unistd.h>
 
 #include <litmus/rt_param.h>
 
@@ -14,21 +16,25 @@
 #define DEBUG           1
 #define NR_LOOPS        1000
 
+/* pick ONE of these */
+#define TIME_MONO       1       /* monotonic time */
+//#define TIME_THREAD   1       /* thread cpu time */
+
 /* Ludwig */
 //#define NR_CPUS               6
 //#define CACHE_SIZE_MB 12
 //#define ASSOC         12
 
 /* Pound */
-//#define NR_CPUS               4
-//#define CACHE_SIZE_MB 8
-//#define ASSOC         16
-
-/* VM */
 #define NR_CPUS         4
-#define CACHE_SIZE_MB   4
+#define CACHE_SIZE_MB   8
 #define ASSOC           16
 
+/* VM */
+//#define NR_CPUS               4
+//#define CACHE_SIZE_MB 4
+//#define ASSOC         16
+
 #define LINE_SIZE       64
 #define CACHE_SIZE      (CACHE_SIZE_MB * 1024 * 1024)
 #define TOTAL_COLORS    (CACHE_SIZE / ASSOC / PAGE_SIZE)
@@ -50,9 +56,10 @@ struct pthread_state {
         struct color_ctrl_page *color_ctrl;
         int *arena;
         char fname[FNAME_LEN];
+        FILE *file;
 };
 
-static pthread_barrier_t barrier;
+static pthread_barrier_t start_barrier, end_barrier;
 static int nr_threads;
 static int arena_size;
 static int color_shift;
@@ -74,7 +81,7 @@ static void mk_fname(struct pthread_state *state)
         snprintf(state->fname, FNAME_LEN, "cache_size=%d_line=%d_assoc=%d_"
                         "colors=%d_color-shift=%d_use-colors=%d_arena-size=%d_"
                         "arena-pages=%d_contig-colors=%d_thread=%d_"
-                        "cpu=%d",
+                        "cpu=%d.dat",
                         CACHE_SIZE, LINE_SIZE, ASSOC, TOTAL_COLORS,
                         color_shift, USE_COLORS, arena_size,
                         ARENA_PAGES, CONTIG_COLORS, state->tid,
@@ -105,7 +112,13 @@ int thread_init(struct pthread_state *state)
         int err = 0;
 
         mk_fname(state);
-        debug_print_thread(state, "%s\n", state->fname);
+
+        state->file = fopen(state->fname, "w");
+        if (!state->file) {
+                debug_print_thread(state, "open file failed\n");
+                err = 1;
+                goto out;
+        }
 
         CPU_ZERO(&cpu_set);
         CPU_SET(cpu, &cpu_set);
@@ -150,9 +163,38 @@ out:
 #define CHECKPRINT(func, ...) func(__VA_ARGS__)
 #endif
 
+static void get_time(struct timespec *ts)
+{
+        int err;
+#if defined(TIME_MONO)
+        err = clock_gettime(CLOCK_MONOTONIC, ts);
+#elif defined(TIME_THREAD)
+        err = clock_gettime(CLOCK_THREAD_CPUTIME_ID, ts);
+#endif
+        if (err)
+                fprintf(stderr, "clock_gettime failed!\n");
+}
+
+static unsigned long ts_to_long(const struct timespec *ts)
+{
+        unsigned long x = (((unsigned long)ts->tv_sec) * 1e9) +
+                ((unsigned long)ts->tv_nsec);
+        return x;
+}
+
+static unsigned long ts_difference(const struct timespec *start,
+                const struct timespec *end)
+{
+        unsigned long t1 = ts_to_long(start);
+        unsigned long t2 = ts_to_long(end);
+        return (t2 - t1);
+}
+
 void * thread_start(void *data)
 {
         struct pthread_state *state = (struct pthread_state*) data;
+        struct timespec start, end;
+        unsigned long time;
         int i;
 
         state->retval = thread_init(state);
@@ -162,9 +204,25 @@ void * thread_start(void *data)
         loop_once(state);
 
         for (i = 0; i < NR_LOOPS; ++i) {
-                pthread_barrier_wait(&barrier);
+                pthread_barrier_wait(&start_barrier);
+
+                get_time(&start);
                 loop_once(state);
+                get_time(&end);
+
+                pthread_barrier_wait(&end_barrier);
+
+                time = ts_difference(&start, &end);
+                fprintf(state->file, "%lu\n", time);
+                state->retval = fflush(state->file);
+                if (state->retval)
+                        goto out;
+                state->retval = fsync(fileno(state->file));
+                if (state->retval)
+                        goto out;
         }
+
+        fclose(state->file);
 out:
         pthread_exit(&state->retval);
 }
@@ -239,7 +297,8 @@ int main(int argc, char **argv)
 
         CHECK(pthread_attr_init, &attr);
         CHECK(pthread_attr_setdetachstate, &attr, PTHREAD_CREATE_JOINABLE);
-        CHECK(pthread_barrier_init, &barrier, NULL, nr_threads);
+        CHECK(pthread_barrier_init, &start_barrier, NULL, nr_threads);
+        CHECK(pthread_barrier_init, &end_barrier, NULL, nr_threads);
 
         for (i = 0; i < nr_threads; i++) {
                 pthread_state[i].tid= i;
@@ -261,7 +320,8 @@ int main(int argc, char **argv)
                 }
         }
 
-        CHECK(pthread_barrier_destroy, &barrier);
+        CHECK(pthread_barrier_destroy, &start_barrier);
+        CHECK(pthread_barrier_destroy, &end_barrier);
         CHECK(pthread_attr_destroy, &attr);
 
 out: