Benchmark improvements (emscripten-core#5798)

kripken · web-flow · commit fe3510ca5ebe · 2017-11-25T14:12:31.000-08:00
* cleanup benchmark code
* add cheerp benchmark target
* add utilities to get binaryen and its bin dir
* get the binaryen port when we actually need it, so we don't fetch it early (which, for the wasm backend, might be during compilation of system libraries in ports)
* add a test for the wasm backend building ok with the binaryen port
diff --git a/emcc.py b/emcc.py
@@ -1184,9 +1184,6 @@ def check(input_file):
           if shared.Settings.BINARYEN_PASSES:
             shared.Settings.BINARYEN_PASSES += ','
           shared.Settings.BINARYEN_PASSES += 'safe-heap'
-        # ensure the binaryen port is available, if we are using it. if we do, then
-        # we need it to build to wasm
-        system_libs.get_port('binaryen', shared.Settings)
 
       # wasm outputs are only possible with a side wasm
       if target.endswith(WASM_ENDINGS):
@@ -2240,7 +2237,7 @@ def binaryen_method_sanity_check():
 def do_binaryen(final, target, asm_target, options, memfile, wasm_binary_target,
                 wasm_text_target, misc_temp_files, optimizer):
   logging.debug('using binaryen, with method: ' + shared.Settings.BINARYEN_METHOD)
-  binaryen_bin = os.path.join(shared.Settings.BINARYEN_ROOT, 'bin')
+  binaryen_bin = shared.Building.get_binaryen_bin()
   # Emit wasm.js at the top of the js. This is *not* optimized with the rest of the code, since
   # (1) it contains asm.js, whose validation would be broken, and (2) it's very large so it would
   # be slow in cleanup/JSDCE etc.
diff --git a/tests/benchmark_memcpy.cpp b/tests/benchmark_memcpy.cpp
@@ -1,4 +1,3 @@
-#include <memory.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/benchmark_memset.cpp b/tests/benchmark_memset.cpp
@@ -1,4 +1,3 @@
-#include <memory.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/box2d/Makefile b/tests/box2d/Makefile
@@ -51,7 +51,7 @@ OBJECTS = \
 all: box2d.a
 
 %.o: %.cpp
-	$(CXX) -I. $< -o $@ -O2 -c
+	$(CXX) $(CFLAGS) -I. $< -o $@ -O2 -c
 
 box2d.a: $(OBJECTS)
 	$(AR) rvs $@ $(OBJECTS)
diff --git a/tests/test_benchmark.py b/tests/test_benchmark.py
diff --git a/tests/test_sanity.py b/tests/test_sanity.py
@@ -965,6 +965,26 @@ def test_with_fake(report, expected):
     finally:
       del os.environ['EMCC_WASM_BACKEND']
 
+  def test_wasm_backend_builds(self):
+    # we can build a program using the wasm backend, rebuilding binaryen etc. as needed
+    restore()
+    def check():
+      print(self.do([PYTHON, EMCC, '--clear-cache']))
+      print(self.do([PYTHON, EMCC, '--clear-ports']))
+      try:
+        os.environ['EMCC_WASM_BACKEND'] = '1'
+        self.check_working([EMCC, 'tests/hello_world.c'], '')
+      finally:
+        del os.environ['EMCC_WASM_BACKEND']
+    print('normally')
+    check()
+    print('with no BINARYEN_ROOT')
+    open(CONFIG_FILE, 'a').write('''
+BINARYEN_ROOT = ''
+    ''')
+    print(open(CONFIG_FILE).read())
+    check()
+
   def test_binaryen(self):
     import tools.ports.binaryen as binaryen
     tag_file = Cache.get_path('binaryen_tag_' + binaryen.TAG + '.txt')
diff --git a/tests/zlib/benchmark.c b/tests/zlib/benchmark.c
@@ -6,23 +6,23 @@
 
 
 // don't inline, to be friendly to js engine osr
-void __attribute__ ((noinline)) doit(char *buffer, int size, int i) {
-  static char *buffer2 = NULL;
-  static char *buffer3 = NULL;
+void __attribute__ ((noinline)) doit(unsigned char *buffer, int size, int i) {
+  static unsigned char *buffer2 = NULL;
+  static unsigned char *buffer3 = NULL;
 
   unsigned long maxCompressedSize = compressBound(size);
 
-  if (!buffer2) buffer2 = (char*)malloc(maxCompressedSize);
-  if (!buffer3) buffer3 = (char*)malloc(size);
+  if (!buffer2) buffer2 = (unsigned char*)malloc(maxCompressedSize);
+  if (!buffer3) buffer3 = (unsigned char*)malloc(size);
 
   unsigned long compressedSize = maxCompressedSize;
   compress(buffer2, &compressedSize, buffer, size);
-  if (i == 0) printf("sizes: %d,%d\n", size, compressedSize);
+  if (i == 0) printf("sizes: %d,%d\n", size, (int)compressedSize);
 
   unsigned long decompressedSize = size;
-  uncompress(buffer3, &decompressedSize, buffer2, compressedSize);
+  uncompress(buffer3, &decompressedSize, buffer2, (int)compressedSize);
   assert(decompressedSize == size);
-  if (i == 0) assert(strcmp(buffer, buffer3) == 0);
+  if (i == 0) assert(strcmp((char*)buffer, (char*)buffer3) == 0);
 }
 
 int main(int argc, char **argv) {
@@ -38,7 +38,7 @@ int main(int argc, char **argv) {
     default: printf("error: %d\\n", arg); return -1;
   }
 
-  char *buffer = malloc(size);
+  unsigned char *buffer = (unsigned char*)malloc(size);
 
   int i = 0;
   int run = 0;
diff --git a/tools/shared.py b/tools/shared.py
@@ -2297,6 +2297,21 @@ def path_to_system_js_libraries_for_settings(link_settings):
     if 'USE_SDL=2' in link_settings: system_js_libraries += ['library_egl.js', 'library_glut.js', 'library_gl.js']
     return [path_from_root('src', x) for x in system_js_libraries]
 
+  @staticmethod
+  def get_binaryen():
+    # fetch the port, so we have binaryen set up. indicate we need binaryen
+    # using the settings
+    import system_libs
+    old = Settings.BINARYEN
+    Settings.BINARYEN = 1
+    system_libs.get_port('binaryen', Settings)
+    Settings.BINARYEN = old
+
+  @staticmethod
+  def get_binaryen_bin():
+    Building.get_binaryen()
+    return os.path.join(Settings.BINARYEN_ROOT, 'bin')
+
 # compatibility with existing emcc, etc. scripts
 Cache = cache.Cache(debug=DEBUG_CACHE)
 chunkify = cache.chunkify

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#include <memory.h>`
`2`	`1`	`#include <string.h>`
`3`	`2`	`#include <stdio.h>`
`4`	`3`	`#include <stdlib.h>`