aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--benchtests/README1
-rw-r--r--benchtests/bench-skeleton.c3
-rwxr-xr-xbenchtests/scripts/bench.py7
4 files changed, 18 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0adb1a9f0a..027464d319 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-05-26 Siddhesh Poyarekar <siddhesh@redhat.com>
+
+ * benchtests/README: Document 'init' directive.
+ * benchtests/bench-skeleton.c (main) [BENCH_INIT]: Call
+ BENCH_INIT.
+ * scripts/bench.py (gen_source): Define BENCH_INIT macro.
+ (parse_file): Recognize 'init' directive.
+
2014-05-26 Kyle McMartin <kyle@redhat.com>
[BZ #16796]
diff --git a/benchtests/README b/benchtests/README
index 52a3cc2062..999d268cf8 100644
--- a/benchtests/README
+++ b/benchtests/README
@@ -62,6 +62,7 @@ one to add `foo' to the bench tests:
and functions (specifically, this includes using "#include "source").
See pthread_once-inputs and pthreads_once-source.c for an example of how
to use this to benchmark a function that needs state across several calls.
+ - init: Name of an initializer function to call to initialize the benchtest.
- name: See following section for instructions on how to use this directive.
Lines beginning with a single hash '#' are treated as comments. See
diff --git a/benchtests/bench-skeleton.c b/benchtests/bench-skeleton.c
index 29d6bda809..68a91dcc7a 100644
--- a/benchtests/bench-skeleton.c
+++ b/benchtests/bench-skeleton.c
@@ -62,6 +62,9 @@ main (int argc, char **argv)
unsigned long iters, res;
+#ifdef BENCH_INIT
+ BENCH_INIT ();
+#endif
TIMING_INIT (res);
iters = 1000 * res;
diff --git a/benchtests/scripts/bench.py b/benchtests/scripts/bench.py
index 492c764aa7..eb5a14141a 100755
--- a/benchtests/scripts/bench.py
+++ b/benchtests/scripts/bench.py
@@ -128,6 +128,10 @@ def gen_source(func, directives, all_vals):
else:
getret = ''
+ # Test initialization.
+ if directives['init']:
+ print('#define BENCH_INIT %s' % directives['init'])
+
print(EPILOGUE % {'getret': getret, 'func': func})
@@ -232,7 +236,8 @@ def parse_file(func):
'args': [],
'includes': [],
'include-sources': [],
- 'ret': ''
+ 'ret': '',
+ 'init': ''
}
try: