-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge pull request #4479 from Cellule:wasm/signature Follow-up after #4200. Re-enable Wasm short signature check. Use more constant variables with names to better document the intend of WasmSignature::FinalizeSignature. Add test to check various types of signatures
- Loading branch information
Showing
4 changed files
with
159 additions
and
12 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
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
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,118 @@ | ||
| //------------------------------------------------------------------------------------------------------- | ||
| // Copyright (C) Microsoft Corporation and contributors. All rights reserved. | ||
| // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information. | ||
| //------------------------------------------------------------------------------------------------------- | ||
|
|
||
| WScript.Flag("-wasmI64"); | ||
| WScript.LoadScriptFile("../UnitTestFramework/UnitTestFramework.js"); | ||
|
|
||
| const types = { | ||
| i32: {param: "i32", result: "(result i32)", body: "i32.const 1"}, | ||
| i64: {param: "i64", result: "(result i64)", body: "i64.const 1"}, | ||
| f32: {param: "f32", result: "(result f32)", body: "f32.const 1"}, | ||
| f64: {param: "f64", result: "(result f64)", body: "f64.const 1"}, | ||
| void: {param: "", result: "", body: ""}, | ||
| }; | ||
|
|
||
| function* paramTypes() { | ||
| while (true) { | ||
| yield types.i32; | ||
| yield types.i64; | ||
| yield types.i32; | ||
| yield types.f32; | ||
| yield types.i32; | ||
| yield types.f64; | ||
| } | ||
| } | ||
|
|
||
| class Signature { | ||
| constructor(id, resType) { | ||
| this.id = id; | ||
| this.params = []; | ||
| this.result = types[resType]; | ||
| } | ||
| addParam(type) { | ||
| this.params.push(type); | ||
| } | ||
| toWat() { | ||
| // Types for the custom functions | ||
| return `(type $t${this.id} (func (param ${this.params.map(t => t.param).join(" ")}) ${this.result.result}))`; | ||
| } | ||
| makeCallwat() { | ||
| // Type of the call to the custom functions (first param is the index in the table) | ||
| return `(type $callt${this.id} (func (param i32 ${this.params.map(t => t.param).join(" ")}) ${this.result.result}))`; | ||
| } | ||
| } | ||
|
|
||
| const signatures = []; | ||
| const nArgumentsToTest = [0, 1, 2, 3, 10, 25, 50, 200]; | ||
| for (const resType in types) { | ||
| for (const nArgs of nArgumentsToTest) { | ||
| const gen = paramTypes(); | ||
| const sigId = signatures.length; | ||
| const signature = new Signature(sigId, resType); | ||
| for (let j = 0; j < nArgs; ++j) { | ||
| signature.addParam(gen.next().value); | ||
| } | ||
| signatures.push(signature); | ||
| } | ||
| } | ||
|
|
||
| const moduleText = ` | ||
| (module | ||
| ${signatures.map(sig => sig.toWat()).join("\n ")} | ||
| ${signatures.map(sig => sig.makeCallwat()).join("\n ")} | ||
| (table ${signatures.length} anyfunc) | ||
| ;; Add custom functions to the table | ||
| (elem (i32.const 0) | ||
| ${signatures.map(sig => `$f${sig.id}`).join(" ")} | ||
| ) | ||
| ;; Functions to put in the table | ||
| ${signatures.map(sig => ` | ||
| (func $f${sig.id} (type $t${sig.id}) ${sig.result.body})` | ||
| ).join("")} | ||
| ;; Functions to call from the table | ||
| ${signatures.map(sig => ` | ||
| (func (export "call${sig.id}") (type $callt${sig.id}) | ||
| ${sig.params.map((_, iParam) => `(get_local ${iParam + 1})`).join(" ")} | ||
| (call_indirect $t${sig.id} (get_local 0)) | ||
| )` | ||
| ).join("")} | ||
| )`; | ||
|
|
||
| const mod = new WebAssembly.Module(WebAssembly.wabt.convertWast2Wasm(moduleText)); | ||
| const ex = new WebAssembly.Instance(mod).exports; | ||
|
|
||
| const tests = signatures.map(sig => ({ | ||
| name: `Signature $t${sig.id}`, | ||
| body() { | ||
| if (argv.verbose) { | ||
| console.log(`signature wat: ${sig.toWat()}`); | ||
| } | ||
| assert.doesNotThrow(() => ex[`call${sig.id}`](sig.id), `Calling signature ${sig.id} should not throw`); | ||
| for (let j = 0; j < signatures.length; ++j) { | ||
| if (j !== sig.id) { | ||
| assert.throws(() => ex[`call${j}`](sig.id), WebAssembly.RuntimeError, `Expected signature mismatch between\n${sig.toWat()}\n${signatures[j].toWat()}`, "Function called with invalid signature"); | ||
| } | ||
| } | ||
| } | ||
| })); | ||
|
|
||
| WScript.LoadScriptFile("../UnitTestFramework/yargs.js"); | ||
| const argv = yargsParse(WScript.Arguments, { | ||
| boolean: ["verbose"], | ||
| number: ["start", "end"], | ||
| default: { | ||
| verbose: true, | ||
| start: 0, | ||
| end: tests.length | ||
| } | ||
| }).argv; | ||
|
|
||
| const todoTests = tests | ||
| .slice(argv.start, argv.end); | ||
|
|
||
| testRunner.run(todoTests, {verbose: argv.verbose}); |