aboutsummaryrefslogtreecommitdiffstats
path: root/bench/benchmark-func.c
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2016-04-28 21:38:57 +0200
committerMattias Andrée <maandree@kth.se>2016-04-28 21:38:57 +0200
commit8bbbb381017811e36c43fd08b802ec6c293e4255 (patch)
tree684a104953e7485e5767ca2d7ec4d40937947593 /bench/benchmark-func.c
parentbenchmark-func: use X-macros for function-listing (diff)
downloadlibzahl-8bbbb381017811e36c43fd08b802ec6c293e4255.tar.gz
libzahl-8bbbb381017811e36c43fd08b802ec6c293e4255.tar.bz2
libzahl-8bbbb381017811e36c43fd08b802ec6c293e4255.tar.xz
Fix warnings
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to 'bench/benchmark-func.c')
-rw-r--r--bench/benchmark-func.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/bench/benchmark-func.c b/bench/benchmark-func.c
index 016aa70..1dc9272 100644
--- a/bench/benchmark-func.c
+++ b/bench/benchmark-func.c
@@ -16,10 +16,10 @@ struct function {
size_t a_start;
size_t a_end;
size_t a_step;
- int a_mode;
size_t b_start;
size_t b_end;
size_t b_step;
+ int a_mode;
int b_mode;
size_t runs;
size_t measurements;
@@ -85,7 +85,7 @@ gettime(size_t m)
#endif
#define FUNCTION_2D(NAME, INSTRUCTION, PREINSTRUCTION)\
- void\
+ static void\
NAME(z_t *as, z_t* bs, struct function *f)\
{\
size_t i, j, k, n = f->a_end - f->a_start + 1;\
@@ -114,8 +114,8 @@ gettime(size_t m)
(void) bs;\
}
-#define FAST2D(P) 1, 4097, 64, P, 0, 0, 0, 0, 1000, M_MAX
-#define SLOW2D(P) 1, 4097, 64, P, 0, 0, 0, 0, 10, 20
+#define FAST2D(P) 1, 4097, 64, 0, 0, 0, P, 0, 1000, M_MAX
+#define SLOW2D(P) 1, 4097, 64, 0, 0, 0, P, 0, 10, 20
#define LIST_2D_FUNCTIONS\
X(zset, FAST2D(FULL), zset(temp, *a),)\
@@ -197,10 +197,10 @@ LIST_2D_FUNCTIONS
static z_t *
create_ints(size_t start, size_t end, int mode)
{
- z_t *array = malloc((end - start + 1) * sizeof(z_t));
+ z_t *array = malloc((++end - start) * sizeof(z_t));
z_t *rc = array;
ssize_t n;
- for (; start <= end; start++, array++) {
+ for (; start < end; start++, array++) {
zinit(*array);
switch (mode) {
case HIGH_ONLY: