Merge commit 'd49c33882b1c60a4dda2b5eb160ea70e3dc08581'

Author: kripken

ChangeLog.markdown

@@ -14,6 +14,27 @@ Current trunk code
     - Emscripten-LLVM: https://github.com/kripken/emscripten-fastcomp/compare/1.27.1...incoming
     - Emscripten-Clang: https://github.com/kripken/emscripten-fastcomp-clang/compare/1.27.1...incoming
 
+v1.28.3: 01/04/2015
+-------------------
+ - embuilder.py tool
+ - Many fixes for native optimizer on Windows
+ - Perform LLVM LTO in a separate invocation of opt, so that it does not mix with legalization and other stuff we do at link time
+
+v1.28.2: 12/17/2014
+-------------------
+ - Enable native optimizer by default
+ - Disable slow2asm legacy testing (asm.js mode in pre-fastcomp)
+
+v1.28.1: 12/15/2014
+-------------------
+ - Use a lot more MUSL math functions
+
+v1.28.0: 12/12/2014
+-------------------
+
+v1.27.2: 12/10/2014
+-------------------
+
 v1.27.1: 11/20/2014
 -------------------
  - Migrated to upstream PNaCl LLVM+Clang 3.4 from the previous 3.3.

em++

@@ -7,6 +7,5 @@ See emcc.py. This script forwards to there, noting that we want C++ and not C by
 import os, subprocess, sys
 from tools import shared
 
-os.environ['EMMAKEN_CXX'] = '1'
-exit(subprocess.call([shared.PYTHON, shared.EMCC] + sys.argv[1:]))
+exit(subprocess.call([shared.PYTHON, shared.EMCC] + sys.argv[1:] + ['--emscripten-cxx']))
 

embuilder.py

@@ -0,0 +1,127 @@
+#!/usr/bin/env python2
+
+'''
+Tool to manage building of various useful things, such as libc, libc++, native optimizer, as well as fetch and build ports like zlib and sdl2
+'''
+
+import os, sys
+import tools.shared as shared
+
+if len(sys.argv) < 2 or sys.argv[1] in ['-v', '-help', '--help', '-?', '?']:
+  print '''
+Emscripten System Builder Tool
+==============================
+
+You can use this tool to manually build parts of the emscripten system
+environment. In general emcc will build them automatically on demand, so
+you do not strictly need to use this tool, but it gives you more control
+over the process (in particular, if emcc does this automatically, and you
+are running multiple build commands in parallel, confusion can occur).
+
+Usage:
+
+  embuilder.py OPERATION TASK1 [TASK2..]
+
+Available operations and tasks:
+
+  build libc
+        libcxx
+        libcxxabi
+        gl
+        struct_info
+        native_optimizer
+        zlib
+        sdl2
+        sdl2-image
+
+It is also possible to build native_optimizer manually by using CMake. To
+do that, run
+
+   1. cd $EMSCRIPTEN/tools/optimizer
+   2. cmake . -DCMAKE_BUILD_TYPE=Release
+   3. make (or mingw32-make/vcbuild/msbuild on Windows)
+
+and set up the location to the native optimizer in ~/.emscripten
+
+'''
+  sys.exit(0)
+
+temp_files = shared.configuration.get_temp_files()
+
+def build(src, result_libs, args=[]):
+  temp = temp_files.get('.cpp').name
+  open(temp, 'w').write(src)
+  temp_js = temp_files.get('.js').name
+  shared.Building.emcc(temp, args, output_filename=temp_js)
+  assert os.path.exists(temp_js), 'failed to build file'
+  for lib in result_libs:
+    assert os.path.exists(shared.Cache.get_path(lib)), 'not seeing that requested library %s has been built' % lib
+
+operation = sys.argv[1]
+
+if operation == 'build':
+  for what in sys.argv[2:]:
+    shared.logging.info('building and verifying ' + what)
+    if what == 'libc':
+      build('''
+        #include <string.h>
+        #include <stdlib.h>
+        int main() {
+          return int(malloc(10)) + int(strchr("str", 'c'));
+        }
+      ''', ['libc.bc', 'libcextra.bc'])
+    elif what == 'libcxx':
+      build('''
+        #include <iostream>
+        int main() {
+          std::cout << "hello";
+          return 0;
+        }
+      ''', ['libcxx.bc'])
+    elif what == 'libcxxabi':
+      build('''
+        struct X { int x; virtual void a() {} };
+        struct Y : X { int y; virtual void a() { y = 10; }};
+        int main(int argc, char **argv) {
+          Y* y = dynamic_cast<Y*>((X*)argv[1]);
+          y->a();
+          return y->y;
+        }
+      ''', ['libcxxabi.bc'])
+    elif what == 'gl':
+      build('''
+        extern "C" { extern void* emscripten_GetProcAddress(const char *x); }
+        int main() {
+          return int(emscripten_GetProcAddress("waka waka"));
+        }
+      ''', ['gl.bc'])
+    elif what == 'struct_info':
+      build('''
+        int main() {}
+      ''', ['struct_info.compiled.json'])
+    elif what == 'native_optimizer':
+      build('''
+        int main() {}
+      ''', ['optimizer.exe'], ['-O2'])
+    elif what == 'zlib':
+      build('''
+        int main() {}
+      ''', [os.path.join('ports-builds', 'zlib', 'libz.a')], ['-s', 'USE_ZLIB=1'])
+    elif what == 'sdl2':
+      build('''
+        int main() {}
+      ''', [os.path.join('ports-builds', 'sdl2', 'libsdl2.bc')], ['-s', 'USE_SDL=2'])
+    elif what == 'sdl2-image':
+      build('''
+        int main() {}
+      ''', [os.path.join('ports-builds', 'sdl2-image', 'libsdl2_image.bc')], ['-s', 'USE_SDL=2', '-s', 'USE_SDL_IMAGE=2'])
+    else:
+      shared.logging.error('unfamiliar build target: ' + what)
+      sys.exit(1)
+
+    shared.logging.info('...success')
+
+else:
+  shared.logging.error('unfamiliar operation: ' + operation)
+  sys.exit(1)
+

