fix and enable zlib benchmark

2 files changed, 5 insertions, 10 deletions

diff --git a/tests/runner.py b/tests/runner.py
index 0b40401d..80949b05 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -10915,14 +10915,13 @@ elif 'benchmark' in str(sys.argv):
       src = open(path_from_root('system', 'lib', 'dlmalloc.c'), 'r').read() + '\n\n\n' + open(path_from_root('tests', 'dlmalloc_test.c'), 'r').read()
       self.do_benchmark('dlmalloc', src, ['400', '400'], '*400,0*', emcc_args=['-g', '-s', 'CORRECT_SIGNS=2', '-s', 'CORRECT_SIGNS_LINES=[4820, 4195, 4250, 4203, 4209, 4239, 4231]'])
 
-    def zzztest_zlib(self):
+    def test_zlib(self):
       src = open(path_from_root('tests', 'zlib', 'benchmark.c'), 'r').read()
       emcc_args = self.get_library('zlib', os.path.join('libz.a'), make_args=['libz.a']) + \
                    ['-I' + path_from_root('tests', 'zlib')]
       native_args = self.get_library('zlib_native', os.path.join('libz.a'), make_args=['libz.a'], native=True) + \
                      ['-I' + path_from_root('tests', 'zlib')]
-      self.do_benchmark('zlib', src, ['100000', '100'], '''sum: 18710
-sizes: 100000,25906
+      self.do_benchmark('zlib', src, ['100000', '500'], '''sizes: 100000,25906
 ok.
 ''',
                         force_c=True, emcc_args=emcc_args, native_args=native_args)
diff --git a/tests/zlib/benchmark.c b/tests/zlib/benchmark.c
index f8ab6205..9ad872e1 100644
--- a/tests/zlib/benchmark.c
+++ b/tests/zlib/benchmark.c
@@ -10,16 +10,16 @@ void __attribute__ ((noinline)) doit(char *buffer, int size, int i) {
   static char *buffer2 = NULL;
   static char *buffer3 = NULL;
 
-  int maxCompressedSize = compressBound(size);
+  unsigned long maxCompressedSize = compressBound(size);
 
   if (!buffer2) buffer2 = (char*)malloc(maxCompressedSize);
   if (!buffer3) buffer3 = (char*)malloc(size);
 
-  int compressedSize = maxCompressedSize;
+  unsigned long compressedSize = maxCompressedSize;
   compress(buffer2, &compressedSize, buffer, size);
   if (i == 0) printf("sizes: %d,%d\n", size, compressedSize);
 
-  int decompressedSize = size;
+  unsigned long decompressedSize = size;
   uncompress(buffer3, &decompressedSize, buffer2, compressedSize);
   assert(decompressedSize == size);
   if (i == 0) assert(strcmp(buffer, buffer3) == 0);
@@ -33,7 +33,6 @@ int main(int argc, char **argv) {
   int i = 0;
   int run = 0;
   char runChar = 17;
-  int sum = 0;
   while (i < size) {
     if (run > 0) {
       run--;
@@ -46,11 +45,8 @@ int main(int argc, char **argv) {
       }
     }
     buffer[i] = runChar;
-    sum += buffer[i];
-    if (argc == 100) printf("%d: %d\n", i, buffer[i]); // confuse llvm optimizer, work around possible bug, this is not speed-relevant anyhow
     i++;
   }
-  printf("sum: %d\n", sum);
 
   for (i = 0; i < iters; i++) {
     doit(buffer, size, i);