-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cherry-pick 50c7aae. rdar://problem/110417987
Fixup air pointer args if they are not valid in BBQ https://bugs.webkit.org/show_bug.cgi?id=251890 rdar://105079565 Reviewed by Mark Lam and Yusuke Suzuki. We are not fixing up air args if their offsets don't fit into the instruction in a few cases. Here are some examples: MoveDouble 28480(%sp), %q16 ; too big MoveVector 248(%sp), %q16 ; not 16-byte aligned Let's fix up these arguments. We also fix a missing validation check when parsing exception tags exposed by this test. * Source/JavaScriptCore/wasm/WasmAirIRGenerator64.cpp: (JSC::Wasm::AirIRGenerator64::addReturn): * Source/JavaScriptCore/wasm/WasmAirIRGeneratorBase.h: (JSC::Wasm::AirIRGeneratorBase::emitPatchpoint): oops Canonical link: https://commits.webkit.org/260038@main Canonical link: https://commits.webkit.org/245886.880@safari-7613.4.1.0-branch
- Loading branch information
Showing
8 changed files
with
282 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
//@ requireOptions("--useWebAssemblySIMD=1") | ||
//@ skip if $architecture != "arm64" && $architecture != "x86_64" | ||
import { instantiate } from "../wabt-wrapper.js" | ||
import * as assert from "../assert.js" | ||
|
||
const N = 10 | ||
|
||
let wat = ` | ||
(module | ||
(tag $t0 (param ` | ||
|
||
for (let i = 0; i < N; ++i) | ||
wat += `v128 ` | ||
|
||
wat += `)) | ||
(func $f0 ` | ||
for (let i = 0; i < 50; ++i) | ||
wat += `(local v128) ` | ||
for (let i = 0; i < N; ++i) | ||
wat += `(local $l${i} v128) ` | ||
|
||
for (let i = 0; i < N; ++i) | ||
wat += `(local.set $l${i} (v128.const i64x2 0 ${i + 5})) ` | ||
|
||
|
||
for (let i = 0; i < N; ++i) | ||
wat += `(local.get $l${i}) ` | ||
|
||
wat += ` | ||
(throw $t0) | ||
) | ||
(func $f1 (export "test") | ||
(try | ||
(do | ||
(call $f0)) | ||
(catch $t0 | ||
(return) | ||
) | ||
) | ||
(unreachable) | ||
(return)) | ||
) | ||
` | ||
|
||
async function test() { | ||
const instance = await instantiate(wat, {}, { simd: true, exceptions: true }) | ||
const { test } = instance.exports | ||
|
||
for (let i = 0; i < 10000; ++i) { | ||
assert.throws(() => test(42), TypeError, "an exported wasm function cannot contain a v128 parameter or return value") | ||
} | ||
} | ||
|
||
assert.asyncTest(test()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
//@ requireOptions("--useWebAssemblySIMD=1") | ||
//@ skip if $architecture != "arm64" && $architecture != "x86_64" | ||
import { instantiate } from "../wabt-wrapper.js" | ||
import * as assert from "../assert.js" | ||
|
||
const N = 1000 | ||
|
||
let wat = ` | ||
(module | ||
(tag $t0 (param ` | ||
|
||
for (let i = 0; i < N; ++i) | ||
wat += `f64 ` | ||
|
||
wat += `)) | ||
(func $f0 ` | ||
for (let i = 0; i < 5000; ++i) | ||
wat += `(local f64) ` | ||
for (let i = 0; i < N; ++i) | ||
wat += `(local $l${i} f64) ` | ||
|
||
for (let i = 0; i < N; ++i) | ||
wat += `(local.set $l${i} (f64.const ${i + 5})) ` | ||
|
||
|
||
for (let i = 0; i < N; ++i) | ||
wat += `(local.get $l${i}) ` | ||
|
||
wat += ` | ||
(throw $t0) | ||
) | ||
(func $f1 (export "test") (result f64) | ||
(try | ||
(do | ||
(call $f0)) | ||
(catch $t0 | ||
` | ||
for (let i = 0; i < N - 2; ++i) | ||
wat += `(drop) ` | ||
|
||
wat += ` | ||
(f64.add) | ||
(return) | ||
) | ||
) | ||
(unreachable) | ||
(return)) | ||
) | ||
` | ||
|
||
async function test() { | ||
const instance = await instantiate(wat, {}, { simd: true, exceptions: true }) | ||
const { test } = instance.exports | ||
|
||
for (let i = 0; i < 10000; ++i) { | ||
assert.eq(test(42), 2*5 + 0 + 1) | ||
} | ||
} | ||
|
||
assert.asyncTest(test()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
//@ requireOptions("--useWebAssemblySIMD=1") | ||
//@ skip if $architecture != "arm64" && $architecture != "x86_64" | ||
import { instantiate } from "../wabt-wrapper.js" | ||
import * as assert from "../assert.js" | ||
|
||
const N = 4095 + 32 | ||
|
||
let wat = ` | ||
(module | ||
(func $f0 (result ` | ||
|
||
for (let i = 0; i < N; ++i) | ||
wat += `f64 ` | ||
|
||
wat += `) (local $l0 f64) ` | ||
|
||
for (let i = 0; i < N; ++i) | ||
wat += `(local.get $l0) ` | ||
|
||
wat += ` | ||
) | ||
(func $f1 (export "test") | ||
(call $f0) | ||
(f64.add) | ||
(return)) | ||
) | ||
` | ||
|
||
async function test() { | ||
const instance = await instantiate(wat, {}, { simd: true }) | ||
const { test } = instance.exports | ||
|
||
for (let i = 0; i < 10000; ++i) { | ||
assert.eq(test(42), undefined) | ||
} | ||
} | ||
|
||
assert.asyncTest(test()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
//@ requireOptions("--useWebAssemblySIMD=1") | ||
//@ skip if $architecture != "arm64" && $architecture != "x86_64" | ||
import { instantiate } from "../wabt-wrapper.js" | ||
import * as assert from "../assert.js" | ||
|
||
const N = 4095 + 32 | ||
|
||
let wat = ` | ||
(module | ||
(func $f0 (result ` | ||
|
||
for (let i = 0; i < N; ++i) | ||
wat += `f64 ` | ||
|
||
wat += `) (local $l0 f64) ` | ||
|
||
for (let i = 0; i < N; ++i) | ||
wat += `(local.get $l0) ` | ||
|
||
wat += ` | ||
) | ||
(func $f1 (export "test") | ||
(call $f0) | ||
(return)) | ||
) | ||
` | ||
|
||
async function test() { | ||
const instance = await instantiate(wat, {}, { simd: true }) | ||
const { test } = instance.exports | ||
|
||
for (let i = 0; i < 10000; ++i) { | ||
assert.eq(test(42), undefined) | ||
} | ||
} | ||
|
||
assert.asyncTest(test()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
//@ requireOptions("--useWebAssemblySIMD=1") | ||
//@ skip if $architecture != "arm64" && $architecture != "x86_64" | ||
import { instantiate } from "../wabt-wrapper.js" | ||
import * as assert from "../assert.js" | ||
|
||
let wat = ` | ||
(module | ||
(func $f0 (result v128 v128 v128 v128 v128 v128 v128 v128 v128 v128 v128 v128 v128 v128 v128 v128 v128 v128 v128 v128 v128 v128 v128) | ||
(local $l0 v128) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
(local.get $l0) | ||
) | ||
(func $f1 (export "test") | ||
(call $f0) | ||
(return)) | ||
) | ||
` | ||
|
||
async function test() { | ||
const instance = await instantiate(wat, {}, { simd: true }) | ||
const { test } = instance.exports | ||
|
||
for (let i = 0; i < 10000; ++i) { | ||
assert.eq(test(42), undefined) | ||
} | ||
} | ||
|
||
assert.asyncTest(test()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
//@ requireOptions("--useWebAssemblySIMD=1") | ||
//@ skip if $architecture != "arm64" && $architecture != "x86_64" | ||
import { instantiate } from "../wabt-wrapper.js" | ||
import * as assert from "../assert.js" | ||
|
||
const N = 15 | ||
|
||
let wat = ` | ||
(module | ||
(tag $t0 (result f32)))` | ||
|
||
async function test() { | ||
await assert.throwsAsync(instantiate(wat, {}, { exceptions: true }), WebAssembly.CompileError, "WebAssembly.Module doesn't parse at byte 20: 0th Exception type cannot have a non-void return type 0 (evaluating 'new WebAssembly.Module(binaryResult.buffer)')") | ||
} | ||
|
||
assert.asyncTest(test()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters