diff options
| author | Mattias Andrée <maandree@kth.se> | 2016-04-28 21:38:57 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2016-04-28 21:38:57 +0200 |
| commit | 8bbbb381017811e36c43fd08b802ec6c293e4255 (patch) | |
| tree | 684a104953e7485e5767ca2d7ec4d40937947593 /bench | |
| parent | benchmark-func: use X-macros for function-listing (diff) | |
| download | libzahl-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 '')
| -rw-r--r-- | bench/benchmark-func.c | 12 | ||||
| -rw-r--r-- | bench/benchmark.h | 11 |
2 files changed, 11 insertions, 12 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: diff --git a/bench/benchmark.h b/bench/benchmark.h index 6d6aa87..cb42777 100644 --- a/bench/benchmark.h +++ b/bench/benchmark.h @@ -101,11 +101,10 @@ rdtsc_join(unsigned int low, unsigned int high) rdtsc(&end_low, &end_high);\ dur_cycles = rdtsc_join(end_low, end_high);\ dur_cycles -= rdtsc_join(start_low, start_high);\ - dur_seconds = dur_cycles;\ - dur_seconds /= freq;\ - dur_seconds /= 1000;\ - dur_seconds -= dur.tv_sec = (int)dur_seconds;\ - dur.tv_nsec = dur_seconds * 1000000000L;\ + dur_seconds = (double)dur_cycles;\ + dur_seconds /= 1000 * (double)freq;\ + dur_seconds -= (double)(dur.tv_sec = (int)dur_seconds);\ + dur.tv_nsec = (long int)(dur_seconds * 1000000000L);\ } while (0) #elif defined(USE_CLOCK) # define TIC (start = clock()) @@ -130,5 +129,5 @@ rdtsc_join(unsigned int low, unsigned int high) #endif -#define TICKS (dur.tv_sec * 1000000000ULL + dur.tv_nsec) +#define TICKS ((unsigned long long int)(dur.tv_sec) * 1000000000ULL + (unsigned long long int)(dur.tv_nsec)) #define STIME (sprintf(timebuf, "%lli.%09li", (long long)(dur.tv_sec), dur.tv_nsec), timebuf) |