diff options
author | Alon Zakai <azakai@google.com> | 2020-06-23 18:43:08 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-23 18:43:08 -0700 |
commit | df660c241dcde92d634bb0704a449c8e1b4dd5a4 (patch) | |
tree | c12a1b4633dbd5194d11d4fda77e22b92655a431 /test/wasm2js | |
parent | 8540db83abf2044bbabb85e293e5b98a4bb4b9a8 (diff) | |
download | binaryen-df660c241dcde92d634bb0704a449c8e1b4dd5a4.tar.gz binaryen-df660c241dcde92d634bb0704a449c8e1b4dd5a4.tar.bz2 binaryen-df660c241dcde92d634bb0704a449c8e1b4dd5a4.zip |
Wasm2js Atomics support (#2924)
Atomic loads, stores, RMW, cmpXchg, wait, and notify. This is enough
to get the asm.js atomics tests in the emscripten test suite to pass, at least
(but they are a subset of the entire pthreads suite).
Diffstat (limited to 'test/wasm2js')
-rw-r--r-- | test/wasm2js/atomics_32.2asm.js | 156 | ||||
-rw-r--r-- | test/wasm2js/atomics_32.2asm.js.opt | 152 | ||||
-rw-r--r-- | test/wasm2js/atomics_32.wast | 31 |
3 files changed, 339 insertions, 0 deletions
diff --git a/test/wasm2js/atomics_32.2asm.js b/test/wasm2js/atomics_32.2asm.js new file mode 100644 index 000000000..21f280e4b --- /dev/null +++ b/test/wasm2js/atomics_32.2asm.js @@ -0,0 +1,156 @@ + + + var scratchBuffer = new ArrayBuffer(8); + var i32ScratchView = new Int32Array(scratchBuffer); + var f32ScratchView = new Float32Array(scratchBuffer); + var f64ScratchView = new Float64Array(scratchBuffer); + + function wasm2js_atomic_wait_i32(ptr, expected, timeoutLow, timeoutHigh) { + if (timeoutLow != -1 || timeoutHigh != -1) throw 'unsupported timeout'; + var view = new Int32Array(bufferView.buffer); // TODO cache + var result = Atomics.wait(view, ptr, expected); + if (result == 'ok') return 0; + if (result == 'not-equal') return 1; + if (result == 'timed-out') return 2; + throw 'bad result ' + result; + } + + function wasm2js_atomic_rmw_i64(op, bytes, offset, ptr, valueLow, valueHigh) { + assert(bytes == 8); // TODO: support 1, 2, 4 as well + var view = new BigInt64Array(bufferView.buffer); // TODO cache + ptr = (ptr + offset) >> 3; + var value = BigInt(valueLow >>> 0) | (BigInt(valueHigh >>> 0) << BigInt(32)); + var result; + switch (op) { + case 0: { // Add + result = Atomics.add(view, ptr, value); + break; + } + case 1: { // Sub + result = Atomics.sub(view, ptr, value); + break; + } + case 2: { // And + result = Atomics.and(view, ptr, value); + break; + } + case 3: { // Or + result = Atomics.or(view, ptr, value); + break; + } + case 4: { // Xor + result = Atomics.xor(view, ptr, value); + break; + } + case 5: { // Xchg + result = Atomics.exchange(view, ptr, value); + break; + } + default: throw 'bad op'; + } + var low = Number(result & BigInt(0xffffffff)) | 0; + var high = Number((result >> BigInt(32)) & BigInt(0xffffffff)) | 0; + stashedBits = high; + return low; + } + + var stashedBits = 0; + + function wasm2js_get_stashed_bits() { + return stashedBits; + } + + function wasm2js_memory_init(segment, dest, offset, size) { + // TODO: traps on invalid things + bufferView.set(memorySegments[segment].subarray(offset, offset + size), dest); + } + + var memorySegments = {}; + +function asmFunc(global, env, buffer) { + 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; + function $0() { + var i64toi32_i32$0 = 0, i64toi32_i32$2 = 0, i64toi32_i32$1 = 0; + Atomics.compareExchange(HEAP8, 1024, 1, 2) | 0; + Atomics.compareExchange(HEAP16, 1024 >> 1, 1, 2) | 0; + Atomics.compareExchange(HEAP32, 1024 >> 2, 1, 2) | 0; + Atomics.load(HEAPU8, 1028 >> 0) | 0; + Atomics.load(HEAPU16, 1028 >> 1) | 0; + Atomics.load(HEAP32, 1028 >> 2) | 0; + Atomics.store(HEAP32, 100 >> 2, 200); + i64toi32_i32$0 = -1; + wasm2js_atomic_wait_i32(4 | 0, 8 | 0, -1 | 0, i64toi32_i32$0 | 0) | 0; + wasm2js_memory_init(0, 512, 0, 4); + wasm2js_memory_init(1, 1024, 4, 2); + Atomics.notify(HEAP32, 4 >> 2, 2); + Atomics.notify(HEAP32, (4 + 20 | 0) >> 2, 2); + Atomics.add(HEAP32, 8 >> 2, 12); + Atomics.sub(HEAP32, 8 >> 2, 12); + Atomics.and(HEAP32, 8 >> 2, 12); + Atomics.or(HEAP32, 8 >> 2, 12); + Atomics.xor(HEAP32, 8 >> 2, 12); + Atomics.exchange(HEAP32, 8 >> 2, 12); + Atomics.add(HEAP8, 8, 12); + Atomics.sub(HEAP16, 8 >> 1, 12); + i64toi32_i32$0 = 0; + i64toi32_i32$1 = wasm2js_atomic_rmw_i64(0 | 0, 8 | 0, 0 | 0, 8 | 0, 16 | 0, i64toi32_i32$0 | 0) | 0; + i64toi32_i32$2 = wasm2js_get_stashed_bits() | 0; + i64toi32_i32$2 = -1; + i64toi32_i32$1 = wasm2js_atomic_rmw_i64(4 | 0, 8 | 0, 32 | 0, 8 | 0, -1 | 0, i64toi32_i32$2 | 0) | 0; + i64toi32_i32$0 = wasm2js_get_stashed_bits() | 0; + } + + var FUNCTION_TABLE = []; + function __wasm_memory_size() { + return buffer.byteLength / 65536 | 0; + } + + return { + "test": $0 + }; +} + +var memasmFunc = new ArrayBuffer(16777216); +var bufferView = new Uint8Array(memasmFunc); +for (var base64ReverseLookup = new Uint8Array(123/*'z'+1*/), i = 25; i >= 0; --i) { + base64ReverseLookup[48+i] = 52+i; // '0-9' + base64ReverseLookup[65+i] = i; // 'A-Z' + base64ReverseLookup[97+i] = 26+i; // 'a-z' + } + base64ReverseLookup[43] = 62; // '+' + base64ReverseLookup[47] = 63; // '/' + /** @noinline Inlining this function would mean expanding the base64 string 4x times in the source code, which Closure seems to be happy to do. */ + function base64DecodeToExistingUint8Array(uint8Array, offset, b64) { + var b1, b2, i = 0, j = offset, bLength = b64.length, end = offset + (bLength*3>>2) - (b64[bLength-2] == '=') - (b64[bLength-1] == '='); + for (; i < bLength; i += 4) { + b1 = base64ReverseLookup[b64.charCodeAt(i+1)]; + b2 = base64ReverseLookup[b64.charCodeAt(i+2)]; + uint8Array[j++] = base64ReverseLookup[b64.charCodeAt(i)] << 2 | b1 >> 4; + if (j < end) uint8Array[j++] = b1 << 4 | b2 >> 2; + if (j < end) uint8Array[j++] = b2 << 6 | base64ReverseLookup[b64.charCodeAt(i+3)]; + } + return uint8Array; + } + memorySegments[0] = base64DecodeToExistingUint8Array(new Uint8Array(6), 0, "aGVsbG8s"); +memorySegments[1] = base64DecodeToExistingUint8Array(new Uint8Array(6), 0, "d29ybGQh"); +var retasmFunc = asmFunc({Math,Int8Array,Uint8Array,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array,NaN,Infinity}, {abort:function() { throw new Error('abort'); }},memasmFunc); +export var test = retasmFunc.test; diff --git a/test/wasm2js/atomics_32.2asm.js.opt b/test/wasm2js/atomics_32.2asm.js.opt new file mode 100644 index 000000000..f662c0ad2 --- /dev/null +++ b/test/wasm2js/atomics_32.2asm.js.opt @@ -0,0 +1,152 @@ + + + var scratchBuffer = new ArrayBuffer(8); + var i32ScratchView = new Int32Array(scratchBuffer); + var f32ScratchView = new Float32Array(scratchBuffer); + var f64ScratchView = new Float64Array(scratchBuffer); + + function wasm2js_atomic_wait_i32(ptr, expected, timeoutLow, timeoutHigh) { + if (timeoutLow != -1 || timeoutHigh != -1) throw 'unsupported timeout'; + var view = new Int32Array(bufferView.buffer); // TODO cache + var result = Atomics.wait(view, ptr, expected); + if (result == 'ok') return 0; + if (result == 'not-equal') return 1; + if (result == 'timed-out') return 2; + throw 'bad result ' + result; + } + + function wasm2js_atomic_rmw_i64(op, bytes, offset, ptr, valueLow, valueHigh) { + assert(bytes == 8); // TODO: support 1, 2, 4 as well + var view = new BigInt64Array(bufferView.buffer); // TODO cache + ptr = (ptr + offset) >> 3; + var value = BigInt(valueLow >>> 0) | (BigInt(valueHigh >>> 0) << BigInt(32)); + var result; + switch (op) { + case 0: { // Add + result = Atomics.add(view, ptr, value); + break; + } + case 1: { // Sub + result = Atomics.sub(view, ptr, value); + break; + } + case 2: { // And + result = Atomics.and(view, ptr, value); + break; + } + case 3: { // Or + result = Atomics.or(view, ptr, value); + break; + } + case 4: { // Xor + result = Atomics.xor(view, ptr, value); + break; + } + case 5: { // Xchg + result = Atomics.exchange(view, ptr, value); + break; + } + default: throw 'bad op'; + } + var low = Number(result & BigInt(0xffffffff)) | 0; + var high = Number((result >> BigInt(32)) & BigInt(0xffffffff)) | 0; + stashedBits = high; + return low; + } + + var stashedBits = 0; + + function wasm2js_get_stashed_bits() { + return stashedBits; + } + + function wasm2js_memory_init(segment, dest, offset, size) { + // TODO: traps on invalid things + bufferView.set(memorySegments[segment].subarray(offset, offset + size), dest); + } + + var memorySegments = {}; + +function asmFunc(global, env, buffer) { + 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; + function $0() { + Atomics.compareExchange(HEAP8, 1024, 1, 2) | 0; + Atomics.compareExchange(HEAP16, 512, 1, 2) | 0; + Atomics.compareExchange(HEAP32, 256, 1, 2) | 0; + Atomics.load(HEAPU8, 1028); + Atomics.load(HEAPU16, 514); + Atomics.load(HEAP32, 257); + Atomics.store(HEAP32, 25, 200); + wasm2js_atomic_wait_i32(4, 8, -1, -1) | 0; + wasm2js_memory_init(0, 512, 0, 4); + wasm2js_memory_init(1, 1024, 4, 2); + Atomics.notify(HEAP32, 1, 2); + Atomics.notify(HEAP32, 4 + 20 >> 2, 2); + Atomics.add(HEAP32, 2, 12); + Atomics.sub(HEAP32, 2, 12); + Atomics.and(HEAP32, 2, 12); + Atomics.or(HEAP32, 2, 12); + Atomics.xor(HEAP32, 2, 12); + Atomics.exchange(HEAP32, 2, 12); + Atomics.add(HEAP8, 8, 12); + Atomics.sub(HEAP16, 4, 12); + wasm2js_atomic_rmw_i64(0, 8, 0, 8, 16, 0) | 0; + wasm2js_get_stashed_bits() | 0; + wasm2js_atomic_rmw_i64(4, 8, 32, 8, -1, -1) | 0; + wasm2js_get_stashed_bits() | 0; + } + + var FUNCTION_TABLE = []; + function __wasm_memory_size() { + return buffer.byteLength / 65536 | 0; + } + + return { + "test": $0 + }; +} + +var memasmFunc = new ArrayBuffer(16777216); +var bufferView = new Uint8Array(memasmFunc); +for (var base64ReverseLookup = new Uint8Array(123/*'z'+1*/), i = 25; i >= 0; --i) { + base64ReverseLookup[48+i] = 52+i; // '0-9' + base64ReverseLookup[65+i] = i; // 'A-Z' + base64ReverseLookup[97+i] = 26+i; // 'a-z' + } + base64ReverseLookup[43] = 62; // '+' + base64ReverseLookup[47] = 63; // '/' + /** @noinline Inlining this function would mean expanding the base64 string 4x times in the source code, which Closure seems to be happy to do. */ + function base64DecodeToExistingUint8Array(uint8Array, offset, b64) { + var b1, b2, i = 0, j = offset, bLength = b64.length, end = offset + (bLength*3>>2) - (b64[bLength-2] == '=') - (b64[bLength-1] == '='); + for (; i < bLength; i += 4) { + b1 = base64ReverseLookup[b64.charCodeAt(i+1)]; + b2 = base64ReverseLookup[b64.charCodeAt(i+2)]; + uint8Array[j++] = base64ReverseLookup[b64.charCodeAt(i)] << 2 | b1 >> 4; + if (j < end) uint8Array[j++] = b1 << 4 | b2 >> 2; + if (j < end) uint8Array[j++] = b2 << 6 | base64ReverseLookup[b64.charCodeAt(i+3)]; + } + return uint8Array; + } + memorySegments[0] = base64DecodeToExistingUint8Array(new Uint8Array(6), 0, "aGVsbG8s"); +memorySegments[1] = base64DecodeToExistingUint8Array(new Uint8Array(6), 0, "d29ybGQh"); +var retasmFunc = asmFunc({Math,Int8Array,Uint8Array,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array,NaN,Infinity}, {abort:function() { throw new Error('abort'); }},memasmFunc); +export var test = retasmFunc.test; diff --git a/test/wasm2js/atomics_32.wast b/test/wasm2js/atomics_32.wast new file mode 100644 index 000000000..2c7ba9a44 --- /dev/null +++ b/test/wasm2js/atomics_32.wast @@ -0,0 +1,31 @@ +(module + (memory (shared 256 256)) + (data passive "hello,") + (data passive "world!") + (func "test" + (local $x i32) + (local $y i64) + (local.set $x (i32.atomic.rmw8.cmpxchg_u (i32.const 1024) (i32.const 1) (i32.const 2))) + (local.set $x (i32.atomic.rmw16.cmpxchg_u (i32.const 1024) (i32.const 1) (i32.const 2))) + (local.set $x (i32.atomic.rmw.cmpxchg (i32.const 1024) (i32.const 1) (i32.const 2))) + (local.set $x (i32.atomic.load8_u (i32.const 1028))) + (local.set $x (i32.atomic.load16_u (i32.const 1028))) + (local.set $x (i32.atomic.load (i32.const 1028))) + (i32.atomic.store (i32.const 100) (i32.const 200)) + (local.set $x (i32.atomic.wait (i32.const 4) (i32.const 8) (i64.const -1))) + (memory.init 0 (i32.const 512) (i32.const 0) (i32.const 4)) + (memory.init 1 (i32.const 1024) (i32.const 4) (i32.const 2)) + (local.set $x (atomic.notify (i32.const 4) (i32.const 2))) + (local.set $x (atomic.notify offset=20 (i32.const 4) (i32.const 2))) + (local.set $x (i32.atomic.rmw.add (i32.const 8) (i32.const 12))) + (local.set $x (i32.atomic.rmw.sub (i32.const 8) (i32.const 12))) + (local.set $x (i32.atomic.rmw.and (i32.const 8) (i32.const 12))) + (local.set $x (i32.atomic.rmw.or (i32.const 8) (i32.const 12))) + (local.set $x (i32.atomic.rmw.xor (i32.const 8) (i32.const 12))) + (local.set $x (i32.atomic.rmw.xchg (i32.const 8) (i32.const 12))) + (local.set $x (i32.atomic.rmw8.add_u (i32.const 8) (i32.const 12))) + (local.set $x (i32.atomic.rmw16.sub_u (i32.const 8) (i32.const 12))) + (local.set $y (i64.atomic.rmw.add (i32.const 8) (i64.const 16))) + (local.set $y (i64.atomic.rmw.xor offset=32 (i32.const 8) (i64.const -1))) + ) +) |