f60132e96a
Design doc: bit.ly/3jEVgzz We separate the internal representation of function references in Wasm from their JSFunction-based (external) representation. This improves performance of call_ref by requiring less indirections to load the context and call target from a function reference. In the boundary between wasm and JS/the C API, we add transformations between the two representations. Detailed changes: - Introduce WasmInternalFunction, containing fields required by call_ref, as well as a reference to the corresponding WasmExternalFunction. Add a reference to the WasmInternalFunction in WasmFunctionData. The {WasmInternalFunction::FromExternal} helper extracts the internal out of an external function. - Change {WasmInstanceObject::external_functions()} to internal functions. - Change wasm function tables to contain internal functions. - Change the following code to use internal functions: - call_ref in liftoff and Turbofan - function type checks in liftoff and Turbofan - CallRefIC and GenericJSToWasmWrapper builtins - {InitExprInterface::RefFunc} - module-compiler.cc in {ProcessTypeFeedback} - In module-instantiate.cc, in function-rtt creation. - Add transformations between internal and external functions in: - WasmWrapperGraphBuilder::{ToJS, BuildUnpackObjectWrapper, FromJS, BuildJSToJSWrapper}. - debug-wasm-objects.cc in {FunctionProxy::Get}, {WasmValueObject::New} and {AddWasmTableObjectInternalProperties}. - runtime-wasm.cc in ReplaceWrapper - the C and JS APIs - module-instantiate.cc, in import and export processing, as well as {InitializeIndirectFunctionTables} - WasmTableObject::{IsValidElement, SetFunctionTableEntry} - {WasmGlobalObject::SetFuncRef} - Simplify body descriptors of WasmExternalFunction variants. - Adjust tests. Bug: v8:11510 Change-Id: I8377f46f55c3771391ae1c5c8201a83854ee7878 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3277878 Reviewed-by: Michael Lippautz <mlippautz@chromium.org> Reviewed-by: Jakob Gruber <jgruber@chromium.org> Reviewed-by: Jakob Kummerow <jkummerow@chromium.org> Commit-Queue: Manos Koukoutos <manoskouk@chromium.org> Cr-Commit-Position: refs/heads/main@{#78068}
146 lines
5.0 KiB
JavaScript
146 lines
5.0 KiB
JavaScript
// Copyright 2020 the V8 project authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
// Flags: --experimental-wasm-typed-funcref
|
|
|
|
d8.file.execute('test/mjsunit/wasm/wasm-module-builder.js');
|
|
|
|
(function TestTables() {
|
|
print(arguments.callee.name);
|
|
var exporting_instance = (function() {
|
|
var builder = new WasmModuleBuilder();
|
|
var binary_type = builder.addType(kSig_i_ii);
|
|
|
|
builder.addFunction('addition', kSig_i_ii)
|
|
.addBody([kExprLocalGet, 0, kExprLocalGet, 1, kExprI32Add])
|
|
.exportFunc();
|
|
|
|
builder.addFunction('succ', kSig_i_i)
|
|
.addBody([kExprLocalGet, 0, kExprI32Const, 1, kExprI32Add])
|
|
.exportFunc();
|
|
|
|
builder.addTable(wasmOptRefType(binary_type), 1, 100).exportAs('table');
|
|
|
|
return builder.instantiate({});
|
|
})();
|
|
|
|
// Wrong type for imported table.
|
|
assertThrows(() => {
|
|
var builder = new WasmModuleBuilder();
|
|
var unary_type = builder.addType(kSig_i_i);
|
|
builder.addImportedTable(
|
|
'imports', 'table', 1, 100, wasmOptRefType(unary_type));
|
|
builder.instantiate({imports: {table: exporting_instance.exports.table}})
|
|
}, WebAssembly.LinkError, /imported table does not match the expected type/)
|
|
|
|
// Type for imported table must match exactly.
|
|
assertThrows(() => {
|
|
var builder = new WasmModuleBuilder();
|
|
builder.addImportedTable('imports', 'table', 1, 100, kWasmFuncRef);
|
|
builder.instantiate({imports: {table: exporting_instance.exports.table}})
|
|
}, WebAssembly.LinkError, /imported table does not match the expected type/)
|
|
|
|
var instance = (function() {
|
|
var builder = new WasmModuleBuilder();
|
|
|
|
var unary_type = builder.addType(kSig_i_i);
|
|
var binary_type = builder.addType(kSig_i_ii);
|
|
|
|
builder.addImportedTable(
|
|
'imports', 'table', 1, 100, wasmOptRefType(binary_type));
|
|
|
|
var table =
|
|
builder.addTable(wasmOptRefType(unary_type), 10).exportAs('table');
|
|
builder.addTable(kWasmFuncRef, 1).exportAs('generic_table');
|
|
|
|
builder
|
|
.addFunction(
|
|
'table_test', makeSig([wasmRefType(unary_type)], [kWasmI32]))
|
|
// Set table[0] to input function, then retrieve it and call it.
|
|
.addBody([
|
|
kExprI32Const, 0, kExprLocalGet, 0, kExprTableSet, table.index,
|
|
kExprI32Const, 42, kExprI32Const, 0, kExprTableGet, table.index,
|
|
kExprCallRef
|
|
])
|
|
.exportFunc();
|
|
|
|
// Same, but with table[1] and call_indirect
|
|
builder
|
|
.addFunction(
|
|
'table_indirect_test',
|
|
makeSig([wasmRefType(unary_type)], [kWasmI32]))
|
|
.addBody([
|
|
kExprI32Const, 1, kExprLocalGet, 0, kExprTableSet, table.index,
|
|
kExprI32Const, 42, kExprI32Const, 0, kExprCallIndirect, unary_type,
|
|
table.index
|
|
])
|
|
.exportFunc();
|
|
|
|
// Instantiate with a table of the correct type.
|
|
return builder.instantiate(
|
|
{imports: {table: exporting_instance.exports.table}});
|
|
})();
|
|
|
|
// This module is valid.
|
|
assertTrue(!!instance);
|
|
|
|
// The correct function reference is preserved when setting it to and getting
|
|
// it back from a table.
|
|
assertEquals(
|
|
43, instance.exports.table_test(exporting_instance.exports.succ));
|
|
// Same for call indirect (the indirect call tables are also set correctly).
|
|
assertEquals(
|
|
43,
|
|
instance.exports.table_indirect_test(exporting_instance.exports.succ));
|
|
|
|
// Setting from JS API respects types.
|
|
instance.exports.generic_table.set(0, exporting_instance.exports.succ);
|
|
instance.exports.table.set(0, exporting_instance.exports.succ);
|
|
assertThrows(
|
|
() => instance.exports.table.set(0, exporting_instance.exports.addition),
|
|
TypeError,
|
|
/Argument 1 must be null or a WebAssembly function of type compatible to/);
|
|
})();
|
|
|
|
(function TestNonNullableTables() {
|
|
print(arguments.callee.name);
|
|
var builder = new WasmModuleBuilder();
|
|
|
|
var binary_type = builder.addType(kSig_i_ii);
|
|
|
|
var addition = builder.addFunction('addition', kSig_i_ii).addBody([
|
|
kExprLocalGet, 0, kExprLocalGet, 1, kExprI32Add
|
|
]);
|
|
var subtraction =
|
|
builder.addFunction('subtraction', kSig_i_ii)
|
|
.addBody([kExprLocalGet, 0, kExprLocalGet, 1, kExprI32Sub])
|
|
.exportFunc();
|
|
|
|
var table = builder.addTable(wasmRefType(binary_type), 3, 3,
|
|
WasmInitExpr.RefFunc(addition.index));
|
|
|
|
builder.addFunction('init', kSig_v_v)
|
|
.addBody([
|
|
kExprI32Const, 1, kExprRefFunc, subtraction.index, kExprTableSet,
|
|
table.index
|
|
])
|
|
.exportFunc();
|
|
|
|
// (index, arg1, arg2) -> table[index](arg1, arg2)
|
|
builder.addFunction('table_test', kSig_i_iii)
|
|
.addBody([
|
|
kExprLocalGet, 1, kExprLocalGet, 2, kExprLocalGet, 0, kExprCallIndirect,
|
|
binary_type, table.index
|
|
])
|
|
.exportFunc();
|
|
|
|
var instance = builder.instantiate({});
|
|
|
|
assertTrue(!!instance);
|
|
|
|
instance.exports.init();
|
|
assertEquals(44, instance.exports.table_test(0, 33, 11));
|
|
assertEquals(22, instance.exports.table_test(1, 33, 11));
|
|
})();
|