Merge remote-tracking branch 'origin/master' into release

Author: actions-user

NOTICE

@@ -35,6 +35,31 @@ the following terms:
   Copyright 2015 WebAssembly Community Group participants
   Apache License, Version 2.0 (see LICENSE file)
 
+* Arm Optimized Routines: https://github.com/ARM-software/optimized-routines
+
+  ----------------------------------------------------------------------
+  MIT License
+
+  Copyright (c) 1999-2019, Arm Limited.
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+
 * musl: http://www.musl-libc.org
 
   musl as a whole is licensed under the following standard MIT license:

examples/n-body/README.md

@@ -30,18 +30,18 @@ Benchmark
 =========
 
 ***Environment:***
-- MacBook Pro (Retina, 15-inch, Late 2013)
+- MacBook Pro (15-inch, 2019)
 - macOS 10.14.6
-- node.js v12.10.0
-- rustc 1.40.0-nightly (37538aa13 2019-09-25)
+- node.js v13.5.0
+- rustc 1.42.0-nightly (3a3f4a7cb 2019-12-28)
 
 ***Results:***
 
 |        Target           |  Time, ***ms*** | Size, ***KB*** |
 |-------------------------|-----------------|----------------|
-| **AssemblyScript WASM** | **2821**        | **1.6**        |
-| AssemblyScript ASMJS    | 3972            | 19*            |
-| JavaScript              | 2656            | 5*             |
-| Rust WASM               | 2560            | 2              |
+| **AssemblyScript WASM** | **1650**        | **1.6**        |
+| AssemblyScript ASMJS    | 2558            | 10*            |
+| JavaScript              | 1596            | 5*             |
+| Rust WASM               | 1570            | 2              |
 
 ___* unminified___

examples/n-body/build/index.asm.js

