fe53fbfca0
With streaming compilation we delay the generation of errors until after all bytes are received, so that potentially better error messages get generated. With this CL we also delay the generation of errors in the combination of lazy compilation and streaming compilation. In particular, this CL does the following: * It avoids the creation of a `DecodeFail` task in `FinishAsyncCompileJobWithError`, which would create an error immediately before a potential name section arrived. * It calls `CompilationStateImpl::SetError()` so that an error is created once the stream finishes. * It removes the return value of `ProcessFunctionBody` so that wire bytes continue to be received even after a validation error. * It adds an early exit to `ProcessFunctionBody` if `CompilationStateImpl::failed()` is true, so that we don't continue validation after the first detected error. R=clemensb@chromium.org Bug: v8:12852 Change-Id: Ie8c6be243a257ef62cbb29fea6b8e0c205060680 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3802691 Reviewed-by: Clemens Backes <clemensb@chromium.org> Commit-Queue: Andreas Haas <ahaas@chromium.org> Cr-Commit-Position: refs/heads/main@{#82181}
131 lines
5.5 KiB
JavaScript
131 lines
5.5 KiB
JavaScript
// Copyright 2019 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-compilation-hints --wasm-test-streaming
|
|
|
|
d8.file.execute('test/mjsunit/wasm/wasm-module-builder.js');
|
|
|
|
(function testInstantiateStreamingWithLazyHint() {
|
|
print(arguments.callee.name);
|
|
let builder = new WasmModuleBuilder();
|
|
builder.addImport('mod', 'pow', kSig_i_ii);
|
|
builder.addFunction('upow', kSig_i_i)
|
|
.addBody([kExprLocalGet, 0,
|
|
kExprLocalGet, 0,
|
|
kExprCallFunction, 0])
|
|
builder.addFunction('upow2', kSig_i_i)
|
|
.addBody([kExprLocalGet, 0,
|
|
kExprLocalGet, 0,
|
|
kExprCallFunction, 0])
|
|
.setCompilationHint(kCompilationHintStrategyLazy,
|
|
kCompilationHintTierDefault,
|
|
kCompilationHintTierDefault)
|
|
.exportFunc();
|
|
let bytes = builder.toBuffer();
|
|
assertPromiseResult(WebAssembly.instantiateStreaming(Promise.resolve(bytes),
|
|
{mod: {pow: Math.pow}})
|
|
.then(({module, instance}) => assertEquals(27, instance.exports.upow2(3))));
|
|
})();
|
|
|
|
(function testInstantiateStreamingWithBadLazyHint() {
|
|
print(arguments.callee.name);
|
|
let builder = new WasmModuleBuilder();
|
|
builder.addImport('mod', 'pow', kSig_i_ii);
|
|
builder.addFunction('upow', kSig_i_i)
|
|
.addBody([kExprLocalGet, 0,
|
|
kExprLocalGet, 0,
|
|
kExprCallFunction, 0])
|
|
builder.addFunction('upow2', kSig_i_i)
|
|
.addBody([kExprLocalGet, 0,
|
|
kExprLocalGet, 0,
|
|
kExprCallFunction, 0])
|
|
.setCompilationHint(kCompilationHintStrategyLazy,
|
|
kCompilationHintTierOptimized,
|
|
kCompilationHintTierBaseline)
|
|
.exportFunc();
|
|
let bytes = builder.toBuffer();
|
|
assertPromiseResult(WebAssembly.instantiateStreaming(Promise.resolve(bytes),
|
|
{mod: {pow: Math.pow}})
|
|
.then(assertUnreachable,
|
|
error => assertEquals("WebAssembly.instantiateStreaming(): Invalid " +
|
|
"compilation hint 0x19 (forbidden downgrade) " +
|
|
"@+78",
|
|
error.message)));
|
|
})();
|
|
|
|
(function testInstantiateStreamingWithBadLazyFunctionBody() {
|
|
print(arguments.callee.name);
|
|
let builder = new WasmModuleBuilder();
|
|
builder.addImport('mod', 'pow', kSig_f_ff);
|
|
builder.addFunction('upow', kSig_i_i)
|
|
.addBody([kExprLocalGet, 0,
|
|
kExprLocalGet, 0,
|
|
kExprCallFunction, 0])
|
|
builder.addFunction('upow2', kSig_i_i)
|
|
.addBody([kExprLocalGet, 0,
|
|
kExprLocalGet, 0,
|
|
kExprCallFunction, 0])
|
|
.setCompilationHint(kCompilationHintStrategyLazy,
|
|
kCompilationHintTierDefault,
|
|
kCompilationHintTierDefault)
|
|
.exportFunc();
|
|
let bytes = builder.toBuffer();
|
|
assertPromiseResult(
|
|
WebAssembly
|
|
.instantiateStreaming(Promise.resolve(bytes), {mod: {pow: Math.pow}})
|
|
.then(
|
|
assertUnreachable,
|
|
error => assertEquals(
|
|
'WebAssembly.instantiateStreaming(): Compiling ' +
|
|
'function #1:"upow" failed: call[0] ' +
|
|
'expected type f32, found local.get of type ' +
|
|
'i32 @+83',
|
|
error.message)));
|
|
})();
|
|
|
|
(function testInstantiateStreamingEmptyModule() {
|
|
print(arguments.callee.name);
|
|
let builder = new WasmModuleBuilder();
|
|
builder.addImport('mod', 'pow', kSig_i_ii);
|
|
let bytes = builder.toBuffer();
|
|
assertPromiseResult(WebAssembly.instantiateStreaming(Promise.resolve(bytes),
|
|
{mod: {pow: Math.pow}}));
|
|
})();
|
|
|
|
(function testInstantiateStreamingLazyModule() {
|
|
print(arguments.callee.name);
|
|
let builder = new WasmModuleBuilder();
|
|
builder.addImport('mod', 'pow', kSig_i_ii);
|
|
builder.addFunction('upow', kSig_i_i)
|
|
.addBody([kExprLocalGet, 0,
|
|
kExprLocalGet, 0,
|
|
kExprCallFunction, 0])
|
|
.setCompilationHint(kCompilationHintStrategyLazy,
|
|
kCompilationHintTierDefault,
|
|
kCompilationHintTierDefault)
|
|
.exportFunc();
|
|
let bytes = builder.toBuffer();
|
|
assertPromiseResult(WebAssembly.instantiateStreaming(Promise.resolve(bytes),
|
|
{mod: {pow: Math.pow}})
|
|
.then(({module, instance}) => assertEquals(27, instance.exports.upow(3))));
|
|
})();
|
|
|
|
(function testInstantiateStreamingLazyBaselineModule() {
|
|
print(arguments.callee.name);
|
|
let builder = new WasmModuleBuilder();
|
|
builder.addImport('mod', 'pow', kSig_i_ii);
|
|
builder.addFunction('upow', kSig_i_i)
|
|
.addBody([kExprLocalGet, 0,
|
|
kExprLocalGet, 0,
|
|
kExprCallFunction, 0])
|
|
.setCompilationHint(kCompilationHintStrategyLazyBaselineEagerTopTier,
|
|
kCompilationHintTierDefault,
|
|
kCompilationHintTierDefault)
|
|
.exportFunc();
|
|
let bytes = builder.toBuffer();
|
|
assertPromiseResult(WebAssembly.instantiateStreaming(Promise.resolve(bytes),
|
|
{mod: {pow: Math.pow}})
|
|
.then(({module, instance}) => assertEquals(27, instance.exports.upow(3))));
|
|
})();
|