CPU-DPU microbenchmark: switch to nanoseconds

1 files changed, 12 insertions, 48 deletions

diff --git a/Microbenchmarks/CPU-DPU/support/timer.h b/Microbenchmarks/CPU-DPU/support/timer.h
index 7c24f3b..0a4d6a1 100755
--- a/Microbenchmarks/CPU-DPU/support/timer.h
+++ b/Microbenchmarks/CPU-DPU/support/timer.h
@@ -1,59 +1,23 @@
-/*

- * Copyright (c) 2016 University of Cordoba and University of Illinois

- * All rights reserved.

- *

- * Developed by:    IMPACT Research Group

- *                  University of Cordoba and University of Illinois

- *                  http://impact.crhc.illinois.edu/

- *

- * Permission is hereby granted, free of charge, to any person obtaining a copy

- * of this software and associated documentation files (the "Software"), to deal

- * with the Software without restriction, including without limitation the 

- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

- * sell copies of the Software, and to permit persons to whom the Software is

- * furnished to do so, subject to the following conditions:

- *

- *      > Redistributions of source code must retain the above copyright notice,

- *        this list of conditions and the following disclaimers.

- *      > Redistributions in binary form must reproduce the above copyright

- *        notice, this list of conditions and the following disclaimers in the

- *        documentation and/or other materials provided with the distribution.

- *      > Neither the names of IMPACT Research Group, University of Cordoba, 

- *        University of Illinois nor the names of its contributors may be used 

- *        to endorse or promote products derived from this Software without 

- *        specific prior written permission.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 

- * CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH

- * THE SOFTWARE.

- *

- */

+#pragma once

+#include <time.h>

 

-#include <sys/time.h>

+typedef struct Timer {

 

-typedef struct Timer{

+    struct timespec startTime[7];

+    struct timespec stopTime[7];

+    uint64_t        nanoseconds[7];

 

-    struct timeval startTime[10];

-    struct timeval stopTime[10];

-    double         time[10];

-

-}Timer;

+} Timer;

 

 void start(Timer *timer, int i, int rep) {

     if(rep == 0) {

-        timer->time[i] = 0.0;

+        timer->nanoseconds[i] = 0;

     }

-    gettimeofday(&timer->startTime[i], NULL);

+    clock_gettime(CLOCK_MONOTONIC, &timer->startTime[i]);

 }

 

 void stop(Timer *timer, int i) {

-    gettimeofday(&timer->stopTime[i], NULL);

-    timer->time[i] += (timer->stopTime[i].tv_sec - timer->startTime[i].tv_sec) * 1000000.0 +

-                      (timer->stopTime[i].tv_usec - timer->startTime[i].tv_usec);

+    clock_gettime(CLOCK_MONOTONIC, &timer->stopTime[i]);

+    timer->nanoseconds[i] += (timer->stopTime[i].tv_sec - timer->startTime[i].tv_sec) * 1000000000 +

+                             (timer->stopTime[i].tv_nsec - timer->startTime[i].tv_nsec);

 }

-

-void print(Timer *timer, int i, int REP) { printf("Time (ms): %f\t", timer->time[i] / (1000 * REP)); }