Use unsigned long arrays for memxor benchmark.

diff --git a/ChangeLog b/ChangeLog
index 561476e905611f5feda7f1c6c7adcb6ae35e368e..f611ea2fef04cb8bc72e260030c99b2eddc109ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-23  Niels Möller  <nisse@lysator.liu.se>
+
+       * examples/nettle-benchmark.c (time_memxor): Allocate buffers as
+       arrays of unsigned long, for more reliable alignment.
+
 2014-10-22  Niels Möller  <nisse@lysator.liu.se>
 
        * configure.ac: Check for getline function.

diff --git a/examples/nettle-benchmark.c b/examples/nettle-benchmark.c
index d60aad76f25a87f484a2db3d7e13cfcc96c92efa..c00486cc232281784eda0031ec7c9a367233023f 100644 (file)
--- a/examples/nettle-benchmark.c
+++ b/examples/nettle-benchmark.c
@@ -157,9 +157,9 @@ bench_nothing(void *arg UNUSED)
 
 struct bench_memxor_info
 {
-  uint8_t *dst;
-  const uint8_t *src;
-  const uint8_t *other;  
+  void *dst;
+  const void *src;
+  const void *other;
 };
 
 static void
@@ -345,16 +345,16 @@ static void
 time_memxor(void)
 {
   struct bench_memxor_info info;
-  uint8_t src[BENCH_BLOCK + sizeof(long)];
-  uint8_t other[BENCH_BLOCK + sizeof(long)];
-  uint8_t dst[BENCH_BLOCK];
+  unsigned long src[BENCH_BLOCK / sizeof(long) + 2];
+  unsigned long other[BENCH_BLOCK / sizeof(long) + 2];
+  unsigned long dst[BENCH_BLOCK / sizeof(long) + 1];
 
   info.src = src;
   info.dst = dst;
 
   display ("memxor", "aligned", sizeof(unsigned long),
           time_function(bench_memxor, &info));
-  info.src = src + 1;
+  info.src = (const char *) src + 1;
   display ("memxor", "unaligned", sizeof(unsigned long),
           time_function(bench_memxor, &info));
 
@@ -363,13 +363,13 @@ time_memxor(void)
   display ("memxor3", "aligned", sizeof(unsigned long),
           time_function(bench_memxor3, &info));
 
-  info.other = other + 1;
+  info.other = (const char *) other + 1;
   display ("memxor3", "unaligned01", sizeof(unsigned long),
           time_function(bench_memxor3, &info));
-  info.src = src + 1;
+  info.src = (const char *) src + 1;
   display ("memxor3", "unaligned11", sizeof(unsigned long),
           time_function(bench_memxor3, &info));
-  info.other = other + 2;
+  info.other = (const char *) other + 2;
   display ("memxor3", "unaligned12", sizeof(unsigned long),
           time_function(bench_memxor3, &info));  
 }