emcc

@@ -104,6 +104,9 @@ if DEBUG and LEAVE_INPUTS_RAW: logging.warning('leaving inputs raw')
 stdout = PIPE if not DEBUG else None # suppress output of child processes
 stderr = PIPE if not DEBUG else None # unless we are in DEBUG mode
 
+EMCC_CXX = '--emscripten-cxx' in sys.argv
+sys.argv = filter(lambda x: x != '--emscripten-cxx', sys.argv)
+
 shared.check_sanity(force=DEBUG)
 
 # Handle some global flags
@@ -126,8 +129,6 @@ while response_file:
       break
 
 if len(sys.argv) == 1 or '--help' in sys.argv:
-  this = os.path.basename('em++' if os.environ.get('EMMAKEN_CXX') else 'emcc')
-
   # Documentation for emcc and its options must be updated in: 
   #    site/source/docs/tools_reference/emcc.rst
   # A prebuilt local version of the documentation is available at: 
@@ -212,7 +213,7 @@ if CONFIGURE_CONFIG or CMAKE_CONFIG:
       if debug_configure: open(tempout, 'a').write('Forcing clang since uses fopen to write\n')
 
   compiler = os.environ.get('CONFIGURE_CC') or (shared.CLANG if not use_js else shared.EMCC) # if CONFIGURE_CC is defined, use that. let's you use local gcc etc. if you need that
-  if not ('CXXCompiler' in ' '.join(sys.argv) or os.environ.get('EMMAKEN_CXX')):
+  if not ('CXXCompiler' in ' '.join(sys.argv) or EMCC_CXX):
     compiler = shared.to_cc(compiler)
 
   def filter_emscripten_options(argv):
@@ -276,7 +277,7 @@ else:
 CC = shared.to_cc(CXX)
 
 # If we got here from a redirection through emmakenxx.py, then force a C++ compiler here
-if os.environ.get('EMMAKEN_CXX'):
+if EMCC_CXX:
   CC = CXX
 
 CC_ADDITIONAL_ARGS = shared.COMPILER_OPTS
@@ -830,7 +831,7 @@ try:
             break
         if found: break
       if found: break
-    if not found and lib not in ['GL', 'GLU', 'glut']: # whitelist our default libraries
+    if not found and lib not in ['GL', 'GLU', 'glut', 'SDL']: # whitelist our default libraries
       logging.warning('emcc: cannot find library "%s"', lib)
 
   # If not compiling to JS, then we are compiling to an intermediate bitcode objects or library, so
@@ -865,6 +866,8 @@ try:
     # Set ASM_JS default here so that we can override it from the command line.
     shared.Settings.ASM_JS = 1 if opt_level > 0 else 2
 
+  pre_fastcomp_opts = []
+
   # Apply -s settings in newargs here (after optimization levels, so they can override them)
   for change in settings_changes:
     key, value = change.split('=')
@@ -902,7 +905,6 @@ try:
       logging.warning('jcache is deprecated and not supported in fastcomp (you should not need it anyhow), disabling')
       jcache = False
 
-    pre_fastcomp_opts = []
     fastcomp_opts = []
     if shared.Settings.NO_EXIT_RUNTIME:
       pre_fastcomp_opts += ['-emscripten-no-exit-runtime']
@@ -1235,6 +1237,11 @@ try:
       if not shared.Building.can_inline(): link_opts.append('-disable-inlining')
       # do not internalize in std-link-opts - it ignores internalize-public-api-list - and add a manual internalize
       link_opts += ['-disable-internalize'] + shared.Building.get_safe_internalize() + ['-std-link-opts']
+      # execute it now, so it is done entirely before we get to the stage of legalization etc.
+      shared.Building.llvm_opt(final, pre_fastcomp_opts + link_opts)
+      if DEBUG: save_intermediate('lto', 'bc')
+      pre_fastcomp_opts = []
+      link_opts = []
     else:
       # At minimum remove dead functions etc., this potentially saves a lot in the size of the generated code (and the time to compile it)
       link_opts += shared.Building.get_safe_internalize() + ['-globaldce']

emscripten-version.txt

@@ -1,2 +1,2 @@
-1.28.0
+1.28.3
 

emscripten.py

@@ -1096,20 +1096,19 @@ def make_emulated_param(i):
     simdfloattypes = ['float32x4']
     simdinttypes = ['int32x4']
     simdtypes = simdfloattypes + simdinttypes
