wasm2asm: Add math aliases for floor, ceil and sqrt (WebAssembly#1549)

dcodeIO · kripken · commit 689ca6b29a13 · 2018-05-14T11:51:35.000-07:00
diff --git a/bin/binaryen.js b/bin/binaryen.js
diff --git a/bin/wasm.js b/bin/wasm.js
diff --git a/src/wasm2asm.h b/src/wasm2asm.h
@@ -475,6 +475,9 @@ void Wasm2AsmBuilder::addBasics(Ref ast) {
   addMath(MATH_CLZ32, CLZ32);
   addMath(MATH_MIN, MIN);
   addMath(MATH_MAX, MAX);
+  addMath(MATH_FLOOR, FLOOR);
+  addMath(MATH_CEIL, CEIL);
+  addMath(MATH_SQRT, SQRT);
 }
 
 void Wasm2AsmBuilder::addImport(Ref ast, Import* import) {
diff --git a/test/binaryen.js/emit_asmjs.js.txt b/test/binaryen.js/emit_asmjs.js.txt
@@ -14,6 +14,9 @@ function asmFunc(global, env, buffer) {
  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 i64toi32_i32$HIGH_BITS = 0;
  function main($0) {
   $0 = $0 | 0;
diff --git a/test/wasm2asm.asserts.js b/test/wasm2asm.asserts.js
@@ -14,6 +14,9 @@ function asmFunc(global, env, buffer) {
  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 i64toi32_i32$HIGH_BITS = 0;
  function $0() {
   
diff --git a/test/wasm2asm.traps.js b/test/wasm2asm.traps.js
@@ -14,6 +14,9 @@ function asmFunc(global, env, buffer) {
  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 i64toi32_i32$HIGH_BITS = 0;
  function $0() {
   
diff --git a/test/wasm2asm/address.2asm.js b/test/wasm2asm/address.2asm.js
@@ -14,6 +14,9 @@ function asmFunc(global, env, buffer) {
  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 print = env.print;
  var i64toi32_i32$HIGH_BITS = 0;
  function $0(i) {
diff --git a/test/wasm2asm/br_table_temp.2asm.js b/test/wasm2asm/br_table_temp.2asm.js
@@ -14,6 +14,9 @@ function asmFunc(global, env, buffer) {
  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 i64toi32_i32$HIGH_BITS = 0;
  function dummy() {
   
diff --git a/test/wasm2asm/empty_imported_table.2asm.js b/test/wasm2asm/empty_imported_table.2asm.js
@@ -14,6 +14,9 @@ function asmFunc(global, env, buffer) {
  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 import$table$0 = env.table;
  var i64toi32_i32$HIGH_BITS = 0;
  function __wasm_ctz_i32(x) {
diff --git a/test/wasm2asm/empty_table.2asm.js b/test/wasm2asm/empty_table.2asm.js
@@ -14,6 +14,9 @@ function asmFunc(global, env, buffer) {
  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 i64toi32_i32$HIGH_BITS = 0;
  function __wasm_ctz_i32(x) {
   x = x | 0;
diff --git a/test/wasm2asm/float-ops.2asm.js b/test/wasm2asm/float-ops.2asm.js
@@ -14,6 +14,9 @@ function asmFunc(global, env, buffer) {
  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 i64toi32_i32$HIGH_BITS = 0;
  function dummy() {
   
@@ -173,6 +176,36 @@ function asmFunc(global, env, buffer) {
   return Math_fround(Math_fround($0));
  }
  
+ function $27($0) {
+  $0 = Math_fround($0);
+  return Math_fround(Math_fround(Math_floor($0)));
+ }
+ 
+ function $28($0) {
+  $0 = Math_fround($0);
+  return Math_fround(Math_fround(Math_ceil($0)));
+ }
+ 
+ function $29($0) {
+  $0 = +$0;
+  return +Math_floor($0);
+ }
+ 
+ function $30($0) {
+  $0 = +$0;
+  return +Math_ceil($0);
+ }
+ 
+ function $31($0) {
+  $0 = Math_fround($0);
+  return Math_fround(Math_fround(Math_sqrt($0)));
+ }
+ 
+ function $32($0) {
+  $0 = +$0;
+  return +Math_sqrt($0);
+ }
+ 
  function __wasm_ctz_i32(x) {
   x = x | 0;
   var $1 = 0;
@@ -235,7 +268,13 @@ function asmFunc(global, env, buffer) {
   f64_min: $23, 
   f64_max: $24, 
   f64_promote: $25, 
-  f32_demote: $26
+  f32_demote: $26, 
+  f32_floor: $27, 
+  f32_ceil: $28, 
+  f64_floor: $29, 
+  f64_ceil: $30, 
+  f32_sqrt: $31, 
+  f64_sqrt: $32
  };
 }
 
diff --git a/test/wasm2asm/float-ops.wast b/test/wasm2asm/float-ops.wast
@@ -81,4 +81,24 @@
 
   (func (export "f32.demote") (param $0 f64) (result f32)
     (f32.demote/f64 (get_local $0)))
+
+  ;; floor/ceil
+  (func (export "f32.floor") (param $0 f32) (result f32)
+    (f32.floor (get_local $0)))
+
+  (func (export "f32.ceil") (param $0 f32) (result f32)
+    (f32.ceil (get_local $0)))
+
+  (func (export "f64.floor") (param $0 f64) (result f64)
+    (f64.floor (get_local $0)))
+
+  (func (export "f64.ceil") (param $0 f64) (result f64)
+    (f64.ceil (get_local $0)))
+
+  ;; sqrt
+  (func (export "f32.sqrt") (param $0 f32) (result f32)
+    (f32.sqrt (get_local $0)))
+
+  (func (export "f64.sqrt") (param $0 f64) (result f64)
+    (f64.sqrt (get_local $0)))
 )
diff --git a/test/wasm2asm/forward.2asm.js b/test/wasm2asm/forward.2asm.js
@@ -14,6 +14,9 @@ function asmFunc(global, env, buffer) {
  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 i64toi32_i32$HIGH_BITS = 0;
  function even(n) {
   n = n | 0;
diff --git a/test/wasm2asm/get-set-local.2asm.js b/test/wasm2asm/get-set-local.2asm.js
@@ -14,6 +14,9 @@ function asmFunc(global, env, buffer) {
  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 i64toi32_i32$HIGH_BITS = 0;
  function dummy() {
   
diff --git a/test/wasm2asm/grow_memory.2asm.js b/test/wasm2asm/grow_memory.2asm.js
@@ -14,6 +14,9 @@ function asmFunc(global, env, buffer) {
  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 i64toi32_i32$HIGH_BITS = 0;
  function $0(var$0) {
   var$0 = var$0 | 0;
diff --git a/test/wasm2asm/hello_world.2asm.js b/test/wasm2asm/hello_world.2asm.js
@@ -14,6 +14,9 @@ function asmFunc(global, env, buffer) {
  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 i64toi32_i32$HIGH_BITS = 0;
  function add(x, y) {
   x = x | 0;
diff --git a/test/wasm2asm/i32.2asm.js b/test/wasm2asm/i32.2asm.js
@@ -14,6 +14,9 @@ function asmFunc(global, env, buffer) {
  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 i64toi32_i32$HIGH_BITS = 0;
  function $0(x, y) {
   x = x | 0;
diff --git a/test/wasm2asm/i64-add-sub.2asm.js b/test/wasm2asm/i64-add-sub.2asm.js
@@ -14,6 +14,9 @@ function asmFunc(global, env, buffer) {
  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 i64toi32_i32$HIGH_BITS = 0;
  function dummy() {
   
diff --git a/test/wasm2asm/i64-lowering.2asm.js b/test/wasm2asm/i64-lowering.2asm.js
@@ -14,6 +14,9 @@ function asmFunc(global, env, buffer) {
  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 i64toi32_i32$HIGH_BITS = 0;
  function dummy() {
   
diff --git a/test/wasm2asm/i64-shifts.2asm.js b/test/wasm2asm/i64-shifts.2asm.js
@@ -14,6 +14,9 @@ function asmFunc(global, env, buffer) {
  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 i64toi32_i32$HIGH_BITS = 0;
  function dummy() {
   
diff --git a/test/wasm2asm/reinterpret.2asm.js b/test/wasm2asm/reinterpret.2asm.js
@@ -14,6 +14,9 @@ function asmFunc(global, env, buffer) {
  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 i64toi32_i32$HIGH_BITS = 0;
  function dummy() {
   
diff --git a/test/wasm2asm/unary-ops.2asm.js b/test/wasm2asm/unary-ops.2asm.js
@@ -14,6 +14,9 @@ function asmFunc(global, env, buffer) {
  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 i64toi32_i32$HIGH_BITS = 0;
  function dummy() {
   

Original file line number	Diff line number	Diff line change
`@@ -475,6 +475,9 @@ void Wasm2AsmBuilder::addBasics(Ref ast) {`
`475`	`475`	`addMath(MATH_CLZ32, CLZ32);`
`476`	`476`	`addMath(MATH_MIN, MIN);`
`477`	`477`	`addMath(MATH_MAX, MAX);`
	`478`	`+ addMath(MATH_FLOOR, FLOOR);`
	`479`	`+ addMath(MATH_CEIL, CEIL);`
	`480`	`+ addMath(MATH_SQRT, SQRT);`
`478`	`481`	`}`
`479`	`482`
`480`	`483`	`void Wasm2AsmBuilder::addImport(Ref ast, Import* import) {`