6cd7a5a73a
The WasmContext struct introduced in this CL is used to store the mem_size and mem_start address of the wasm memory. These variables can be accessed at C++ level at graph build time (e.g., initialized during instance building). When the GrowMemory runtime is invoked, the context variables can be changed in the WasmContext at C++ level so that the generated code will load the correct values. This requires to insert a relocatable pointer only in the JSToWasmWrapper (and in the other wasm entry points), the value is then passed from function to function as an automatically added additional parameter. The WasmContext is then dropped when creating an Interpreter Entry or when invoking a JavaScript function. This removes the need of patching the generated code at runtime (i.e., when the memory grows) with respect to WASM_MEMORY_REFERENCE and WASM_MEMORY_SIZE_REFERENCE. However, we still need to patch the code at instance build time to patch the JSToWasmWrappers; in fact the address of the WasmContext is not known during compilation, but only when the instance is built. The WasmContext address is passed as the first parameter. This has the advantage of not having to move the WasmContext around if the function does not use many registers. This CL also changes the wasm calling convention so that the first parameter register is different from the return value register. The WasmContext is attached to every WasmMemoryObject, to share the same context with multiple instances sharing the same memory. Moreover, the nodes representing the WasmContext variables are cached in the SSA environment, similarly to other local variables that might change during execution. The nodes are created when initializing the SSA environment and refreshed every time a grow_memory or a function call happens, so that we are sure that they always represent the correct mem_size and mem_start variables. This CL also removes the WasmMemorySize runtime (since it's now possible to directly retrieve mem_size from the context) and simplifies the GrowMemory runtime (since every instance now has a memory_object). R=ahaas@chromium.org,clemensh@chromium.org CC=gdeepti@chromium.org Change-Id: I3f058e641284f5a1bbbfc35a64c88da6ff08e240 Reviewed-on: https://chromium-review.googlesource.com/671008 Commit-Queue: Enrico Bacis <enricobacis@google.com> Reviewed-by: Clemens Hammacher <clemensh@chromium.org> Reviewed-by: Andreas Haas <ahaas@chromium.org> Cr-Commit-Position: refs/heads/master@{#48209}
150 lines
6.6 KiB
JavaScript
150 lines
6.6 KiB
JavaScript
// Copyright 2017 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: --expose-wasm
|
|
|
|
load('test/mjsunit/wasm/wasm-constants.js');
|
|
load('test/mjsunit/wasm/wasm-module-builder.js');
|
|
|
|
let initialMemoryPages = 1;
|
|
let maximumMemoryPages = 5;
|
|
let other_fn_idx = 0;
|
|
|
|
// This builder can be used to generate a module with memory + load/store
|
|
// functions and/or an additional imported function.
|
|
function generateBuilder(add_memory, import_sig) {
|
|
let builder = new WasmModuleBuilder();
|
|
if (import_sig) {
|
|
// Add the import if we expect a module builder with imported functions.
|
|
let idx = builder.addImport('import_module', 'other_module_fn', import_sig);
|
|
// The imported function should always have index 0. With this assertion we
|
|
// verify that we can use other_fn_idx to refer to this function.
|
|
assertEquals(idx, other_fn_idx)
|
|
}
|
|
if (add_memory) {
|
|
// Add the memory if we expect a module builder with memory and load/store.
|
|
builder.addMemory(initialMemoryPages, maximumMemoryPages, true);
|
|
builder.addFunction('load', kSig_i_i)
|
|
.addBody([kExprGetLocal, 0, kExprI32LoadMem, 0, 0])
|
|
.exportFunc();
|
|
builder.addFunction('store', kSig_i_ii)
|
|
.addBody([
|
|
kExprGetLocal, 0, kExprGetLocal, 1, kExprI32StoreMem, 0, 0,
|
|
kExprGetLocal, 1
|
|
])
|
|
.exportFunc();
|
|
}
|
|
return builder;
|
|
}
|
|
|
|
// This test verifies that when a Wasm module without memory invokes a function
|
|
// imported from another module that has memory, the second module reads its own
|
|
// memory and returns the expected value.
|
|
(function TestExternalCallBetweenTwoWasmModulesWithoutAndWithMemory() {
|
|
print('TestExternalCallBetweenTwoWasmModulesWithoutAndWithMemory');
|
|
|
|
let first_module = generateBuilder(add_memory = false, import_sig = kSig_i_i);
|
|
// Function to invoke the imported function and add 1 to the result.
|
|
first_module.addFunction('plus_one', kSig_i_i)
|
|
.addBody([
|
|
kExprGetLocal, 0, // -
|
|
kExprCallFunction, other_fn_idx, // call the imported function
|
|
kExprI32Const, 1, // -
|
|
kExprI32Add, // add 1 to the result
|
|
kExprReturn // -
|
|
])
|
|
.exportFunc();
|
|
let second_module =
|
|
generateBuilder(add_memory = true, import_sig = undefined);
|
|
|
|
let index = kPageSize - 4;
|
|
let second_value = 2222;
|
|
// Instantiate the instances.
|
|
let second_instance = second_module.instantiate();
|
|
let first_instance = first_module.instantiate(
|
|
{import_module: {other_module_fn: second_instance.exports.load}});
|
|
// Write the values in the second instance.
|
|
second_instance.exports.store(index, second_value);
|
|
assertEquals(second_value, second_instance.exports.load(index));
|
|
// Verify that the value is correct when passing from the imported function.
|
|
assertEquals(second_value + 1, first_instance.exports.plus_one(index));
|
|
})();
|
|
|
|
// This test verifies that when a Wasm module with memory invokes a function
|
|
// imported from another module that also has memory, the second module reads
|
|
// its own memory and returns the expected value.
|
|
(function TestExternalCallBetweenTwoWasmModulesWithMemory() {
|
|
print('TestExternalCallBetweenTwoWasmModulesWithMemory');
|
|
|
|
let first_module = generateBuilder(add_memory = true, import_sig = kSig_i_i);
|
|
// Function to invoke the imported function and add 1 to the result.
|
|
first_module.addFunction('plus_one', kSig_i_i)
|
|
.addBody([
|
|
kExprGetLocal, 0, // -
|
|
kExprCallFunction, other_fn_idx, // call the imported function
|
|
kExprI32Const, 1, // -
|
|
kExprI32Add, // add 1 to the result
|
|
kExprReturn // -
|
|
])
|
|
.exportFunc();
|
|
let second_module =
|
|
generateBuilder(add_memory = true, import_sig = undefined);
|
|
|
|
let index = kPageSize - 4;
|
|
let first_value = 1111;
|
|
let second_value = 2222;
|
|
// Instantiate the instances.
|
|
let second_instance = second_module.instantiate();
|
|
let first_instance = first_module.instantiate(
|
|
{import_module: {other_module_fn: second_instance.exports.load}});
|
|
// Write the values in the two instances.
|
|
first_instance.exports.store(index, first_value);
|
|
second_instance.exports.store(index, second_value);
|
|
// Verify that the values were stored to memory.
|
|
assertEquals(first_value, first_instance.exports.load(index));
|
|
assertEquals(second_value, second_instance.exports.load(index));
|
|
// Verify that the value is correct when passing from the imported function.
|
|
assertEquals(second_value + 1, first_instance.exports.plus_one(index));
|
|
})();
|
|
|
|
// This test verifies that the correct memory is accessed after returning
|
|
// from a function imported from another module that also has memory.
|
|
(function TestCorrectMemoryAccessedAfterReturningFromExternalCall() {
|
|
print('TestCorrectMemoryAccessedAfterReturningFromExternalCall');
|
|
|
|
let first_module = generateBuilder(add_memory = true, import_sig = kSig_i_ii);
|
|
// Function to invoke the imported function and add 1 to the result.
|
|
first_module.addFunction('sandwich', kSig_i_iii)
|
|
.addBody([
|
|
kExprGetLocal, 0, // param0 (index)
|
|
kExprGetLocal, 1, // param1 (first_value)
|
|
kExprI32StoreMem, 0, 0, // store value in first_instance
|
|
kExprGetLocal, 0, // param0 (index)
|
|
kExprGetLocal, 2, // param2 (second_value)
|
|
kExprCallFunction, other_fn_idx, // call the imported function
|
|
kExprDrop, // drop the return value
|
|
kExprGetLocal, 0, // param0 (index)
|
|
kExprI32LoadMem, 0, 0, // load from first_instance
|
|
kExprReturn // -
|
|
])
|
|
.exportFunc();
|
|
let second_module =
|
|
generateBuilder(add_memory = true, import_sig = undefined);
|
|
|
|
let index = kPageSize - 4;
|
|
let first_value = 1111;
|
|
let second_value = 2222;
|
|
// Instantiate the instances.
|
|
let second_instance = second_module.instantiate();
|
|
let first_instance = first_module.instantiate(
|
|
{import_module: {other_module_fn: second_instance.exports.store}});
|
|
// Call the sandwich function and check that it returns the correct value.
|
|
assertEquals(
|
|
first_value,
|
|
first_instance.exports.sandwich(index, first_value, second_value));
|
|
// Verify that the values are correct in both memories.
|
|
assertEquals(first_value, first_instance.exports.load(index));
|
|
assertEquals(second_value, second_instance.exports.load(index));
|
|
})();
|