wasm2js: run full optimizations during the pipeline (#2071)

We flatten for the i64 lowering etc. passes, and it is worth optimizing afterwards, to clean up stuff they created. That is run if the user ran wasm2js with an optimization level (like wasm2js -O3).

Split the test files to check both optimized and unoptimized code.

1 files changed, 127 insertions, 0 deletions

diff --git a/test/wasm2js/stack-modified.2asm.js.opt b/test/wasm2js/stack-modified.2asm.js.opt
new file mode 100644
index 000000000..87b18bd9f
--- /dev/null
+++ b/test/wasm2js/stack-modified.2asm.js.opt
@@ -0,0 +1,127 @@
+import { setTempRet0 } from 'env';
+
+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);
+ var HEAPU8 = new global.Uint8Array(buffer);
+ var HEAPU16 = new global.Uint16Array(buffer);
+ var HEAPU32 = new global.Uint32Array(buffer);
+ var HEAPF32 = new global.Float32Array(buffer);
+ var HEAPF64 = new global.Float64Array(buffer);
+ var Math_imul = global.Math.imul;
+ var Math_fround = global.Math.fround;
+ var Math_abs = global.Math.abs;
+ var Math_clz32 = global.Math.clz32;
+ var Math_min = global.Math.min;
+ var Math_max = global.Math.max;
+ var Math_floor = global.Math.floor;
+ var Math_ceil = global.Math.ceil;
+ var Math_sqrt = global.Math.sqrt;
+ var abort = env.abort;
+ var nan = global.NaN;
+ var infinity = global.Infinity;
+ var setTempRet0 = env.setTempRet0;
+ var i64toi32_i32$HIGH_BITS = 0;
+ function $0($0_1, $1) {
+  $0_1 = $0_1 | 0;
+  $1 = $1 | 0;
+  var $2 = 0, $3 = 0, $4 = 0;
+  $2 = $1;
+  $3 = 1;
+  label$2 : while (1) {
+   if ($0_1 | $2) {
+    {
+     $3 = _ZN17compiler_builtins3int3mul3Mul3mul17h070e9a1c69faec5bE($0_1, $2, $3, $4);
+     $4 = i64toi32_i32$HIGH_BITS;
+     $1 = $0_1;
+     $0_1 = $0_1 - 1 | 0;
+     $2 = $2 - ($1 >>> 0 < 1 >>> 0) | 0;
+     continue;
+    }
+   }
+   break;
+  };
+  i64toi32_i32$HIGH_BITS = $4;
+  return $3 | 0;
+ }
+ 
+ function legalstub$0($0_1, $1) {
+  var $2 = 0, $3 = 0, $4 = 0, $5 = 0, $6 = 0;
+  $5 = $0_1;
+  $3 = 32;
+  $0_1 = $3 & 31;
+  if (32 >>> 0 <= $3 >>> 0) {
+   {
+    $2 = $1 << $0_1;
+    $4 = 0;
+   }
+  } else {
+   {
+    $2 = (1 << $0_1) - 1 & $1 >>> 32 - $0_1 | $2 << $0_1;
+    $4 = $1 << $0_1;
+   }
+  }
+  $1 = $0($5 | $4, $2 | $6);
+  $6 = $1;
+  $2 = i64toi32_i32$HIGH_BITS;
+  $0_1 = 32 & 31;
+  setTempRet0((32 >>> 0 <= $3 >>> 0 ? $2 >>> $0_1 : ((1 << $0_1) - 1 & $2) << 32 - $0_1 | $1 >>> $0_1) | 0);
+  return $1;
+ }
+ 
+ function _ZN17compiler_builtins3int3mul3Mul3mul17h070e9a1c69faec5bE($0_1, $1, $2, $3) {
+  var $4 = 0, $5 = 0, $6 = 0, $7 = 0, $8 = 0, $9 = 0, $10 = 0, $11 = 0, $12 = 0;
+  $4 = $2 >>> 16;
+  $5 = $0_1 >>> 16;
+  $7 = Math_imul($4, $5);
+  $8 = $2 & 65535;
+  $6 = $0_1 & 65535;
+  $9 = Math_imul($8, $6);
+  $5 = ($9 >>> 16) + Math_imul($5, $8) | 0;
+  $4 = ($5 & 65535) + Math_imul($4, $6) | 0;
+  $8 = 0;
+  $11 = $7;
+  $6 = $0_1;
+  $7 = 32;
+  $0_1 = $7 & 31;
+  $12 = $11 + Math_imul(32 >>> 0 <= $7 >>> 0 ? $1 >>> $0_1 : ((1 << $0_1) - 1 & $1) << 32 - $0_1 | $6 >>> $0_1, $2) | 0;
+  $1 = $2;
+  $2 = 32;
+  $0_1 = $2 & 31;
+  $1 = (($12 + Math_imul($6, 32 >>> 0 <= $2 >>> 0 ? $3 >>> $0_1 : ((1 << $0_1) - 1 & $3) << 32 - $0_1 | $1 >>> $0_1) | 0) + ($5 >>> 16) | 0) + ($4 >>> 16) | 0;
+  $0_1 = 32 & 31;
+  if (32 >>> 0 <= $2 >>> 0) {
+   {
+    $2 = $1 << $0_1;
+    $10 = 0;
+   }
+  } else {
+   {
+    $2 = (1 << $0_1) - 1 & $1 >>> 32 - $0_1 | $8 << $0_1;
+    $10 = $1 << $0_1;
+   }
+  }
+  $0_1 = $10 | ($9 & 65535 | $4 << 16);
+  i64toi32_i32$HIGH_BITS = $2;
+  return $0_1;
+ }
+ 
+ var FUNCTION_TABLE = [];
+ return {
+  "fac_expr": legalstub$0, 
+  "fac_stack": legalstub$0, 
+  "fac_stack_raw": legalstub$0, 
+  "fac_mixed": legalstub$0, 
+  "fac_mixed_raw": legalstub$0
+ };
+}
+
+var memasmFunc = new ArrayBuffer(65536);
+var retasmFunc = asmFunc({Math,Int8Array,Uint8Array,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array,NaN,Infinity}, {abort:function() { throw new Error('abort'); },setTempRet0},memasmFunc);
+export var fac_expr = retasmFunc.fac_expr;
+export var fac_stack = retasmFunc.fac_stack;
+export var fac_stack_raw = retasmFunc.fac_stack_raw;
+export var fac_mixed = retasmFunc.fac_mixed;
+export var fac_mixed_raw = retasmFunc.fac_mixed_raw;