aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilco Dijkstra <wdijkstr@arm.com>2019-04-09 11:38:24 +0100
committerWilco Dijkstra <wdijkstr@arm.com>2019-04-09 11:38:24 +0100
commit6103c0a8116960527708e8fc030a6c043cf51bb5 (patch)
tree71f4400c93429517900f44b0df3c86af2862eddd
parent333221862ecbebde60dd16e7ca17d26444e62f50 (diff)
Remove TIMING_INIT
Remove TIMING_INIT since it's no longer used. * benchtests/bench-malloc-simple.c: Remove TIMING_INIT. * benchtests/bench-malloc-thread.c: Likewise. * benchtests/bench-skeleton.c: Likewise. * benchtests/bench-strtod.c: Likewise. * benchtests/bench-timing.h: Likewise.
-rw-r--r--ChangeLog8
-rw-r--r--benchtests/bench-malloc-simple.c3
-rw-r--r--benchtests/bench-malloc-thread.c5
-rw-r--r--benchtests/bench-skeleton.c5
-rw-r--r--benchtests/bench-strtod.c3
-rw-r--r--benchtests/bench-timing.h2
6 files changed, 9 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 6b7f19a1f3..fbab246e08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2019-04-09 Wilco Dijkstra <wdijkstr@arm.com>
+
+ * benchtests/bench-malloc-simple.c: Remove TIMING_INIT.
+ * benchtests/bench-malloc-thread.c: Likewise.
+ * benchtests/bench-skeleton.c: Likewise.
+ * benchtests/bench-strtod.c: Likewise.
+ * benchtests/bench-timing.h: Likewise.
+
2019-04-08 Florian Weimer <fweimer@redhat.com>
* resolv/resolv.h (RES_INSECURE1, RES_INSECURE2): Remove
diff --git a/benchtests/bench-malloc-simple.c b/benchtests/bench-malloc-simple.c
index 83203ff318..b8bb2cc116 100644
--- a/benchtests/bench-malloc-simple.c
+++ b/benchtests/bench-malloc-simple.c
@@ -86,9 +86,6 @@ bench (unsigned long size)
{
size_t iters = NUM_ITERS;
int **arr = (int**) malloc (MAX_ALLOCS * sizeof (void*));
- unsigned long res;
-
- TIMING_INIT (res);
for (int t = 0; t <= 3; t++)
for (int i = 0; i < NUM_ALLOCS; i++)
diff --git a/benchtests/bench-malloc-thread.c b/benchtests/bench-malloc-thread.c
index bb4ba727a8..52261425b0 100644
--- a/benchtests/bench-malloc-thread.c
+++ b/benchtests/bench-malloc-thread.c
@@ -225,7 +225,6 @@ main (int argc, char **argv)
{
timing_t cur;
size_t iters = 0, num_threads = 1;
- unsigned long res;
json_ctx_t json_ctx;
double d_total_s, d_total_i;
struct sigaction act;
@@ -261,10 +260,6 @@ main (int argc, char **argv)
json_attr_object_begin (&json_ctx, "");
- TIMING_INIT (res);
-
- (void) res;
-
memset (&act, 0, sizeof (act));
act.sa_handler = &alarm_handler;
diff --git a/benchtests/bench-skeleton.c b/benchtests/bench-skeleton.c
index 37625c4296..854151e5a8 100644
--- a/benchtests/bench-skeleton.c
+++ b/benchtests/bench-skeleton.c
@@ -48,14 +48,11 @@ main (int argc, char **argv)
memset (&runtime, 0, sizeof (runtime));
- unsigned long iters, res;
+ unsigned long iters = 1000;
#ifdef BENCH_INIT
BENCH_INIT ();
#endif
- TIMING_INIT (res);
-
- iters = 1000 * res;
json_init (&json_ctx, 2, stdout);
diff --git a/benchtests/bench-strtod.c b/benchtests/bench-strtod.c
index 4de0b9acb6..d5b2503553 100644
--- a/benchtests/bench-strtod.c
+++ b/benchtests/bench-strtod.c
@@ -89,9 +89,6 @@ int
do_bench (void)
{
const size_t iters = INNER_LOOP_ITERS;
- timing_t res __attribute__ ((unused));
-
- TIMING_INIT (res);
for (size_t i = 0; inputs[i] != NULL; ++i)
{
diff --git a/benchtests/bench-timing.h b/benchtests/bench-timing.h
index e213dec3fd..d068bf9459 100644
--- a/benchtests/bench-timing.h
+++ b/benchtests/bench-timing.h
@@ -28,8 +28,6 @@ typedef hp_timing_t timing_t;
#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))