@@ -1,6 +1,5 @@
 
 function asmFunc(global, env, buffer) {
- "almost asm";
  var HEAP8 = new global.Int8Array(buffer);
  var HEAP16 = new global.Int16Array(buffer);
  var HEAP32 = new global.Int32Array(buffer);
@@ -24,27 +23,37 @@ function asmFunc(global, env, buffer) {
  var assembly_index_system = 0;
  var $lib_rt_stub_startOffset = 0;
  var $lib_rt_stub_offset = 0;
- function $lib_rt_stub___alloc($0, $1) {
-  var $2 = 0, $3 = 0, $4 = 0, $5 = 0;
-  if ($0 >>> 0 > 1073741808 >>> 0) {
-   abort()
-  }
-  $3 = $lib_rt_stub_offset + 16 | 0;
-  $2 = (($3 + ($0 >>> 0 > 1 >>> 0 ? $0 : 1) | 0) + 15 | 0) & -16 | 0;
-  $4 = __wasm_memory_size();
-  if ($2 >>> 0 > ($4 << 16 | 0) >>> 0) {
-   $5 = ((($2 - $3 | 0) + 65535 | 0) & -65536 | 0) >>> 16 | 0;
-   if ((__wasm_memory_grow((($4 | 0) > ($5 | 0) ? $4 : $5) | 0) | 0) < (0 | 0)) {
-    if ((__wasm_memory_grow($5 | 0) | 0) < (0 | 0)) {
+ function $lib_rt_stub_maybeGrowMemory($0) {
+  var $1 = 0, $2 = 0;
+  $2 = __wasm_memory_size();
+  $1 = $2 << 16 | 0;
+  if ($0 >>> 0 > $1 >>> 0) {
+   $1 = ((($0 - $1 | 0) + 65535 | 0) & -65536 | 0) >>> 16 | 0;
+   if ((__wasm_memory_grow((($2 | 0) > ($1 | 0) ? $2 : $1) | 0) | 0) < (0 | 0)) {
+    if ((__wasm_memory_grow($1 | 0) | 0) < (0 | 0)) {
      abort()
     }
    }
   }
-  $lib_rt_stub_offset = $2;
-  $2 = $3 - 16 | 0;
+  $lib_rt_stub_offset = $0;
+ }
+ 
+ function $lib_rt_stub___alloc($0, $1) {
+  var $2 = 0, $3 = 0, $4 = 0;
+  if ($0 >>> 0 > 1073741808 >>> 0) {
+   abort()
+  }
+  $2 = ($0 + 15 | 0) & -16 | 0;
+  $3 = $2 >>> 0 > 16 >>> 0;
+  $4 = $lib_rt_stub_offset + 16 | 0;
+  $3 = $3 ? $2 : 16;
+  $lib_rt_stub_maybeGrowMemory($4 + $3 | 0);
+  $2 = $4 - 16 | 0;
+  HEAP32[$2 >> 2] = $3;
+  HEAP32[($2 + 4 | 0) >> 2] = 1;
   HEAP32[($2 + 8 | 0) >> 2] = $1;
   HEAP32[($2 + 12 | 0) >> 2] = $0;
-  return $3;
+  return $4;
  }
 
  function assembly_index_NBodySystem_constructor($0) {
@@ -209,7 +218,7 @@ function asmFunc(global, env, buffer) {
   $0 = $0 | 0;
   var $1 = 0;
   loop_0 : while (1) {
-   if (!($1 >>> 0 >= $0 >>> 0)) {
+   if ($1 >>> 0 < $0 >>> 0) {
     assembly_index_NBodySystem_advance(assembly_index_system);
     $1 = $1 + 1 | 0;
     continue loop_0;
@@ -232,10 +241,14 @@ function asmFunc(global, env, buffer) {
 
  function start() {
   $lib_rt_stub_startOffset = 16;
-  $lib_rt_stub_offset = $lib_rt_stub_startOffset;
+  $lib_rt_stub_offset = 16;
  }
 
  var FUNCTION_TABLE = [];
+ function __wasm_memory_size() {
+  return buffer.byteLength / 65536 | 0;
+ }
+ 
  function __wasm_memory_grow(pagesToAdd) {
   pagesToAdd = pagesToAdd | 0;
   var oldPages = __wasm_memory_size() | 0;
@@ -258,10 +271,6 @@ function asmFunc(global, env, buffer) {
   return oldPages;
  }
 
- function __wasm_memory_size() {
-  return buffer.byteLength / 65536 | 0;
- }
- 
  return {
   "memory": Object.create(Object.prototype, {
    "grow": {

examples/n-body/build/optimized.wasm

@@ -1,12 +1,12 @@
 (module
- (type $FUNCSIG$v (func))
- (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
- (type $FUNCSIG$ii (func (param i32) (result i32)))
- (type $FUNCSIG$vi (func (param i32)))
- (type $FUNCSIG$d (func (result f64)))
- (type $FUNCSIG$di (func (param i32) (result f64)))
- (type $FUNCSIG$iddddddd (func (param f64 f64 f64 f64 f64 f64 f64) (result i32)))
- (type $FUNCSIG$i (func (result i32)))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $f64_f64_f64_f64_f64_f64_f64_=>_i32 (func (param f64 f64 f64 f64 f64 f64 f64) (result i32)))
+ (type $none_=>_f64 (func (result f64)))
+ (type $i32_=>_f64 (func (param i32) (result f64)))
  (import "env" "memory" (memory $0 0))
  (global $assembly/index/system (mut i32) (i32.const 0))
  (global $~lib/rt/stub/startOffset (mut i32) (i32.const 0))
@@ -17,7 +17,7 @@
  (export "bench" (func $assembly/index/bench))
  (export "getBody" (func $assembly/index/getBody))
  (start $start)
- (func $~lib/rt/stub/maybeGrowMemory (; 0 ;) (type $FUNCSIG$vi) (param $0 i32)
+ (func $~lib/rt/stub/maybeGrowMemory (; 0 ;) (param $0 i32)
   (local $1 i32)
   (local $2 i32)
   local.get $0
@@ -59,7 +59,7 @@
   local.get $0
   global.set $~lib/rt/stub/offset
  )
- (func $~lib/rt/stub/__alloc (; 1 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/rt/stub/__alloc (; 1 ;) (param $0 i32) (param $1 i32) (result i32)
   (local $2 i32)
   (local $3 i32)
   (local $4 i32)
@@ -94,7 +94,7 @@
   local.get $4
   i32.store
   local.get $2
-  i32.const -1
+  i32.const 1
   i32.store offset=4
   local.get $2
   local.get $1
@@ -104,7 +104,7 @@
   i32.store offset=12
   local.get $3
  )
- (func $assembly/index/NBodySystem#constructor (; 2 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
+ (func $assembly/index/NBodySystem#constructor (; 2 ;) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 f64)
@@ -187,7 +187,7 @@
   i32.store
   local.get $1
  )
- (func $assembly/index/Body#constructor (; 3 ;) (type $FUNCSIG$iddddddd) (param $0 f64) (param $1 f64) (param $2 f64) (param $3 f64) (param $4 f64) (param $5 f64) (param $6 f64) (result i32)
+ (func $assembly/index/Body#constructor (; 3 ;) (param $0 f64) (param $1 f64) (param $2 f64) (param $3 f64) (param $4 f64) (param $5 f64) (param $6 f64) (result i32)
   (local $7 i32)
   i32.const 56
   i32.const 4
@@ -215,7 +215,7 @@
   f64.store offset=48
   local.get $7
  )
- (func $~lib/rt/__allocArray (; 4 ;) (type $FUNCSIG$i) (result i32)
+ (func $~lib/rt/__allocArray (; 4 ;) (result i32)
   (local $0 i32)
   (local $1 i32)
   i32.const 16
@@ -238,7 +238,7 @@
   i32.store offset=12
   local.get $0
  )
- (func $assembly/index/init (; 5 ;) (type $FUNCSIG$v)
+ (func $assembly/index/init (; 5 ;)
   (local $0 i32)
   (local $1 i32)
   call $~lib/rt/__allocArray
@@ -298,7 +298,7 @@
   call $assembly/index/NBodySystem#constructor
   global.set $assembly/index/system
  )
- (func $assembly/index/NBodySystem#advance (; 6 ;) (type $FUNCSIG$vi) (param $0 i32)
+ (func $assembly/index/NBodySystem#advance (; 6 ;) (param $0 i32)
   (local $1 i32)
   (local $2 f64)
   (local $3 i32)
@@ -498,7 +498,7 @@
    end
   end
  )
- (func $assembly/index/NBodySystem#energy (; 7 ;) (type $FUNCSIG$di) (param $0 i32) (result f64)
+ (func $assembly/index/NBodySystem#energy (; 7 ;) (param $0 i32) (result f64)
   (local $1 f64)
   (local $2 i32)
   (local $3 i32)
@@ -626,16 +626,16 @@
   end
   local.get $1
  )
- (func $assembly/index/step (; 8 ;) (type $FUNCSIG$d) (result f64)
+ (func $assembly/index/step (; 8 ;) (result f64)
   global.get $assembly/index/system
   call $assembly/index/NBodySystem#advance
   global.get $assembly/index/system
   call $assembly/index/NBodySystem#energy
  )
- (func $assembly/index/bench (; 9 ;) (type $FUNCSIG$vi) (param $0 i32)
+ (func $assembly/index/bench (; 9 ;) (param $0 i32)
   (local $1 i32)
-  block $break|0
-   loop $loop|0
+  loop $loop|0
+   block $break|0
     local.get $1
     local.get $0
     i32.ge_u
@@ -648,10 +648,9 @@
     local.set $1
     br $loop|0
    end
-   unreachable
   end
  )
- (func $assembly/index/getBody (; 10 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
+ (func $assembly/index/getBody (; 10 ;) (param $0 i32) (result i32)
   (local $1 i32)
   local.get $0
   global.get $assembly/index/system
@@ -671,13 +670,10 @@
    i32.const 0
   end
  )
- (func $start (; 11 ;) (type $FUNCSIG$v)
+ (func $start (; 11 ;)
   i32.const 16
   global.set $~lib/rt/stub/startOffset
   i32.const 16
   global.set $~lib/rt/stub/offset
  )
- (func $null (; 12 ;) (type $FUNCSIG$v)
-  nop
- )
 )