hppa: Sync with pthread.h.

[platform/upstream/glibc.git] / benchtests / bench-timing.h

diff --git a/benchtests/bench-timing.h b/benchtests/bench-timing.h
index 009813b..03e05fe 100644 (file)
--- a/benchtests/bench-timing.h
+++ b/benchtests/bench-timing.h
@@ -1,5 +1,5 @@
 /* Define timing macros.
-   Copyright (C) 2013 Free Software Foundation, Inc.
+   Copyright (C) 2013-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -22,36 +22,30 @@
 #if HP_TIMING_AVAIL && !defined USE_CLOCK_GETTIME
 # define GL(x) _##x
 # define GLRO(x) _##x
-hp_timing_t _dl_hp_timing_overhead;
 typedef hp_timing_t timing_t;
 
-# define TIMING_INIT(iters) \
-({                                                                           \
-  HP_TIMING_DIFF_INIT();                                                     \
-  (iters) = 1000;                                                            \
-})
+# define TIMING_TYPE "hp_timing"
+
+# define TIMING_INIT(res) ({ (res) = 1; })
 
 # define TIMING_NOW(var) HP_TIMING_NOW (var)
 # define TIMING_DIFF(diff, start, end) HP_TIMING_DIFF ((diff), (start), (end))
 # define TIMING_ACCUM(sum, diff) HP_TIMING_ACCUM_NT ((sum), (diff))
 
-# define TIMING_PRINT_STATS(func, d_total_s, d_iters, d_total_i, max, min) \
-  printf ("%s: ITERS:%g: TOTAL:%gMcy, MAX:%gcy, MIN:%gcy, %g calls/Mcy\n",    \
-         (func), (d_total_i), (d_total_s) * 1e-6, (max) / (d_iters),         \
-         (min) / (d_iters), 1e6 * (d_total_i) / (d_total_s));
-
 #else
+
+#include <time.h>
 typedef uint64_t timing_t;
 
-/* Measure 1000 times the resolution of the clock.  So for a 1ns
-   resolution  clock, we measure 1000 iterations of the function call at a
-   time.  Measurements close to the minimum clock resolution won't make
-   much sense, but it's better than having nothing at all.  */
-# define TIMING_INIT(iters) \
+# define TIMING_TYPE "clock_gettime"
+
+/* Measure the resolution of the clock so we can scale the number of
+   benchmark iterations by this value.  */
+# define TIMING_INIT(res) \
 ({                                                                           \
   struct timespec start;                                                     \
   clock_getres (CLOCK_PROCESS_CPUTIME_ID, &start);                           \
-  (iters) = 1000 * start.tv_nsec;                                            \
+  (res) = start.tv_nsec;                                             \
 })
 
 # define TIMING_NOW(var) \
@@ -64,11 +58,6 @@ typedef uint64_t timing_t;
 # define TIMING_DIFF(diff, start, end) (diff) = (end) - (start)
 # define TIMING_ACCUM(sum, diff) (sum) += (diff)
 
-# define TIMING_PRINT_STATS(func, d_total_s, d_iters, d_total_i, max, min) \
-  printf ("%s: ITERS:%g: TOTAL:%gs, MAX:%gns, MIN:%gns, %g iter/s\n",        \
-         (func), (d_total_i), (d_total_s) * 1e-9, (max) / (d_iters),                 \
-         (min) / (d_iters), 1e9 * (d_total_i) / (d_total_s))
-
 #endif
 
 #define TIMING_PRINT_MEAN(d_total_s, d_iters) \