2016-01-14 09:48:45 +00:00
|
|
|
// Copyright 2016 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.
|
|
|
|
|
|
|
|
#ifndef WASM_RUN_UTILS_H
|
|
|
|
#define WASM_RUN_UTILS_H
|
|
|
|
|
[wasm] Introduce the TrapIf and TrapUnless operators to generate trap code.
Some instructions in WebAssembly trap for some inputs, which means that the
execution is terminated and (at least at the moment) a JavaScript exception is
thrown. Examples for traps are out-of-bounds memory accesses, or integer
divisions by zero.
Without the TrapIf and TrapUnless operators trap check in WebAssembly introduces 5
TurboFan nodes (branch, if_true, if_false, trap-reason constant, trap-position
constant), in addition to the trap condition itself. Additionally, each
WebAssembly function has four TurboFan nodes (merge, effect_phi, 2 phis) whose
number of inputs is linear to the number of trap checks in the function.
Especially for functions with high numbers of trap checks we observe a
significant slowdown in compilation time, down to 0.22 MiB/s in the sqlite
benchmark instead of the average of 3 MiB/s in other benchmarks. By introducing
a TrapIf common operator only a single node is necessary per trap check, in
addition to the trap condition. Also the nodes which are shared between trap
checks (merge, effect_phi, 2 phis) would disappear. First measurements suggest a
speedup of 30-50% on average.
This CL only implements TrapIf and TrapUnless on x64. The implementation is also
hidden behind the --wasm-trap-if flag.
Please take a special look at how the source position is transfered from the
instruction selector to the code generator, and at the context that is used for
the runtime call.
R=titzer@chromium.org
Review-Url: https://codereview.chromium.org/2562393002
Cr-Commit-Position: refs/heads/master@{#41720}
2016-12-15 13:31:29 +00:00
|
|
|
#include <setjmp.h>
|
2016-01-14 09:48:45 +00:00
|
|
|
#include <stdint.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2016-12-16 10:13:11 +00:00
|
|
|
#include <array>
|
2016-07-25 11:12:42 +00:00
|
|
|
#include <memory>
|
|
|
|
|
2016-01-14 09:48:45 +00:00
|
|
|
#include "src/base/utils/random-number-generator.h"
|
2016-09-20 16:07:25 +00:00
|
|
|
#include "src/zone/accounting-allocator.h"
|
2016-01-14 09:48:45 +00:00
|
|
|
|
This CL enables precise source positions for all V8 compilers. It merges compiler::SourcePosition and internal::SourcePosition to a single class used throughout the codebase. The new internal::SourcePosition instances store an id identifying an inlined function in addition to a script offset.
SourcePosition::InliningId() refers to a the new table DeoptimizationInputData::InliningPositions(), which provides the following data for every inlining id:
- The inlined SharedFunctionInfo as an offset into DeoptimizationInfo::LiteralArray
- The SourcePosition of the inlining. Recursively, this yields the full inlining stack.
Before the Code object is created, the same information can be found in CompilationInfo::inlined_functions().
If SourcePosition::InliningId() is SourcePosition::kNotInlined, it refers to the outer (non-inlined) function.
So every SourcePosition has full information about its inlining stack, as long as the corresponding Code object is known. The internal represenation of a source position is a positive 64bit integer.
All compilers create now appropriate source positions for inlined functions. In the case of Turbofan, this required using AstGraphBuilderWithPositions for inlined functions too. So this class is now moved to a header file.
At the moment, the additional information in source positions is only used in --trace-deopt and --code-comments. The profiler needs to be updated, at the moment it gets the correct script offsets from the deopt info, but the wrong script id from the reconstructed deopt stack, which can lead to wrong outputs. This should be resolved by making the profiler use the new inlining information for deopts.
I activated the inlined deoptimization tests in test-cpu-profiler.cc for Turbofan, changing them to a case where the deopt stack and the inlining position agree. It is currently still broken for other cases.
The following additional changes were necessary:
- The source position table (internal::SourcePositionTableBuilder etc.) supports now 64bit source positions. Encoding source positions in a single 64bit int together with the difference encoding in the source position table results in very little overhead for the inlining id, since only 12% of the source positions in Octane have a changed inlining id.
- The class HPositionInfo was effectively dead code and is now removed.
- SourcePosition has new printing and information facilities, including computing a full inlining stack.
- I had to rename compiler/source-position.{h,cc} to compiler/compiler-source-position-table.{h,cc} to avoid clashes with the new src/source-position.cc file.
- I wrote the new wrapper PodArray for ByteArray. It is a template working with any POD-type. This is used in DeoptimizationInputData::InliningPositions().
- I removed HInlinedFunctionInfo and HGraph::inlined_function_infos, because they were only used for the now obsolete Crankshaft inlining ids.
- Crankshaft managed a list of inlined functions in Lithium: LChunk::inlined_functions. This is an analog structure to CompilationInfo::inlined_functions. So I removed LChunk::inlined_functions and made Crankshaft use CompilationInfo::inlined_functions instead, because this was necessary to register the offsets into the literal array in a uniform way. This is a safe change because LChunk::inlined_functions has no other uses and the functions in CompilationInfo::inlined_functions have a strictly longer lifespan, being created earlier (in Hydrogen already).
BUG=v8:5432
Review-Url: https://codereview.chromium.org/2451853002
Cr-Commit-Position: refs/heads/master@{#40975}
2016-11-14 17:21:37 +00:00
|
|
|
#include "src/compiler/compiler-source-position-table.h"
|
2016-01-14 09:48:45 +00:00
|
|
|
#include "src/compiler/graph-visualizer.h"
|
2016-02-04 09:40:55 +00:00
|
|
|
#include "src/compiler/int64-lowering.h"
|
2016-01-14 09:48:45 +00:00
|
|
|
#include "src/compiler/js-graph.h"
|
2016-02-18 09:55:25 +00:00
|
|
|
#include "src/compiler/node.h"
|
|
|
|
#include "src/compiler/pipeline.h"
|
2016-01-14 09:48:45 +00:00
|
|
|
#include "src/compiler/wasm-compiler.h"
|
2016-10-10 19:00:31 +00:00
|
|
|
#include "src/compiler/zone-stats.h"
|
2016-12-21 12:42:06 +00:00
|
|
|
#include "src/wasm/function-body-decoder.h"
|
[wasm] Introduce the TrapIf and TrapUnless operators to generate trap code.
Some instructions in WebAssembly trap for some inputs, which means that the
execution is terminated and (at least at the moment) a JavaScript exception is
thrown. Examples for traps are out-of-bounds memory accesses, or integer
divisions by zero.
Without the TrapIf and TrapUnless operators trap check in WebAssembly introduces 5
TurboFan nodes (branch, if_true, if_false, trap-reason constant, trap-position
constant), in addition to the trap condition itself. Additionally, each
WebAssembly function has four TurboFan nodes (merge, effect_phi, 2 phis) whose
number of inputs is linear to the number of trap checks in the function.
Especially for functions with high numbers of trap checks we observe a
significant slowdown in compilation time, down to 0.22 MiB/s in the sqlite
benchmark instead of the average of 3 MiB/s in other benchmarks. By introducing
a TrapIf common operator only a single node is necessary per trap check, in
addition to the trap condition. Also the nodes which are shared between trap
checks (merge, effect_phi, 2 phis) would disappear. First measurements suggest a
speedup of 30-50% on average.
This CL only implements TrapIf and TrapUnless on x64. The implementation is also
hidden behind the --wasm-trap-if flag.
Please take a special look at how the source position is transfered from the
instruction selector to the code generator, and at the context that is used for
the runtime call.
R=titzer@chromium.org
Review-Url: https://codereview.chromium.org/2562393002
Cr-Commit-Position: refs/heads/master@{#41720}
2016-12-15 13:31:29 +00:00
|
|
|
#include "src/wasm/wasm-external-refs.h"
|
2016-05-25 08:32:37 +00:00
|
|
|
#include "src/wasm/wasm-interpreter.h"
|
2016-01-14 09:48:45 +00:00
|
|
|
#include "src/wasm/wasm-js.h"
|
2016-04-29 12:43:14 +00:00
|
|
|
#include "src/wasm/wasm-macro-gen.h"
|
2016-01-14 09:48:45 +00:00
|
|
|
#include "src/wasm/wasm-module.h"
|
2016-11-11 11:12:31 +00:00
|
|
|
#include "src/wasm/wasm-objects.h"
|
2016-01-14 09:48:45 +00:00
|
|
|
#include "src/wasm/wasm-opcodes.h"
|
|
|
|
|
2016-09-20 16:07:25 +00:00
|
|
|
#include "src/zone/zone.h"
|
2016-02-18 09:55:25 +00:00
|
|
|
|
2016-01-14 09:48:45 +00:00
|
|
|
#include "test/cctest/cctest.h"
|
2016-02-18 09:55:25 +00:00
|
|
|
#include "test/cctest/compiler/call-tester.h"
|
2016-01-14 09:48:45 +00:00
|
|
|
#include "test/cctest/compiler/graph-builder-tester.h"
|
|
|
|
|
2016-02-18 15:58:02 +00:00
|
|
|
static const uint32_t kMaxFunctions = 10;
|
|
|
|
|
2016-05-25 08:32:37 +00:00
|
|
|
enum WasmExecutionMode { kExecuteInterpreted, kExecuteCompiled };
|
|
|
|
|
2016-01-14 09:48:45 +00:00
|
|
|
// TODO(titzer): check traps more robustly in tests.
|
|
|
|
// Currently, in tests, we just return 0xdeadbeef from the function in which
|
|
|
|
// the trap occurs if the runtime context is not available to throw a JavaScript
|
|
|
|
// exception.
|
|
|
|
#define CHECK_TRAP32(x) \
|
|
|
|
CHECK_EQ(0xdeadbeef, (bit_cast<uint32_t>(x)) & 0xFFFFFFFF)
|
|
|
|
#define CHECK_TRAP64(x) \
|
|
|
|
CHECK_EQ(0xdeadbeefdeadbeef, (bit_cast<uint64_t>(x)) & 0xFFFFFFFFFFFFFFFF)
|
|
|
|
#define CHECK_TRAP(x) CHECK_TRAP32(x)
|
|
|
|
|
2016-02-18 09:55:25 +00:00
|
|
|
#define WASM_WRAPPER_RETURN_VALUE 8754
|
|
|
|
|
2016-02-23 16:30:27 +00:00
|
|
|
#define BUILD(r, ...) \
|
|
|
|
do { \
|
|
|
|
byte code[] = {__VA_ARGS__}; \
|
|
|
|
r.Build(code, code + arraysize(code)); \
|
|
|
|
} while (false)
|
|
|
|
|
2016-01-14 09:48:45 +00:00
|
|
|
namespace {
|
|
|
|
using namespace v8::base;
|
|
|
|
using namespace v8::internal;
|
|
|
|
using namespace v8::internal::compiler;
|
|
|
|
using namespace v8::internal::wasm;
|
|
|
|
|
|
|
|
const uint32_t kMaxGlobalsSize = 128;
|
|
|
|
|
|
|
|
// A helper for module environments that adds the ability to allocate memory
|
2016-02-18 15:58:02 +00:00
|
|
|
// and global variables. Contains a built-in {WasmModule} and
|
2016-10-12 13:57:03 +00:00
|
|
|
// {WasmInstance}.
|
2016-01-14 09:48:45 +00:00
|
|
|
class TestingModule : public ModuleEnv {
|
|
|
|
public:
|
2016-12-16 10:13:11 +00:00
|
|
|
explicit TestingModule(Zone* zone, WasmExecutionMode mode = kExecuteCompiled)
|
2016-11-30 15:02:40 +00:00
|
|
|
: ModuleEnv(&module_, &instance_),
|
|
|
|
execution_mode_(mode),
|
2016-05-25 08:32:37 +00:00
|
|
|
instance_(&module_),
|
2016-05-20 08:04:43 +00:00
|
|
|
isolate_(CcTest::InitIsolateOnce()),
|
2016-05-25 08:32:37 +00:00
|
|
|
global_offset(0),
|
|
|
|
interpreter_(mode == kExecuteInterpreted
|
2016-11-30 15:02:40 +00:00
|
|
|
? new WasmInterpreter(
|
|
|
|
ModuleBytesEnv(&module_, &instance_,
|
|
|
|
Vector<const byte>::empty()),
|
2016-12-16 10:13:11 +00:00
|
|
|
zone->allocator())
|
2016-05-25 08:32:37 +00:00
|
|
|
: nullptr) {
|
2017-01-12 20:32:27 +00:00
|
|
|
WasmJs::Install(isolate_);
|
2016-02-18 15:58:02 +00:00
|
|
|
instance->module = &module_;
|
2016-01-27 11:04:02 +00:00
|
|
|
instance->globals_start = global_data;
|
2016-05-24 16:32:03 +00:00
|
|
|
module_.globals_size = kMaxGlobalsSize;
|
2016-01-27 11:04:02 +00:00
|
|
|
instance->mem_start = nullptr;
|
|
|
|
instance->mem_size = 0;
|
2016-01-14 09:48:45 +00:00
|
|
|
memset(global_data, 0, sizeof(global_data));
|
2016-12-19 15:03:13 +00:00
|
|
|
instance_object_ = InitInstanceObject();
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
~TestingModule() {
|
2016-01-27 11:04:02 +00:00
|
|
|
if (instance->mem_start) {
|
|
|
|
free(instance->mem_start);
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
2016-05-25 08:32:37 +00:00
|
|
|
if (interpreter_) delete interpreter_;
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
|
|
|
|
2016-11-30 15:02:40 +00:00
|
|
|
void ChangeOriginToAsmjs() { module_.origin = kAsmJsOrigin; }
|
2016-10-27 16:02:24 +00:00
|
|
|
|
2016-06-16 22:21:30 +00:00
|
|
|
byte* AddMemory(uint32_t size) {
|
2017-01-18 12:07:57 +00:00
|
|
|
CHECK(!module_.has_memory);
|
2016-01-27 11:04:02 +00:00
|
|
|
CHECK_NULL(instance->mem_start);
|
2016-12-16 10:13:11 +00:00
|
|
|
CHECK_EQ(0, instance->mem_size);
|
2017-01-18 12:07:57 +00:00
|
|
|
module_.has_memory = true;
|
2016-01-27 11:04:02 +00:00
|
|
|
instance->mem_start = reinterpret_cast<byte*>(malloc(size));
|
|
|
|
CHECK(instance->mem_start);
|
|
|
|
memset(instance->mem_start, 0, size);
|
|
|
|
instance->mem_size = size;
|
2016-01-14 09:48:45 +00:00
|
|
|
return raw_mem_start<byte>();
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename T>
|
2016-06-16 22:21:30 +00:00
|
|
|
T* AddMemoryElems(uint32_t count) {
|
2016-01-14 09:48:45 +00:00
|
|
|
AddMemory(count * sizeof(T));
|
|
|
|
return raw_mem_start<T>();
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename T>
|
2016-12-16 10:13:11 +00:00
|
|
|
T* AddGlobal(
|
2016-12-21 13:43:00 +00:00
|
|
|
ValueType type = WasmOpcodes::ValueTypeFor(MachineTypeForC<T>())) {
|
2016-07-21 12:34:28 +00:00
|
|
|
const WasmGlobal* global = AddGlobal(type);
|
2016-01-27 11:04:02 +00:00
|
|
|
return reinterpret_cast<T*>(instance->globals_start + global->offset);
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
byte AddSignature(FunctionSig* sig) {
|
2016-05-24 16:32:03 +00:00
|
|
|
module_.signatures.push_back(sig);
|
2016-02-28 19:04:10 +00:00
|
|
|
size_t size = module->signatures.size();
|
2016-01-14 09:48:45 +00:00
|
|
|
CHECK(size < 127);
|
|
|
|
return static_cast<byte>(size - 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
T* raw_mem_start() {
|
2016-01-27 11:04:02 +00:00
|
|
|
DCHECK(instance->mem_start);
|
|
|
|
return reinterpret_cast<T*>(instance->mem_start);
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
T* raw_mem_end() {
|
2016-01-27 11:04:02 +00:00
|
|
|
DCHECK(instance->mem_start);
|
|
|
|
return reinterpret_cast<T*>(instance->mem_start + instance->mem_size);
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
T raw_mem_at(int i) {
|
2016-01-27 11:04:02 +00:00
|
|
|
DCHECK(instance->mem_start);
|
2016-06-29 09:25:24 +00:00
|
|
|
return ReadMemory(&(reinterpret_cast<T*>(instance->mem_start)[i]));
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
T raw_val_at(int i) {
|
2016-06-29 09:25:24 +00:00
|
|
|
return ReadMemory(reinterpret_cast<T*>(instance->mem_start + i));
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
void WriteMemory(T* p, T val) {
|
|
|
|
WriteLittleEndianValue<T>(p, val);
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
T ReadMemory(T* p) {
|
|
|
|
return ReadLittleEndianValue<T>(p);
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Zero-initialize the memory.
|
|
|
|
void BlankMemory() {
|
|
|
|
byte* raw = raw_mem_start<byte>();
|
2016-01-27 11:04:02 +00:00
|
|
|
memset(raw, 0, instance->mem_size);
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Pseudo-randomly intialize the memory.
|
|
|
|
void RandomizeMemory(unsigned int seed = 88) {
|
|
|
|
byte* raw = raw_mem_start<byte>();
|
|
|
|
byte* end = raw_mem_end<byte>();
|
|
|
|
v8::base::RandomNumberGenerator rng;
|
|
|
|
rng.SetSeed(seed);
|
|
|
|
rng.NextBytes(raw, end - raw);
|
|
|
|
}
|
|
|
|
|
2017-01-11 17:24:00 +00:00
|
|
|
void SetMaxMemPages(uint32_t max_mem_pages) {
|
|
|
|
module_.max_mem_pages = max_mem_pages;
|
|
|
|
}
|
|
|
|
|
2016-12-19 15:03:13 +00:00
|
|
|
uint32_t AddFunction(FunctionSig* sig, Handle<Code> code, const char* name) {
|
2016-02-28 19:04:10 +00:00
|
|
|
if (module->functions.size() == 0) {
|
2016-02-18 15:58:02 +00:00
|
|
|
// TODO(titzer): Reserving space here to avoid the underlying WasmFunction
|
|
|
|
// structs from moving.
|
2016-05-24 16:32:03 +00:00
|
|
|
module_.functions.reserve(kMaxFunctions);
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
2016-02-28 19:04:10 +00:00
|
|
|
uint32_t index = static_cast<uint32_t>(module->functions.size());
|
2016-09-27 20:46:10 +00:00
|
|
|
module_.functions.push_back({sig, index, 0, 0, 0, 0, 0, false, false});
|
2016-12-19 15:03:13 +00:00
|
|
|
if (name) {
|
|
|
|
Vector<const byte> name_vec = Vector<const byte>::cast(CStrVector(name));
|
|
|
|
module_.functions.back().name_offset = AddBytes(name_vec);
|
|
|
|
module_.functions.back().name_length = name_vec.length();
|
|
|
|
}
|
2016-02-28 19:04:10 +00:00
|
|
|
instance->function_code.push_back(code);
|
2016-05-25 08:32:37 +00:00
|
|
|
if (interpreter_) {
|
|
|
|
const WasmFunction* function = &module->functions.back();
|
|
|
|
int interpreter_index = interpreter_->AddFunctionForTesting(function);
|
|
|
|
CHECK_EQ(index, static_cast<uint32_t>(interpreter_index));
|
|
|
|
}
|
2016-02-18 15:58:02 +00:00
|
|
|
DCHECK_LT(index, kMaxFunctions); // limited for testing.
|
|
|
|
return index;
|
|
|
|
}
|
|
|
|
|
2016-04-19 12:23:00 +00:00
|
|
|
uint32_t AddJsFunction(FunctionSig* sig, const char* source) {
|
|
|
|
Handle<JSFunction> jsfunc = Handle<JSFunction>::cast(v8::Utils::OpenHandle(
|
|
|
|
*v8::Local<v8::Function>::Cast(CompileRun(source))));
|
2016-12-19 15:03:13 +00:00
|
|
|
uint32_t index = AddFunction(sig, Handle<Code>::null(), nullptr);
|
2016-12-09 10:29:53 +00:00
|
|
|
Handle<Code> code = CompileWasmToJSWrapper(
|
|
|
|
isolate_, jsfunc, sig, index, Handle<String>::null(),
|
|
|
|
Handle<String>::null(), module->origin);
|
2016-04-19 12:23:00 +00:00
|
|
|
instance->function_code[index] = code;
|
|
|
|
return index;
|
|
|
|
}
|
|
|
|
|
|
|
|
Handle<JSFunction> WrapCode(uint32_t index) {
|
|
|
|
// Wrap the code so it can be called as a JS function.
|
|
|
|
Handle<Code> code = instance->function_code[index];
|
2016-07-12 21:37:07 +00:00
|
|
|
Handle<Code> ret_code =
|
2016-11-30 15:02:40 +00:00
|
|
|
compiler::CompileJSToWasmWrapper(isolate_, &module_, code, index);
|
2016-11-11 11:12:31 +00:00
|
|
|
Handle<JSFunction> ret = WasmExportedFunction::New(
|
2017-01-20 13:50:09 +00:00
|
|
|
isolate_, instance_object(), MaybeHandle<String>(),
|
|
|
|
static_cast<int>(index),
|
2016-11-11 11:12:31 +00:00
|
|
|
static_cast<int>(this->module->functions[index].sig->parameter_count()),
|
2016-12-06 15:33:28 +00:00
|
|
|
ret_code);
|
2017-01-20 13:50:09 +00:00
|
|
|
|
|
|
|
// Add weak reference to exported functions.
|
|
|
|
Handle<WasmCompiledModule> compiled_module(
|
|
|
|
instance_object()->compiled_module(), isolate_);
|
|
|
|
Handle<FixedArray> old_arr = compiled_module->weak_exported_functions();
|
|
|
|
Handle<FixedArray> new_arr =
|
|
|
|
isolate_->factory()->NewFixedArray(old_arr->length() + 1);
|
|
|
|
old_arr->CopyTo(0, *new_arr, 0, old_arr->length());
|
|
|
|
Handle<WeakCell> weak_fn = isolate_->factory()->NewWeakCell(ret);
|
|
|
|
new_arr->set(old_arr->length(), *weak_fn);
|
|
|
|
compiled_module->set_weak_exported_functions(new_arr);
|
|
|
|
|
2016-06-28 23:47:30 +00:00
|
|
|
return ret;
|
2016-04-19 12:23:00 +00:00
|
|
|
}
|
|
|
|
|
2016-02-18 15:58:02 +00:00
|
|
|
void SetFunctionCode(uint32_t index, Handle<Code> code) {
|
2016-02-28 19:04:10 +00:00
|
|
|
instance->function_code[index] = code;
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
|
|
|
|
[wasm] Use a Managed<WasmModule> to hold metadata about modules.
This CL refactors the handling of metadata associated with WebAssembly
modules to reduce the duplicate marshalling of data from the C++ world
to the JavaScript world. It does this by wrapping the C++ WasmModule*
object in a Foreign that is rooted from the on-heap WasmCompiledModule
(which is itself just a FixedArray). Upon serialization, the C++ object
is ignored and the original WASM wire bytes are serialized. Upon
deserialization, the C++ object is reconstituted by reparsing the bytes.
This is motivated by increasing complications in implementing the JS
API, in particular WebAssembly.Table, which must perform signature
canonicalization across instances.
Additionally, this CL implements the proper base + offset initialization
behavior for tables.
R=rossberg@chromium.org,bradnelson@chromium.org,mtrofin@chromium.org,yangguo@chromium.org
BUG=v8:5507, chromium:575167, chromium:657316
Review-Url: https://chromiumcodereview.appspot.com/2424623002
Cr-Commit-Position: refs/heads/master@{#40434}
2016-10-19 13:06:44 +00:00
|
|
|
void AddIndirectFunctionTable(uint16_t* function_indexes,
|
|
|
|
uint32_t table_size) {
|
2016-10-29 21:06:57 +00:00
|
|
|
module_.function_tables.push_back({table_size, table_size, true,
|
2016-10-11 12:40:24 +00:00
|
|
|
std::vector<int32_t>(), false, false,
|
|
|
|
SignatureMap()});
|
|
|
|
WasmIndirectFunctionTable& table = module_.function_tables.back();
|
2016-10-29 21:06:57 +00:00
|
|
|
table.min_size = table_size;
|
|
|
|
table.max_size = table_size;
|
2016-07-28 04:56:56 +00:00
|
|
|
for (uint32_t i = 0; i < table_size; ++i) {
|
[wasm] Use a Managed<WasmModule> to hold metadata about modules.
This CL refactors the handling of metadata associated with WebAssembly
modules to reduce the duplicate marshalling of data from the C++ world
to the JavaScript world. It does this by wrapping the C++ WasmModule*
object in a Foreign that is rooted from the on-heap WasmCompiledModule
(which is itself just a FixedArray). Upon serialization, the C++ object
is ignored and the original WASM wire bytes are serialized. Upon
deserialization, the C++ object is reconstituted by reparsing the bytes.
This is motivated by increasing complications in implementing the JS
API, in particular WebAssembly.Table, which must perform signature
canonicalization across instances.
Additionally, this CL implements the proper base + offset initialization
behavior for tables.
R=rossberg@chromium.org,bradnelson@chromium.org,mtrofin@chromium.org,yangguo@chromium.org
BUG=v8:5507, chromium:575167, chromium:657316
Review-Url: https://chromiumcodereview.appspot.com/2424623002
Cr-Commit-Position: refs/heads/master@{#40434}
2016-10-19 13:06:44 +00:00
|
|
|
table.values.push_back(function_indexes[i]);
|
|
|
|
table.map.FindOrInsert(module_.functions[function_indexes[i]].sig);
|
2016-01-21 16:10:53 +00:00
|
|
|
}
|
2016-07-28 04:56:56 +00:00
|
|
|
|
[wasm] Use a Managed<WasmModule> to hold metadata about modules.
This CL refactors the handling of metadata associated with WebAssembly
modules to reduce the duplicate marshalling of data from the C++ world
to the JavaScript world. It does this by wrapping the C++ WasmModule*
object in a Foreign that is rooted from the on-heap WasmCompiledModule
(which is itself just a FixedArray). Upon serialization, the C++ object
is ignored and the original WASM wire bytes are serialized. Upon
deserialization, the C++ object is reconstituted by reparsing the bytes.
This is motivated by increasing complications in implementing the JS
API, in particular WebAssembly.Table, which must perform signature
canonicalization across instances.
Additionally, this CL implements the proper base + offset initialization
behavior for tables.
R=rossberg@chromium.org,bradnelson@chromium.org,mtrofin@chromium.org,yangguo@chromium.org
BUG=v8:5507, chromium:575167, chromium:657316
Review-Url: https://chromiumcodereview.appspot.com/2424623002
Cr-Commit-Position: refs/heads/master@{#40434}
2016-10-19 13:06:44 +00:00
|
|
|
instance->function_tables.push_back(
|
2017-01-10 19:07:34 +00:00
|
|
|
isolate_->factory()->NewFixedArray(table_size));
|
|
|
|
instance->signature_tables.push_back(
|
|
|
|
isolate_->factory()->NewFixedArray(table_size));
|
2016-01-21 16:10:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void PopulateIndirectFunctionTable() {
|
2016-12-16 10:13:11 +00:00
|
|
|
if (execution_mode_ == kExecuteInterpreted) return;
|
[wasm] Use a Managed<WasmModule> to hold metadata about modules.
This CL refactors the handling of metadata associated with WebAssembly
modules to reduce the duplicate marshalling of data from the C++ world
to the JavaScript world. It does this by wrapping the C++ WasmModule*
object in a Foreign that is rooted from the on-heap WasmCompiledModule
(which is itself just a FixedArray). Upon serialization, the C++ object
is ignored and the original WASM wire bytes are serialized. Upon
deserialization, the C++ object is reconstituted by reparsing the bytes.
This is motivated by increasing complications in implementing the JS
API, in particular WebAssembly.Table, which must perform signature
canonicalization across instances.
Additionally, this CL implements the proper base + offset initialization
behavior for tables.
R=rossberg@chromium.org,bradnelson@chromium.org,mtrofin@chromium.org,yangguo@chromium.org
BUG=v8:5507, chromium:575167, chromium:657316
Review-Url: https://chromiumcodereview.appspot.com/2424623002
Cr-Commit-Position: refs/heads/master@{#40434}
2016-10-19 13:06:44 +00:00
|
|
|
// Initialize the fixed arrays in instance->function_tables.
|
2016-07-28 04:56:56 +00:00
|
|
|
for (uint32_t i = 0; i < instance->function_tables.size(); i++) {
|
[wasm] Use a Managed<WasmModule> to hold metadata about modules.
This CL refactors the handling of metadata associated with WebAssembly
modules to reduce the duplicate marshalling of data from the C++ world
to the JavaScript world. It does this by wrapping the C++ WasmModule*
object in a Foreign that is rooted from the on-heap WasmCompiledModule
(which is itself just a FixedArray). Upon serialization, the C++ object
is ignored and the original WASM wire bytes are serialized. Upon
deserialization, the C++ object is reconstituted by reparsing the bytes.
This is motivated by increasing complications in implementing the JS
API, in particular WebAssembly.Table, which must perform signature
canonicalization across instances.
Additionally, this CL implements the proper base + offset initialization
behavior for tables.
R=rossberg@chromium.org,bradnelson@chromium.org,mtrofin@chromium.org,yangguo@chromium.org
BUG=v8:5507, chromium:575167, chromium:657316
Review-Url: https://chromiumcodereview.appspot.com/2424623002
Cr-Commit-Position: refs/heads/master@{#40434}
2016-10-19 13:06:44 +00:00
|
|
|
WasmIndirectFunctionTable& table = module_.function_tables[i];
|
2017-01-10 19:07:34 +00:00
|
|
|
Handle<FixedArray> function_table = instance->function_tables[i];
|
|
|
|
Handle<FixedArray> signature_table = instance->signature_tables[i];
|
[wasm] Use a Managed<WasmModule> to hold metadata about modules.
This CL refactors the handling of metadata associated with WebAssembly
modules to reduce the duplicate marshalling of data from the C++ world
to the JavaScript world. It does this by wrapping the C++ WasmModule*
object in a Foreign that is rooted from the on-heap WasmCompiledModule
(which is itself just a FixedArray). Upon serialization, the C++ object
is ignored and the original WASM wire bytes are serialized. Upon
deserialization, the C++ object is reconstituted by reparsing the bytes.
This is motivated by increasing complications in implementing the JS
API, in particular WebAssembly.Table, which must perform signature
canonicalization across instances.
Additionally, this CL implements the proper base + offset initialization
behavior for tables.
R=rossberg@chromium.org,bradnelson@chromium.org,mtrofin@chromium.org,yangguo@chromium.org
BUG=v8:5507, chromium:575167, chromium:657316
Review-Url: https://chromiumcodereview.appspot.com/2424623002
Cr-Commit-Position: refs/heads/master@{#40434}
2016-10-19 13:06:44 +00:00
|
|
|
int table_size = static_cast<int>(table.values.size());
|
|
|
|
for (int j = 0; j < table_size; j++) {
|
|
|
|
WasmFunction& function = module_.functions[table.values[j]];
|
2017-01-10 19:07:34 +00:00
|
|
|
signature_table->set(j, Smi::FromInt(table.map.Find(function.sig)));
|
|
|
|
function_table->set(j, *instance->function_code[function.func_index]);
|
[wasm] Use a Managed<WasmModule> to hold metadata about modules.
This CL refactors the handling of metadata associated with WebAssembly
modules to reduce the duplicate marshalling of data from the C++ world
to the JavaScript world. It does this by wrapping the C++ WasmModule*
object in a Foreign that is rooted from the on-heap WasmCompiledModule
(which is itself just a FixedArray). Upon serialization, the C++ object
is ignored and the original WASM wire bytes are serialized. Upon
deserialization, the C++ object is reconstituted by reparsing the bytes.
This is motivated by increasing complications in implementing the JS
API, in particular WebAssembly.Table, which must perform signature
canonicalization across instances.
Additionally, this CL implements the proper base + offset initialization
behavior for tables.
R=rossberg@chromium.org,bradnelson@chromium.org,mtrofin@chromium.org,yangguo@chromium.org
BUG=v8:5507, chromium:575167, chromium:657316
Review-Url: https://chromiumcodereview.appspot.com/2424623002
Cr-Commit-Position: refs/heads/master@{#40434}
2016-10-19 13:06:44 +00:00
|
|
|
}
|
2016-01-21 16:10:53 +00:00
|
|
|
}
|
|
|
|
}
|
2016-07-12 21:37:07 +00:00
|
|
|
|
2016-12-19 17:22:55 +00:00
|
|
|
uint32_t AddBytes(Vector<const byte> bytes) {
|
2016-12-20 14:34:07 +00:00
|
|
|
Handle<SeqOneByteString> old_bytes(
|
|
|
|
instance_object_->compiled_module()->module_bytes(), isolate_);
|
2016-12-19 17:22:55 +00:00
|
|
|
uint32_t old_size = static_cast<uint32_t>(old_bytes->length());
|
|
|
|
ScopedVector<byte> new_bytes(old_size + bytes.length());
|
|
|
|
memcpy(new_bytes.start(), old_bytes->GetChars(), old_size);
|
|
|
|
memcpy(new_bytes.start() + old_size, bytes.start(), bytes.length());
|
|
|
|
Handle<SeqOneByteString> new_bytes_str = Handle<SeqOneByteString>::cast(
|
|
|
|
isolate_->factory()->NewStringFromOneByte(new_bytes).ToHandleChecked());
|
2016-12-20 14:34:07 +00:00
|
|
|
instance_object_->compiled_module()->shared()->set_module_bytes(
|
|
|
|
*new_bytes_str);
|
2016-12-19 17:22:55 +00:00
|
|
|
return old_size;
|
|
|
|
}
|
|
|
|
|
2016-05-24 16:32:03 +00:00
|
|
|
WasmFunction* GetFunctionAt(int index) { return &module_.functions[index]; }
|
2016-01-21 16:10:53 +00:00
|
|
|
|
2016-05-25 08:32:37 +00:00
|
|
|
WasmInterpreter* interpreter() { return interpreter_; }
|
|
|
|
WasmExecutionMode execution_mode() { return execution_mode_; }
|
2016-12-16 10:13:11 +00:00
|
|
|
Isolate* isolate() { return isolate_; }
|
2016-12-19 15:03:13 +00:00
|
|
|
Handle<WasmInstanceObject> instance_object() { return instance_object_; }
|
2016-05-25 08:32:37 +00:00
|
|
|
|
2016-01-14 09:48:45 +00:00
|
|
|
private:
|
2016-05-25 08:32:37 +00:00
|
|
|
WasmExecutionMode execution_mode_;
|
2016-02-18 15:58:02 +00:00
|
|
|
WasmModule module_;
|
2016-10-12 13:57:03 +00:00
|
|
|
WasmInstance instance_;
|
2016-05-20 08:04:43 +00:00
|
|
|
Isolate* isolate_;
|
2016-01-14 09:48:45 +00:00
|
|
|
uint32_t global_offset;
|
2016-02-02 12:44:58 +00:00
|
|
|
V8_ALIGNED(8) byte global_data[kMaxGlobalsSize]; // preallocated global data.
|
2016-05-25 08:32:37 +00:00
|
|
|
WasmInterpreter* interpreter_;
|
2016-12-19 15:03:13 +00:00
|
|
|
Handle<WasmInstanceObject> instance_object_;
|
2016-01-14 09:48:45 +00:00
|
|
|
|
2016-12-21 13:43:00 +00:00
|
|
|
const WasmGlobal* AddGlobal(ValueType type) {
|
2016-07-21 12:34:28 +00:00
|
|
|
byte size = WasmOpcodes::MemSize(WasmOpcodes::MachineTypeFor(type));
|
2016-01-14 09:48:45 +00:00
|
|
|
global_offset = (global_offset + size - 1) & ~(size - 1); // align
|
2016-09-27 20:46:10 +00:00
|
|
|
module_.globals.push_back(
|
2016-10-06 15:43:10 +00:00
|
|
|
{type, true, WasmInitExpr(), global_offset, false, false});
|
2016-01-14 09:48:45 +00:00
|
|
|
global_offset += size;
|
|
|
|
// limit number of globals.
|
|
|
|
CHECK_LT(global_offset, kMaxGlobalsSize);
|
2016-02-28 19:04:10 +00:00
|
|
|
return &module->globals.back();
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
2016-12-19 15:03:13 +00:00
|
|
|
|
|
|
|
Handle<WasmInstanceObject> InitInstanceObject() {
|
2016-12-20 14:34:07 +00:00
|
|
|
Handle<SeqOneByteString> empty_string = Handle<SeqOneByteString>::cast(
|
|
|
|
isolate_->factory()->NewStringFromOneByte({}).ToHandleChecked());
|
2016-12-19 15:03:13 +00:00
|
|
|
Handle<Managed<wasm::WasmModule>> module_wrapper =
|
|
|
|
Managed<wasm::WasmModule>::New(isolate_, &module_, false);
|
2016-12-20 14:34:07 +00:00
|
|
|
Handle<Script> script =
|
|
|
|
isolate_->factory()->NewScript(isolate_->factory()->empty_string());
|
|
|
|
script->set_type(Script::TYPE_WASM);
|
|
|
|
Handle<WasmSharedModuleData> shared_module_data =
|
|
|
|
WasmSharedModuleData::New(isolate_, module_wrapper, empty_string,
|
|
|
|
script, Handle<ByteArray>::null());
|
2016-12-19 15:03:13 +00:00
|
|
|
Handle<WasmCompiledModule> compiled_module =
|
2016-12-20 14:34:07 +00:00
|
|
|
WasmCompiledModule::New(isolate_, shared_module_data);
|
2016-12-19 15:03:13 +00:00
|
|
|
// Minimally initialize the compiled module such that IsWasmCompiledModule
|
|
|
|
// passes.
|
|
|
|
// If tests need more (correct) information, add it later.
|
|
|
|
compiled_module->set_min_mem_pages(0);
|
|
|
|
compiled_module->set_max_mem_pages(Smi::kMaxValue);
|
2017-01-20 13:50:09 +00:00
|
|
|
Handle<FixedArray> code_table = isolate_->factory()->NewFixedArray(0);
|
|
|
|
compiled_module->set_code_table(code_table);
|
|
|
|
Handle<FixedArray> weak_exported = isolate_->factory()->NewFixedArray(0);
|
|
|
|
compiled_module->set_weak_exported_functions(weak_exported);
|
2016-12-19 15:03:13 +00:00
|
|
|
DCHECK(WasmCompiledModule::IsWasmCompiledModule(*compiled_module));
|
|
|
|
return WasmInstanceObject::New(isolate_, compiled_module);
|
|
|
|
}
|
2016-01-14 09:48:45 +00:00
|
|
|
};
|
|
|
|
|
2016-03-07 21:04:07 +00:00
|
|
|
inline void TestBuildingGraph(Zone* zone, JSGraph* jsgraph, ModuleEnv* module,
|
2016-04-26 12:46:03 +00:00
|
|
|
FunctionSig* sig,
|
|
|
|
SourcePositionTable* source_position_table,
|
|
|
|
const byte* start, const byte* end) {
|
2017-01-04 05:14:04 +00:00
|
|
|
compiler::WasmGraphBuilder builder(module, zone, jsgraph, sig,
|
|
|
|
source_position_table);
|
2016-06-29 11:39:44 +00:00
|
|
|
DecodeResult result =
|
2017-01-04 05:14:04 +00:00
|
|
|
BuildTFGraph(zone->allocator(), &builder, sig, start, end);
|
2016-01-14 09:48:45 +00:00
|
|
|
if (result.failed()) {
|
2016-09-27 20:46:10 +00:00
|
|
|
if (!FLAG_trace_wasm_decoder) {
|
|
|
|
// Retry the compilation with the tracing flag on, to help in debugging.
|
|
|
|
FLAG_trace_wasm_decoder = true;
|
2017-01-04 05:14:04 +00:00
|
|
|
result = BuildTFGraph(zone->allocator(), &builder, sig, start, end);
|
2016-09-27 20:46:10 +00:00
|
|
|
}
|
|
|
|
|
2016-01-14 09:48:45 +00:00
|
|
|
ptrdiff_t pc = result.error_pc - result.start;
|
|
|
|
ptrdiff_t pt = result.error_pt - result.start;
|
|
|
|
std::ostringstream str;
|
|
|
|
str << "Verification failed: " << result.error_code << " pc = +" << pc;
|
|
|
|
if (result.error_pt) str << ", pt = +" << pt;
|
|
|
|
str << ", msg = " << result.error_msg.get();
|
|
|
|
FATAL(str.str().c_str());
|
|
|
|
}
|
2016-02-04 09:40:55 +00:00
|
|
|
builder.Int64LoweringForTesting();
|
2016-11-21 23:03:05 +00:00
|
|
|
if (!CpuFeatures::SupportsSimd128()) {
|
|
|
|
builder.SimdScalarLoweringForTesting();
|
|
|
|
}
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
class WasmFunctionWrapper : private GraphAndBuilders {
|
2016-02-18 09:55:25 +00:00
|
|
|
public:
|
2016-12-16 10:13:11 +00:00
|
|
|
explicit WasmFunctionWrapper(Zone* zone, int num_params)
|
|
|
|
: GraphAndBuilders(zone), inner_code_node_(nullptr), signature_(nullptr) {
|
2016-02-18 15:18:41 +00:00
|
|
|
// One additional parameter for the pointer to the return value memory.
|
2016-12-16 10:13:11 +00:00
|
|
|
Signature<MachineType>::Builder sig_builder(zone, 1, num_params + 1);
|
2016-02-18 09:55:25 +00:00
|
|
|
|
|
|
|
sig_builder.AddReturn(MachineType::Int32());
|
2016-12-16 10:13:11 +00:00
|
|
|
for (int i = 0; i < num_params + 1; i++) {
|
2016-02-18 09:55:25 +00:00
|
|
|
sig_builder.AddParam(MachineType::Pointer());
|
|
|
|
}
|
|
|
|
signature_ = sig_builder.Build();
|
|
|
|
}
|
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
void Init(CallDescriptor* descriptor, MachineType return_type,
|
|
|
|
Vector<MachineType> param_types) {
|
|
|
|
DCHECK_NOT_NULL(descriptor);
|
|
|
|
DCHECK_EQ(signature_->parameter_count(), param_types.length() + 1);
|
|
|
|
|
|
|
|
// Create the TF graph for the wrapper.
|
2016-02-18 09:55:25 +00:00
|
|
|
|
|
|
|
// Function, effect, and control.
|
2016-12-16 10:13:11 +00:00
|
|
|
Node** parameters = zone()->NewArray<Node*>(param_types.length() + 3);
|
2016-02-18 09:55:25 +00:00
|
|
|
graph()->SetStart(graph()->NewNode(common()->Start(6)));
|
|
|
|
Node* effect = graph()->start();
|
|
|
|
int parameter_count = 0;
|
|
|
|
|
|
|
|
// Dummy node which gets replaced in SetInnerCode.
|
|
|
|
inner_code_node_ = graph()->NewNode(common()->Int32Constant(0));
|
|
|
|
parameters[parameter_count++] = inner_code_node_;
|
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
int param_idx = 0;
|
|
|
|
for (MachineType t : param_types) {
|
|
|
|
DCHECK_NE(MachineType::None(), t);
|
2016-02-18 09:55:25 +00:00
|
|
|
parameters[parameter_count] = graph()->NewNode(
|
2016-12-16 10:13:11 +00:00
|
|
|
machine()->Load(t),
|
|
|
|
graph()->NewNode(common()->Parameter(param_idx++), graph()->start()),
|
2016-02-18 09:55:25 +00:00
|
|
|
graph()->NewNode(common()->Int32Constant(0)), effect,
|
|
|
|
graph()->start());
|
|
|
|
effect = parameters[parameter_count++];
|
|
|
|
}
|
|
|
|
|
|
|
|
parameters[parameter_count++] = effect;
|
|
|
|
parameters[parameter_count++] = graph()->start();
|
|
|
|
Node* call = graph()->NewNode(common()->Call(descriptor), parameter_count,
|
|
|
|
parameters);
|
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
if (!return_type.IsNone()) {
|
|
|
|
effect = graph()->NewNode(
|
|
|
|
machine()->Store(StoreRepresentation(
|
|
|
|
return_type.representation(), WriteBarrierKind::kNoWriteBarrier)),
|
|
|
|
graph()->NewNode(common()->Parameter(param_types.length()),
|
|
|
|
graph()->start()),
|
|
|
|
graph()->NewNode(common()->Int32Constant(0)), call, effect,
|
|
|
|
graph()->start());
|
|
|
|
}
|
2016-11-02 13:15:39 +00:00
|
|
|
Node* zero = graph()->NewNode(common()->Int32Constant(0));
|
2016-02-18 09:55:25 +00:00
|
|
|
Node* r = graph()->NewNode(
|
2016-11-02 13:15:39 +00:00
|
|
|
common()->Return(), zero,
|
2016-02-18 09:55:25 +00:00
|
|
|
graph()->NewNode(common()->Int32Constant(WASM_WRAPPER_RETURN_VALUE)),
|
|
|
|
effect, graph()->start());
|
|
|
|
graph()->SetEnd(graph()->NewNode(common()->End(2), r, graph()->start()));
|
|
|
|
}
|
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
template <typename ReturnType, typename... ParamTypes>
|
|
|
|
void Init(CallDescriptor* descriptor) {
|
|
|
|
std::array<MachineType, sizeof...(ParamTypes)> param_machine_types{
|
|
|
|
{MachineTypeForC<ParamTypes>()...}};
|
|
|
|
Vector<MachineType> param_vec(param_machine_types.data(),
|
|
|
|
param_machine_types.size());
|
|
|
|
Init(descriptor, MachineTypeForC<ReturnType>(), param_vec);
|
|
|
|
}
|
|
|
|
|
2016-02-18 09:55:25 +00:00
|
|
|
void SetInnerCode(Handle<Code> code_handle) {
|
|
|
|
NodeProperties::ChangeOp(inner_code_node_,
|
|
|
|
common()->HeapConstant(code_handle));
|
|
|
|
}
|
|
|
|
|
|
|
|
Handle<Code> GetWrapperCode() {
|
|
|
|
if (code_.is_null()) {
|
|
|
|
Isolate* isolate = CcTest::InitIsolateOnce();
|
|
|
|
|
|
|
|
CallDescriptor* descriptor =
|
|
|
|
Linkage::GetSimplifiedCDescriptor(zone(), signature_, true);
|
|
|
|
|
2016-02-18 15:18:41 +00:00
|
|
|
if (kPointerSize == 4) {
|
2016-12-16 10:13:11 +00:00
|
|
|
size_t num_params = signature_->parameter_count();
|
2016-02-18 15:18:41 +00:00
|
|
|
// One additional parameter for the pointer of the return value.
|
2016-12-16 10:13:11 +00:00
|
|
|
Signature<MachineRepresentation>::Builder rep_builder(zone(), 1,
|
|
|
|
num_params + 1);
|
2016-02-18 15:18:41 +00:00
|
|
|
|
|
|
|
rep_builder.AddReturn(MachineRepresentation::kWord32);
|
2016-12-16 10:13:11 +00:00
|
|
|
for (size_t i = 0; i < num_params + 1; i++) {
|
2016-02-18 15:18:41 +00:00
|
|
|
rep_builder.AddParam(MachineRepresentation::kWord32);
|
|
|
|
}
|
|
|
|
Int64Lowering r(graph(), machine(), common(), zone(),
|
|
|
|
rep_builder.Build());
|
|
|
|
r.LowerGraph();
|
|
|
|
}
|
|
|
|
|
2016-08-26 09:03:39 +00:00
|
|
|
CompilationInfo info(ArrayVector("testing"), isolate, graph()->zone(),
|
|
|
|
Code::ComputeFlags(Code::STUB));
|
2016-02-18 09:55:25 +00:00
|
|
|
code_ =
|
|
|
|
Pipeline::GenerateCodeForTesting(&info, descriptor, graph(), nullptr);
|
|
|
|
CHECK(!code_.is_null());
|
|
|
|
#ifdef ENABLE_DISASSEMBLER
|
|
|
|
if (FLAG_print_opt_code) {
|
|
|
|
OFStream os(stdout);
|
|
|
|
code_->Disassemble("wasm wrapper", os);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
return code_;
|
|
|
|
}
|
|
|
|
|
|
|
|
Signature<MachineType>* signature() const { return signature_; }
|
|
|
|
|
|
|
|
private:
|
|
|
|
Node* inner_code_node_;
|
|
|
|
Handle<Code> code_;
|
|
|
|
Signature<MachineType>* signature_;
|
|
|
|
};
|
2016-01-14 09:48:45 +00:00
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
// A helper for compiling WASM functions for testing.
|
|
|
|
// It contains the internal state for compilation (i.e. TurboFan graph) and
|
|
|
|
// interpretation (by adding to the interpreter manually).
|
|
|
|
class WasmFunctionCompiler : private GraphAndBuilders {
|
2016-01-14 09:48:45 +00:00
|
|
|
public:
|
2016-12-16 10:13:11 +00:00
|
|
|
Isolate* isolate() { return testing_module_->isolate(); }
|
2016-01-14 09:48:45 +00:00
|
|
|
Graph* graph() const { return main_graph_; }
|
|
|
|
Zone* zone() const { return graph()->zone(); }
|
|
|
|
CommonOperatorBuilder* common() { return &main_common_; }
|
|
|
|
MachineOperatorBuilder* machine() { return &main_machine_; }
|
2016-12-16 10:13:11 +00:00
|
|
|
CallDescriptor* descriptor() {
|
2016-02-18 09:55:25 +00:00
|
|
|
if (descriptor_ == nullptr) {
|
2016-12-16 10:13:11 +00:00
|
|
|
descriptor_ = testing_module_->GetWasmCallDescriptor(zone(), sig);
|
2016-02-18 09:55:25 +00:00
|
|
|
}
|
2016-12-16 10:13:11 +00:00
|
|
|
return descriptor_;
|
2016-02-18 09:55:25 +00:00
|
|
|
}
|
2016-05-25 08:32:37 +00:00
|
|
|
uint32_t function_index() { return function_->func_index; }
|
2016-01-14 09:48:45 +00:00
|
|
|
|
|
|
|
void Build(const byte* start, const byte* end) {
|
2017-01-15 21:18:53 +00:00
|
|
|
size_t locals_size = local_decls.Size();
|
|
|
|
size_t total_size = end - start + locals_size + 1;
|
|
|
|
byte* buffer = static_cast<byte*>(zone()->New(total_size));
|
|
|
|
// Prepend the local decls to the code.
|
|
|
|
local_decls.Emit(buffer);
|
|
|
|
// Emit the code.
|
|
|
|
memcpy(buffer + locals_size, start, end - start);
|
|
|
|
// Append an extra end opcode.
|
|
|
|
buffer[total_size - 1] = kExprEnd;
|
|
|
|
|
|
|
|
start = buffer;
|
|
|
|
end = buffer + total_size;
|
2016-12-19 17:22:55 +00:00
|
|
|
|
|
|
|
CHECK_GE(kMaxInt, end - start);
|
|
|
|
int len = static_cast<int>(end - start);
|
|
|
|
function_->code_start_offset =
|
|
|
|
testing_module_->AddBytes(Vector<const byte>(start, len));
|
|
|
|
function_->code_end_offset = function_->code_start_offset + len;
|
|
|
|
|
2016-05-25 08:32:37 +00:00
|
|
|
if (interpreter_) {
|
|
|
|
// Add the code to the interpreter.
|
|
|
|
CHECK(interpreter_->SetFunctionCodeForTesting(function_, start, end));
|
2016-12-16 10:13:11 +00:00
|
|
|
return;
|
2016-05-25 08:32:37 +00:00
|
|
|
}
|
2016-12-16 10:13:11 +00:00
|
|
|
|
|
|
|
// Build the TurboFan graph.
|
|
|
|
TestBuildingGraph(zone(), &jsgraph, testing_module_, sig,
|
|
|
|
&source_position_table_, start, end);
|
|
|
|
Handle<Code> code = Compile();
|
|
|
|
testing_module_->SetFunctionCode(function_index(), code);
|
2017-01-20 13:50:09 +00:00
|
|
|
|
|
|
|
// Add to code table.
|
|
|
|
Handle<WasmCompiledModule> compiled_module(
|
|
|
|
testing_module_->instance_object()->compiled_module(), isolate());
|
|
|
|
Handle<FixedArray> code_table = compiled_module->code_table();
|
|
|
|
code_table = FixedArray::SetAndGrow(code_table, function_index(), code);
|
|
|
|
compiled_module->set_code_table(code_table);
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
|
|
|
|
2016-12-21 13:43:00 +00:00
|
|
|
byte AllocateLocal(ValueType type) {
|
2016-05-17 17:53:46 +00:00
|
|
|
uint32_t index = local_decls.AddLocals(1, type);
|
2016-03-07 21:04:07 +00:00
|
|
|
byte result = static_cast<byte>(index);
|
|
|
|
DCHECK_EQ(index, result);
|
|
|
|
return result;
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
void SetSigIndex(int sig_index) { function_->sig_index = sig_index; }
|
|
|
|
|
|
|
|
private:
|
|
|
|
friend class WasmRunnerBase;
|
|
|
|
|
|
|
|
explicit WasmFunctionCompiler(Zone* zone, FunctionSig* sig,
|
2016-12-19 15:03:13 +00:00
|
|
|
TestingModule* module, const char* name)
|
2016-12-16 10:13:11 +00:00
|
|
|
: GraphAndBuilders(zone),
|
|
|
|
jsgraph(module->isolate(), this->graph(), this->common(), nullptr,
|
|
|
|
nullptr, this->machine()),
|
|
|
|
sig(sig),
|
|
|
|
descriptor_(nullptr),
|
|
|
|
testing_module_(module),
|
|
|
|
local_decls(zone, sig),
|
|
|
|
source_position_table_(this->graph()),
|
|
|
|
interpreter_(module->interpreter()) {
|
|
|
|
// Get a new function from the testing module.
|
2016-12-19 15:03:13 +00:00
|
|
|
int index = module->AddFunction(sig, Handle<Code>::null(), name);
|
2016-12-16 10:13:11 +00:00
|
|
|
function_ = testing_module_->GetFunctionAt(index);
|
|
|
|
}
|
|
|
|
|
2016-02-18 15:58:02 +00:00
|
|
|
Handle<Code> Compile() {
|
2016-12-16 10:13:11 +00:00
|
|
|
CallDescriptor* desc = descriptor();
|
2016-02-18 15:18:41 +00:00
|
|
|
if (kPointerSize == 4) {
|
2016-02-18 15:58:02 +00:00
|
|
|
desc = testing_module_->GetI32WasmCallDescriptor(this->zone(), desc);
|
2016-02-18 15:18:41 +00:00
|
|
|
}
|
2016-12-16 10:13:11 +00:00
|
|
|
CompilationInfo info(CStrVector("wasm"), this->isolate(), this->zone(),
|
2016-04-19 12:54:10 +00:00
|
|
|
Code::ComputeFlags(Code::WASM_FUNCTION));
|
2016-07-25 11:12:42 +00:00
|
|
|
std::unique_ptr<CompilationJob> job(Pipeline::NewWasmCompilationJob(
|
2017-02-01 11:51:59 +00:00
|
|
|
&info, &jsgraph, desc, &source_position_table_, nullptr, false));
|
2016-08-22 11:48:59 +00:00
|
|
|
if (job->ExecuteJob() != CompilationJob::SUCCEEDED ||
|
|
|
|
job->FinalizeJob() != CompilationJob::SUCCEEDED)
|
2016-04-29 12:24:58 +00:00
|
|
|
return Handle<Code>::null();
|
|
|
|
|
|
|
|
Handle<Code> code = info.code();
|
|
|
|
|
2016-12-19 15:03:13 +00:00
|
|
|
// Deopt data holds <WeakCell<wasm_instance>, func_index>.
|
2016-04-29 12:24:58 +00:00
|
|
|
DCHECK(code->deoptimization_data() == nullptr ||
|
|
|
|
code->deoptimization_data()->length() == 0);
|
|
|
|
Handle<FixedArray> deopt_data =
|
|
|
|
isolate()->factory()->NewFixedArray(2, TENURED);
|
2016-12-19 15:03:13 +00:00
|
|
|
Handle<Object> weak_instance =
|
|
|
|
isolate()->factory()->NewWeakCell(testing_module_->instance_object());
|
|
|
|
deopt_data->set(0, *weak_instance);
|
2016-05-25 08:32:37 +00:00
|
|
|
deopt_data->set(1, Smi::FromInt(static_cast<int>(function_index())));
|
2016-04-29 12:24:58 +00:00
|
|
|
deopt_data->set_length(2);
|
|
|
|
code->set_deoptimization_data(*deopt_data);
|
|
|
|
|
2016-01-14 09:48:45 +00:00
|
|
|
#ifdef ENABLE_DISASSEMBLER
|
2016-04-29 12:24:58 +00:00
|
|
|
if (FLAG_print_opt_code) {
|
2016-01-14 09:48:45 +00:00
|
|
|
OFStream os(stdout);
|
2016-04-26 12:46:03 +00:00
|
|
|
code->Disassemble("wasm code", os);
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-04-26 12:46:03 +00:00
|
|
|
return code;
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
JSGraph jsgraph;
|
|
|
|
FunctionSig* sig;
|
|
|
|
// The call descriptor is initialized when the function is compiled.
|
|
|
|
CallDescriptor* descriptor_;
|
|
|
|
TestingModule* testing_module_;
|
|
|
|
Vector<const char> debug_name_;
|
|
|
|
WasmFunction* function_;
|
|
|
|
LocalDeclEncoder local_decls;
|
|
|
|
SourcePositionTable source_position_table_;
|
|
|
|
WasmInterpreter* interpreter_;
|
2016-12-15 16:51:11 +00:00
|
|
|
};
|
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
// A helper class to build a module around Wasm bytecode, generate machine
|
2016-01-14 09:48:45 +00:00
|
|
|
// code, and run that code.
|
2016-12-16 10:13:11 +00:00
|
|
|
class WasmRunnerBase : public HandleAndZoneScope {
|
2016-01-14 09:48:45 +00:00
|
|
|
public:
|
2016-12-16 10:13:11 +00:00
|
|
|
explicit WasmRunnerBase(WasmExecutionMode execution_mode, int num_params)
|
|
|
|
: zone_(&allocator_, ZONE_NAME),
|
|
|
|
module_(&zone_, execution_mode),
|
|
|
|
wrapper_(&zone_, num_params) {}
|
2016-01-14 09:48:45 +00:00
|
|
|
|
2016-02-18 15:58:02 +00:00
|
|
|
// Builds a graph from the given Wasm code and generates the machine
|
2016-01-14 09:48:45 +00:00
|
|
|
// code and call wrapper for that graph. This method must not be called
|
|
|
|
// more than once.
|
|
|
|
void Build(const byte* start, const byte* end) {
|
2016-02-18 15:58:02 +00:00
|
|
|
CHECK(!compiled_);
|
|
|
|
compiled_ = true;
|
2016-12-16 10:13:11 +00:00
|
|
|
functions_[0]->Build(start, end);
|
|
|
|
}
|
2016-01-14 09:48:45 +00:00
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
// Resets the state for building the next function.
|
|
|
|
// The main function called will always be the first function.
|
|
|
|
template <typename ReturnType, typename... ParamTypes>
|
2016-12-19 15:03:13 +00:00
|
|
|
WasmFunctionCompiler& NewFunction(const char* name = nullptr) {
|
|
|
|
return NewFunction(CreateSig<ReturnType, ParamTypes...>(), name);
|
2016-12-16 10:13:11 +00:00
|
|
|
}
|
2016-01-14 09:48:45 +00:00
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
// Resets the state for building the next function.
|
|
|
|
// The main function called will be the last generated function.
|
|
|
|
// Returns the index of the previously built function.
|
2016-12-19 15:03:13 +00:00
|
|
|
WasmFunctionCompiler& NewFunction(FunctionSig* sig,
|
|
|
|
const char* name = nullptr) {
|
|
|
|
functions_.emplace_back(
|
|
|
|
new WasmFunctionCompiler(&zone_, sig, &module_, name));
|
2016-12-16 10:13:11 +00:00
|
|
|
return *functions_.back();
|
2016-05-25 08:32:37 +00:00
|
|
|
}
|
2016-01-14 09:48:45 +00:00
|
|
|
|
2016-12-21 13:43:00 +00:00
|
|
|
byte AllocateLocal(ValueType type) {
|
2016-12-16 10:13:11 +00:00
|
|
|
return functions_[0]->AllocateLocal(type);
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
|
|
|
|
2017-01-20 13:50:09 +00:00
|
|
|
uint32_t function_index() { return functions_[0]->function_index(); }
|
2016-12-16 10:13:11 +00:00
|
|
|
WasmFunction* function() { return functions_[0]->function_; }
|
|
|
|
WasmInterpreter* interpreter() { return functions_[0]->interpreter_; }
|
|
|
|
bool possible_nondeterminism() { return possible_nondeterminism_; }
|
|
|
|
TestingModule& module() { return module_; }
|
|
|
|
Zone* zone() { return &zone_; }
|
|
|
|
|
|
|
|
// Set the context, such that e.g. runtime functions can be called.
|
|
|
|
void SetModuleContext() {
|
|
|
|
if (!module_.instance->context.is_null()) {
|
|
|
|
CHECK(module_.instance->context.is_identical_to(
|
|
|
|
main_isolate()->native_context()));
|
|
|
|
return;
|
2016-05-25 08:32:37 +00:00
|
|
|
}
|
2016-12-16 10:13:11 +00:00
|
|
|
module_.instance->context = main_isolate()->native_context();
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
private:
|
|
|
|
FunctionSig* CreateSig(MachineType return_type,
|
|
|
|
Vector<MachineType> param_types) {
|
|
|
|
int return_count = return_type.IsNone() ? 0 : 1;
|
|
|
|
int param_count = param_types.length();
|
|
|
|
|
|
|
|
// Allocate storage array in zone.
|
2016-12-21 13:43:00 +00:00
|
|
|
ValueType* sig_types =
|
|
|
|
zone_.NewArray<ValueType>(return_count + param_count);
|
2016-12-16 10:13:11 +00:00
|
|
|
|
|
|
|
// Convert machine types to local types, and check that there are no
|
|
|
|
// MachineType::None()'s in the parameters.
|
|
|
|
int idx = 0;
|
2016-12-21 13:43:00 +00:00
|
|
|
if (return_count) sig_types[idx++] = WasmOpcodes::ValueTypeFor(return_type);
|
2016-12-16 10:13:11 +00:00
|
|
|
for (MachineType param : param_types) {
|
|
|
|
CHECK_NE(MachineType::None(), param);
|
2016-12-21 13:43:00 +00:00
|
|
|
sig_types[idx++] = WasmOpcodes::ValueTypeFor(param);
|
2016-12-15 16:51:11 +00:00
|
|
|
}
|
2016-12-16 10:13:11 +00:00
|
|
|
return new (&zone_) FunctionSig(return_count, param_count, sig_types);
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
template <typename ReturnType, typename... ParamTypes>
|
|
|
|
FunctionSig* CreateSig() {
|
|
|
|
std::array<MachineType, sizeof...(ParamTypes)> param_machine_types{
|
|
|
|
{MachineTypeForC<ParamTypes>()...}};
|
|
|
|
Vector<MachineType> param_vec(param_machine_types.data(),
|
|
|
|
param_machine_types.size());
|
|
|
|
return CreateSig(MachineTypeForC<ReturnType>(), param_vec);
|
2016-12-15 16:51:11 +00:00
|
|
|
}
|
2016-12-15 15:37:29 +00:00
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
protected:
|
|
|
|
v8::internal::AccountingAllocator allocator_;
|
|
|
|
Zone zone_;
|
|
|
|
TestingModule module_;
|
|
|
|
std::vector<std::unique_ptr<WasmFunctionCompiler>> functions_;
|
|
|
|
WasmFunctionWrapper wrapper_;
|
|
|
|
bool compiled_ = false;
|
|
|
|
bool possible_nondeterminism_ = false;
|
|
|
|
|
|
|
|
bool interpret() { return module_.execution_mode() == kExecuteInterpreted; }
|
|
|
|
|
|
|
|
public:
|
|
|
|
// This field has to be static. Otherwise, gcc complains about the using in
|
|
|
|
// the lambda context below.
|
[wasm] Introduce the TrapIf and TrapUnless operators to generate trap code.
Some instructions in WebAssembly trap for some inputs, which means that the
execution is terminated and (at least at the moment) a JavaScript exception is
thrown. Examples for traps are out-of-bounds memory accesses, or integer
divisions by zero.
Without the TrapIf and TrapUnless operators trap check in WebAssembly introduces 5
TurboFan nodes (branch, if_true, if_false, trap-reason constant, trap-position
constant), in addition to the trap condition itself. Additionally, each
WebAssembly function has four TurboFan nodes (merge, effect_phi, 2 phis) whose
number of inputs is linear to the number of trap checks in the function.
Especially for functions with high numbers of trap checks we observe a
significant slowdown in compilation time, down to 0.22 MiB/s in the sqlite
benchmark instead of the average of 3 MiB/s in other benchmarks. By introducing
a TrapIf common operator only a single node is necessary per trap check, in
addition to the trap condition. Also the nodes which are shared between trap
checks (merge, effect_phi, 2 phis) would disappear. First measurements suggest a
speedup of 30-50% on average.
This CL only implements TrapIf and TrapUnless on x64. The implementation is also
hidden behind the --wasm-trap-if flag.
Please take a special look at how the source position is transfered from the
instruction selector to the code generator, and at the context that is used for
the runtime call.
R=titzer@chromium.org
Review-Url: https://codereview.chromium.org/2562393002
Cr-Commit-Position: refs/heads/master@{#41720}
2016-12-15 13:31:29 +00:00
|
|
|
static jmp_buf jump_buffer;
|
2016-12-16 10:13:11 +00:00
|
|
|
};
|
[wasm] Introduce the TrapIf and TrapUnless operators to generate trap code.
Some instructions in WebAssembly trap for some inputs, which means that the
execution is terminated and (at least at the moment) a JavaScript exception is
thrown. Examples for traps are out-of-bounds memory accesses, or integer
divisions by zero.
Without the TrapIf and TrapUnless operators trap check in WebAssembly introduces 5
TurboFan nodes (branch, if_true, if_false, trap-reason constant, trap-position
constant), in addition to the trap condition itself. Additionally, each
WebAssembly function has four TurboFan nodes (merge, effect_phi, 2 phis) whose
number of inputs is linear to the number of trap checks in the function.
Especially for functions with high numbers of trap checks we observe a
significant slowdown in compilation time, down to 0.22 MiB/s in the sqlite
benchmark instead of the average of 3 MiB/s in other benchmarks. By introducing
a TrapIf common operator only a single node is necessary per trap check, in
addition to the trap condition. Also the nodes which are shared between trap
checks (merge, effect_phi, 2 phis) would disappear. First measurements suggest a
speedup of 30-50% on average.
This CL only implements TrapIf and TrapUnless on x64. The implementation is also
hidden behind the --wasm-trap-if flag.
Please take a special look at how the source position is transfered from the
instruction selector to the code generator, and at the context that is used for
the runtime call.
R=titzer@chromium.org
Review-Url: https://codereview.chromium.org/2562393002
Cr-Commit-Position: refs/heads/master@{#41720}
2016-12-15 13:31:29 +00:00
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
template <typename ReturnType, typename... ParamTypes>
|
|
|
|
class WasmRunner : public WasmRunnerBase {
|
|
|
|
public:
|
2016-12-19 15:03:13 +00:00
|
|
|
explicit WasmRunner(WasmExecutionMode execution_mode,
|
|
|
|
const char* main_fn_name = "main")
|
2016-12-16 10:13:11 +00:00
|
|
|
: WasmRunnerBase(execution_mode, sizeof...(ParamTypes)) {
|
2016-12-19 15:03:13 +00:00
|
|
|
NewFunction<ReturnType, ParamTypes...>(main_fn_name);
|
2016-12-16 10:13:11 +00:00
|
|
|
if (!interpret()) {
|
|
|
|
wrapper_.Init<ReturnType, ParamTypes...>(functions_[0]->descriptor());
|
|
|
|
}
|
[wasm] Introduce the TrapIf and TrapUnless operators to generate trap code.
Some instructions in WebAssembly trap for some inputs, which means that the
execution is terminated and (at least at the moment) a JavaScript exception is
thrown. Examples for traps are out-of-bounds memory accesses, or integer
divisions by zero.
Without the TrapIf and TrapUnless operators trap check in WebAssembly introduces 5
TurboFan nodes (branch, if_true, if_false, trap-reason constant, trap-position
constant), in addition to the trap condition itself. Additionally, each
WebAssembly function has four TurboFan nodes (merge, effect_phi, 2 phis) whose
number of inputs is linear to the number of trap checks in the function.
Especially for functions with high numbers of trap checks we observe a
significant slowdown in compilation time, down to 0.22 MiB/s in the sqlite
benchmark instead of the average of 3 MiB/s in other benchmarks. By introducing
a TrapIf common operator only a single node is necessary per trap check, in
addition to the trap condition. Also the nodes which are shared between trap
checks (merge, effect_phi, 2 phis) would disappear. First measurements suggest a
speedup of 30-50% on average.
This CL only implements TrapIf and TrapUnless on x64. The implementation is also
hidden behind the --wasm-trap-if flag.
Please take a special look at how the source position is transfered from the
instruction selector to the code generator, and at the context that is used for
the runtime call.
R=titzer@chromium.org
Review-Url: https://codereview.chromium.org/2562393002
Cr-Commit-Position: refs/heads/master@{#41720}
2016-12-15 13:31:29 +00:00
|
|
|
}
|
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
ReturnType Call(ParamTypes... p) {
|
|
|
|
DCHECK(compiled_);
|
|
|
|
if (interpret()) return CallInterpreter(p...);
|
|
|
|
|
|
|
|
// Use setjmp/longjmp to deal with traps in WebAssembly code.
|
2016-12-16 15:32:09 +00:00
|
|
|
ReturnType return_value = static_cast<ReturnType>(0xdeadbeefdeadbeef);
|
|
|
|
static int setjmp_ret;
|
|
|
|
setjmp_ret = setjmp(WasmRunnerBase::jump_buffer);
|
|
|
|
// setjmp returns 0 on the first return, 1 (passed to longjmp) after trap.
|
|
|
|
if (setjmp_ret == 0) {
|
|
|
|
DoCall(static_cast<void*>(&p)..., static_cast<void*>(&return_value));
|
|
|
|
}
|
2016-12-16 10:13:11 +00:00
|
|
|
return return_value;
|
2016-05-25 08:32:37 +00:00
|
|
|
}
|
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
ReturnType CallInterpreter(ParamTypes... p) {
|
2016-06-09 14:22:05 +00:00
|
|
|
WasmInterpreter::Thread* thread = interpreter()->GetThread(0);
|
|
|
|
thread->Reset();
|
2016-12-16 10:13:11 +00:00
|
|
|
std::array<WasmVal, sizeof...(p)> args{{WasmVal(p)...}};
|
|
|
|
thread->PushFrame(function(), args.data());
|
2016-06-09 14:22:05 +00:00
|
|
|
if (thread->Run() == WasmInterpreter::FINISHED) {
|
|
|
|
WasmVal val = thread->GetReturnValue();
|
2016-10-20 14:27:23 +00:00
|
|
|
possible_nondeterminism_ |= thread->PossibleNondeterminism();
|
2016-05-25 08:32:37 +00:00
|
|
|
return val.to<ReturnType>();
|
2016-06-09 14:22:05 +00:00
|
|
|
} else if (thread->state() == WasmInterpreter::TRAPPED) {
|
2016-05-25 08:32:37 +00:00
|
|
|
// TODO(titzer): return the correct trap code
|
|
|
|
int64_t result = 0xdeadbeefdeadbeef;
|
|
|
|
return static_cast<ReturnType>(result);
|
|
|
|
} else {
|
|
|
|
// TODO(titzer): falling off end
|
2016-12-16 10:13:11 +00:00
|
|
|
return ReturnType{0};
|
2016-05-25 08:32:37 +00:00
|
|
|
}
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
private:
|
|
|
|
// Don't inline this function. The setjmp above should be followed immediately
|
|
|
|
// by a call.
|
2016-12-16 15:32:09 +00:00
|
|
|
template <typename... Ptrs>
|
|
|
|
V8_NOINLINE void DoCall(Ptrs... ptrs) {
|
2016-12-16 10:13:11 +00:00
|
|
|
auto trap_callback = []() -> void {
|
|
|
|
set_trap_callback_for_testing(nullptr);
|
|
|
|
longjmp(WasmRunnerBase::jump_buffer, 1);
|
|
|
|
};
|
|
|
|
set_trap_callback_for_testing(trap_callback);
|
2016-12-15 16:51:11 +00:00
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
wrapper_.SetInnerCode(
|
|
|
|
module_.GetFunctionCode(functions_[0]->function_index()));
|
|
|
|
CodeRunner<int32_t> runner(CcTest::InitIsolateOnce(),
|
|
|
|
wrapper_.GetWrapperCode(), wrapper_.signature());
|
2016-12-16 15:32:09 +00:00
|
|
|
int32_t result = runner.Call(ptrs...);
|
2016-12-16 10:13:11 +00:00
|
|
|
// If we arrive here, no trap happened.
|
|
|
|
CHECK_EQ(WASM_WRAPPER_RETURN_VALUE, result);
|
2016-01-14 09:48:45 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2016-12-16 10:13:11 +00:00
|
|
|
// Declare static variable.
|
|
|
|
jmp_buf WasmRunnerBase::jump_buffer;
|
[wasm] Introduce the TrapIf and TrapUnless operators to generate trap code.
Some instructions in WebAssembly trap for some inputs, which means that the
execution is terminated and (at least at the moment) a JavaScript exception is
thrown. Examples for traps are out-of-bounds memory accesses, or integer
divisions by zero.
Without the TrapIf and TrapUnless operators trap check in WebAssembly introduces 5
TurboFan nodes (branch, if_true, if_false, trap-reason constant, trap-position
constant), in addition to the trap condition itself. Additionally, each
WebAssembly function has four TurboFan nodes (merge, effect_phi, 2 phis) whose
number of inputs is linear to the number of trap checks in the function.
Especially for functions with high numbers of trap checks we observe a
significant slowdown in compilation time, down to 0.22 MiB/s in the sqlite
benchmark instead of the average of 3 MiB/s in other benchmarks. By introducing
a TrapIf common operator only a single node is necessary per trap check, in
addition to the trap condition. Also the nodes which are shared between trap
checks (merge, effect_phi, 2 phis) would disappear. First measurements suggest a
speedup of 30-50% on average.
This CL only implements TrapIf and TrapUnless on x64. The implementation is also
hidden behind the --wasm-trap-if flag.
Please take a special look at how the source position is transfered from the
instruction selector to the code generator, and at the context that is used for
the runtime call.
R=titzer@chromium.org
Review-Url: https://codereview.chromium.org/2562393002
Cr-Commit-Position: refs/heads/master@{#41720}
2016-12-15 13:31:29 +00:00
|
|
|
|
2016-05-18 15:56:11 +00:00
|
|
|
// A macro to define tests that run in different engine configurations.
|
2016-05-25 08:32:37 +00:00
|
|
|
#define WASM_EXEC_TEST(name) \
|
|
|
|
void RunWasm_##name(WasmExecutionMode execution_mode); \
|
|
|
|
TEST(RunWasmCompiled_##name) { RunWasm_##name(kExecuteCompiled); } \
|
|
|
|
TEST(RunWasmInterpreted_##name) { RunWasm_##name(kExecuteInterpreted); } \
|
|
|
|
void RunWasm_##name(WasmExecutionMode execution_mode)
|
2016-05-18 15:56:11 +00:00
|
|
|
|
[wasm] Introduce the TrapIf and TrapUnless operators to generate trap code.
Some instructions in WebAssembly trap for some inputs, which means that the
execution is terminated and (at least at the moment) a JavaScript exception is
thrown. Examples for traps are out-of-bounds memory accesses, or integer
divisions by zero.
Without the TrapIf and TrapUnless operators trap check in WebAssembly introduces 5
TurboFan nodes (branch, if_true, if_false, trap-reason constant, trap-position
constant), in addition to the trap condition itself. Additionally, each
WebAssembly function has four TurboFan nodes (merge, effect_phi, 2 phis) whose
number of inputs is linear to the number of trap checks in the function.
Especially for functions with high numbers of trap checks we observe a
significant slowdown in compilation time, down to 0.22 MiB/s in the sqlite
benchmark instead of the average of 3 MiB/s in other benchmarks. By introducing
a TrapIf common operator only a single node is necessary per trap check, in
addition to the trap condition. Also the nodes which are shared between trap
checks (merge, effect_phi, 2 phis) would disappear. First measurements suggest a
speedup of 30-50% on average.
This CL only implements TrapIf and TrapUnless on x64. The implementation is also
hidden behind the --wasm-trap-if flag.
Please take a special look at how the source position is transfered from the
instruction selector to the code generator, and at the context that is used for
the runtime call.
R=titzer@chromium.org
Review-Url: https://codereview.chromium.org/2562393002
Cr-Commit-Position: refs/heads/master@{#41720}
2016-12-15 13:31:29 +00:00
|
|
|
#define WASM_EXEC_TEST_WITH_TRAP(name) \
|
|
|
|
void RunWasm_##name(WasmExecutionMode execution_mode); \
|
|
|
|
TEST(RunWasmCompiled_##name) { RunWasm_##name(kExecuteCompiled); } \
|
|
|
|
void RunWasm_##name(WasmExecutionMode execution_mode); \
|
2017-01-26 11:29:23 +00:00
|
|
|
TEST(RunWasmCompiledWithoutTrapIf_##name) { \
|
[wasm] Introduce the TrapIf and TrapUnless operators to generate trap code.
Some instructions in WebAssembly trap for some inputs, which means that the
execution is terminated and (at least at the moment) a JavaScript exception is
thrown. Examples for traps are out-of-bounds memory accesses, or integer
divisions by zero.
Without the TrapIf and TrapUnless operators trap check in WebAssembly introduces 5
TurboFan nodes (branch, if_true, if_false, trap-reason constant, trap-position
constant), in addition to the trap condition itself. Additionally, each
WebAssembly function has four TurboFan nodes (merge, effect_phi, 2 phis) whose
number of inputs is linear to the number of trap checks in the function.
Especially for functions with high numbers of trap checks we observe a
significant slowdown in compilation time, down to 0.22 MiB/s in the sqlite
benchmark instead of the average of 3 MiB/s in other benchmarks. By introducing
a TrapIf common operator only a single node is necessary per trap check, in
addition to the trap condition. Also the nodes which are shared between trap
checks (merge, effect_phi, 2 phis) would disappear. First measurements suggest a
speedup of 30-50% on average.
This CL only implements TrapIf and TrapUnless on x64. The implementation is also
hidden behind the --wasm-trap-if flag.
Please take a special look at how the source position is transfered from the
instruction selector to the code generator, and at the context that is used for
the runtime call.
R=titzer@chromium.org
Review-Url: https://codereview.chromium.org/2562393002
Cr-Commit-Position: refs/heads/master@{#41720}
2016-12-15 13:31:29 +00:00
|
|
|
bool trap_if = FLAG_wasm_trap_if; \
|
2017-01-26 11:29:23 +00:00
|
|
|
FLAG_wasm_trap_if = false; \
|
[wasm] Introduce the TrapIf and TrapUnless operators to generate trap code.
Some instructions in WebAssembly trap for some inputs, which means that the
execution is terminated and (at least at the moment) a JavaScript exception is
thrown. Examples for traps are out-of-bounds memory accesses, or integer
divisions by zero.
Without the TrapIf and TrapUnless operators trap check in WebAssembly introduces 5
TurboFan nodes (branch, if_true, if_false, trap-reason constant, trap-position
constant), in addition to the trap condition itself. Additionally, each
WebAssembly function has four TurboFan nodes (merge, effect_phi, 2 phis) whose
number of inputs is linear to the number of trap checks in the function.
Especially for functions with high numbers of trap checks we observe a
significant slowdown in compilation time, down to 0.22 MiB/s in the sqlite
benchmark instead of the average of 3 MiB/s in other benchmarks. By introducing
a TrapIf common operator only a single node is necessary per trap check, in
addition to the trap condition. Also the nodes which are shared between trap
checks (merge, effect_phi, 2 phis) would disappear. First measurements suggest a
speedup of 30-50% on average.
This CL only implements TrapIf and TrapUnless on x64. The implementation is also
hidden behind the --wasm-trap-if flag.
Please take a special look at how the source position is transfered from the
instruction selector to the code generator, and at the context that is used for
the runtime call.
R=titzer@chromium.org
Review-Url: https://codereview.chromium.org/2562393002
Cr-Commit-Position: refs/heads/master@{#41720}
2016-12-15 13:31:29 +00:00
|
|
|
RunWasm_##name(kExecuteCompiled); \
|
|
|
|
FLAG_wasm_trap_if = trap_if; \
|
|
|
|
} \
|
|
|
|
TEST(RunWasmInterpreted_##name) { RunWasm_##name(kExecuteInterpreted); } \
|
|
|
|
void RunWasm_##name(WasmExecutionMode execution_mode)
|
|
|
|
|
2016-12-02 03:47:20 +00:00
|
|
|
#define WASM_EXEC_COMPILED_TEST(name) \
|
|
|
|
void RunWasm_##name(WasmExecutionMode execution_mode); \
|
|
|
|
TEST(RunWasmCompiled_##name) { RunWasm_##name(kExecuteCompiled); } \
|
|
|
|
void RunWasm_##name(WasmExecutionMode execution_mode)
|
|
|
|
|
2016-01-14 09:48:45 +00:00
|
|
|
} // namespace
|
|
|
|
|
|
|
|
#endif
|