-    # TODO: mul
-    simdfuncs = ['add', 'sub', 'neg',
+    simdfuncs = ['add', 'sub', 'neg', 'mul',
                  'equal', 'lessThan', 'greaterThan',
                  'notEqual', 'lessThanOrEqual', 'greaterThanOrEqual',
                  'select', 'and', 'or', 'xor', 'not',
                  'splat', 'swizzle', 'shuffle',
                  'withX', 'withY', 'withZ', 'withW',
                  'load', 'store']
-    # TODO: fromInt32x4
-    simdfloatfuncs = simdfuncs + ['mul', 'div', 'min', 'max', 'minNum', 'maxNum', 'sqrt',
-                                  'abs', 'fromInt32x4Bits'];
-    # TODO: fromFloat32x4
-    # TODO: shiftLeftByScalar, shiftRightArithmeticByScalar, shiftLeftArithmeticByScalar
-    simdintfuncs = simdfuncs + ['fromFloat32x4Bits'];
+    simdfloatfuncs = simdfuncs + ['div', 'min', 'max', 'minNum', 'maxNum', 'sqrt',
+                                  'abs', 'fromInt32x4', 'fromInt32x4Bits'];
+    simdintfuncs = simdfuncs + ['fromFloat32x4', 'fromFloat32x4Bits',
+                                'shiftRightArithmeticByScalar',
+                                'shiftRightLogicalByScalar',
+                                'shiftLeftByScalar'];
     fundamentals = ['Math', 'Int8Array', 'Int16Array', 'Int32Array', 'Uint8Array', 'Uint16Array', 'Uint32Array', 'Float32Array', 'Float64Array']
     if metadata['simd']:
         fundamentals += ['SIMD']

site/source/docs/getting_started/FAQ.rst

@@ -207,6 +207,11 @@ or
 
 What happens in practice is that when code is ready to be run, we check for ``Module._main``. If present, we call it. If a ``main()`` function was compiled from C, it will be there (and it will be a JavaScript function). But, you can also just define a JavaScript function there, either will work.
 
+Another option is to define an ``onRuntimeInitialized`` function,
+
+  Module['onRuntimeInitialized'] = function() { ... };
+
+That method will be called when the runtime is ready and it is ok for you to call compiled code. In practice, that is exactly the same time at which ``main()`` would be called, so ``onRuntimeInitialized`` doesn't let you do anything new, but it can be convenient in some cases - for example, if you use ``onRuntimeInitialized`` and don't define a ``main()`` function, then the runtime will not be shut down after ``main()`` exits, and you can keep calling compiled methods (you can also have a ``main()`` and build with ``-s NO_EXIT_RUNTIME=1`` to keep the runtime from being shut down). Thus, for libraries, ``onRuntimeInitialized`` can be convenient.
 
 .. _faq-dead-code-elimination:
 

site/source/docs/getting_started/Tutorial.rst

@@ -96,7 +96,7 @@ JavaScript is usually run in the sandboxed environment of a web browser, without
 Files that you want to access should be :ref:`preloaded <emcc-preload-file>` or :ref:`embedded <emcc-embed-file>` into the virtual file system. Preloading (or embedding) generates a virtual file system that corresponds to the file system structure at *compile* time, *relative to the current directory*. 
 
 
-The `hello_world_file.cpp <https://github.com/kripken/emscripten/blob/master/tests/hello_world.cpp>`_ example shows how to load a file (both the test code and the file to be loaded shown below):
+The `hello_world_file.cpp <https://github.com/kripken/emscripten/blob/master/tests/hello_world_file.cpp>`_ example shows how to load a file (both the test code and the file to be loaded shown below):
 
 .. include:: ../../../../tests/hello_world_file.cpp
    :literal:

site/source/docs/introducing_emscripten/release_notes.rst

@@ -16,7 +16,7 @@ ChangeLog
 
 The ChangeLog for Emscripten |release| (|today|) is listed below (master version `here <https://github.com/kripken/emscripten/blob/master/ChangeLog.markdown>`_).
 
-.. include::   ../../../../ChangeLog
+.. include::   ../../../../ChangeLog.markdown
    :literal:
 
 

src/ecmascript_simd.js

@@ -19,8 +19,11 @@
 */
 
 if (typeof SIMD === "undefined") {
-  // SIMD module.
-  var SIMD = {};
+  // SIMD module. We don't use the var keyword here, so that we put the
+  // SIMD object in the global scope even if this polyfill code is included
+  // within some other scope. The theory is that we're anticipating a
+  // future where SIMD is predefined in the global scope.
+  SIMD = {};
 }
 
 // private stuff.
@@ -254,7 +257,7 @@ if (typeof SIMD.float32x4.fromUnsignedInt32x4 === "undefined") {
     * @param {int32x4} t An instance of int32x4.
     * @return {float32x4} An unsigned integer to float conversion copy of t.
     */
-  SIMD.float32x4.fromInt32x4 = function(t) {
+  SIMD.float32x4.fromUnsignedInt32x4 = function(t) {
     t = SIMD.int32x4(t);
     return SIMD.float32x4(t.x>>>0, t.y>>>0, t.z>>>0, t.w>>>0);
   }
@@ -385,7 +388,7 @@ if (typeof SIMD.float64x2.fromUnsignedInt32x4 === "undefined") {
     * @param {int32x4} t An instance of int32x4.
     * @return {float64x2} A float64x2 with .x>>>0 and .y>>>0 from t
     */
-  SIMD.float64x2.fromInt32x4 = function(t) {
+  SIMD.float64x2.fromUnsignedInt32x4 = function(t) {
     t = SIMD.int32x4(t);
     return SIMD.float64x2(t.x>>>0, t.y>>>0);
   }
@@ -534,7 +537,7 @@ if (typeof SIMD.int32x4.fromFloat32x4ToUnsigned === "undefined") {
     * @param {float32x4} t An instance of float32x4.
     * @return {int32x4} with an unsigned integer to float conversion of t.
     */
-  SIMD.int32x4.fromFloat32x4 = function(t) {
+  SIMD.int32x4.fromFloat32x4ToUnsigned = function(t) {
     t = SIMD.float32x4(t);
     return SIMD.int32x4(t.x>>>0, t.y>>>0, t.z>>>0, t.w>>>0);
   }
@@ -556,7 +559,7 @@ if (typeof SIMD.int32x4.fromFloat64x2ToUnsigned === "undefined") {
     * @param {float64x2} t An instance of float64x2.
     * @return {int32x4}  An int32x4 with .x>>>0 and .y>>>0 from t
     */
-  SIMD.int32x4.fromFloat64x2 = function(t) {
+  SIMD.int32x4.fromFloat64x2ToUnsigned = function(t) {
     t = SIMD.float64x2(t);
     return SIMD.int32x4(t.x>>>0, t.y>>>0, 0, 0);
   }
@@ -567,7 +570,7 @@ if (typeof SIMD.int32x4.fromInt16x8 === "undefined") {
     * @param {int16x8} t An instance of int16x8.
     * @return {int32x4} with the s0, s1, s2, and s3 from t, sign-extended
     */
-  SIMD.int32x4.fromFloat32x4 = function(t) {
+  SIMD.int32x4.fromInt16x8 = function(t) {
     t = SIMD.int16x8(t);
     return SIMD.int32x4(t.s0, t.s1, t.s2, t.s3);
   }
@@ -578,8 +581,8 @@ if (typeof SIMD.int32x4.fromUnsignedInt8x16 === "undefined") {
     * @param {int8x16} t An instance of int8x16.
     * @return {int32x4} with the s0, s1, s2, and s3 from t, zero-extended
     */
-  SIMD.int32x4.fromFloat32x4 = function(t) {
-    t = SIMD.intint8x16(t);
+  SIMD.int32x4.fromUnsignedInt8x16 = function(t) {
+    t = SIMD.int8x16(t);
     return SIMD.int32x4(t.s0>>>0, t.s1>>>0, t.s2>>>0, t.s3>>>0);
   }
 }
@@ -589,7 +592,7 @@ if (typeof SIMD.int32x4.fromUnsignedInt16x8 === "undefined") {
     * @param {int16x8} t An instance of int16x8.
     * @return {int32x4} with the s0, s1, s2, and s3 from t, zero-extended
     */
-  SIMD.int32x4.fromFloat32x4 = function(t) {
+  SIMD.int32x4.fromUnsignedInt16x8 = function(t) {
     t = SIMD.int16x8(t);
     return SIMD.int32x4(t.s0>>>0, t.s1>>>0, t.s2>>>0, t.s3>>>0);
   }
@@ -600,8 +603,8 @@ if (typeof SIMD.int32x4.fromInt8x16 === "undefined") {
     * @param {int8x16} t An instance of int8x16.
     * @return {int32x4} with the s0, s1, s2, and s3 from t
     */
-  SIMD.int32x4.fromFloat32x4 = function(t) {
-    t = SIMD.intint8x16(t);
+  SIMD.int32x4.fromInt8x16 = function(t) {
+    t = SIMD.int8x16(t);
     return SIMD.int32x4(t.s0, t.s1, t.s2, t.s3);
   }
 }