Only turn on UMA WASM metric when synchronous.
The code for UMA stats (in counters.h) is not thread safe, and can lead to using pointers with uninitialized values. Therefore, this CL turns them off when compiling asynchronously. It also turns back on several UMA stats that were previously turned off, but no longer need to because the code now knows if it is running synchronously. BUG=v8:6361 Review-Url: https://codereview.chromium.org/2864583004 Cr-Commit-Position: refs/heads/master@{#45168}
This commit is contained in:
parent
448501f687
commit
aad342d55b
@ -3937,24 +3937,27 @@ Vector<const char> GetDebugName(Zone* zone, wasm::WasmName name, int index) {
|
||||
|
||||
WasmCompilationUnit::WasmCompilationUnit(Isolate* isolate,
|
||||
wasm::ModuleBytesEnv* module_env,
|
||||
const wasm::WasmFunction* function)
|
||||
const wasm::WasmFunction* function,
|
||||
bool is_sync)
|
||||
: WasmCompilationUnit(
|
||||
isolate, &module_env->module_env,
|
||||
wasm::FunctionBody{
|
||||
function->sig, module_env->wire_bytes.start(),
|
||||
module_env->wire_bytes.start() + function->code_start_offset,
|
||||
module_env->wire_bytes.start() + function->code_end_offset},
|
||||
module_env->wire_bytes.GetNameOrNull(function),
|
||||
function->func_index) {}
|
||||
module_env->wire_bytes.GetNameOrNull(function), function->func_index,
|
||||
is_sync) {}
|
||||
|
||||
WasmCompilationUnit::WasmCompilationUnit(Isolate* isolate,
|
||||
wasm::ModuleEnv* module_env,
|
||||
wasm::FunctionBody body,
|
||||
wasm::WasmName name, int index)
|
||||
wasm::WasmName name, int index,
|
||||
bool is_sync)
|
||||
: isolate_(isolate),
|
||||
module_env_(module_env),
|
||||
func_body_(body),
|
||||
func_name_(name),
|
||||
is_sync_(is_sync),
|
||||
graph_zone_(new Zone(isolate->allocator(), ZONE_NAME)),
|
||||
jsgraph_(new (graph_zone()) JSGraph(
|
||||
isolate, new (graph_zone()) Graph(graph_zone()),
|
||||
@ -3982,9 +3985,18 @@ void WasmCompilationUnit::InitializeHandles() {
|
||||
|
||||
void WasmCompilationUnit::ExecuteCompilation() {
|
||||
DCHECK(handles_initialized_);
|
||||
// TODO(ahaas): The counters are not thread-safe at the moment.
|
||||
// HistogramTimerScope wasm_compile_function_time_scope(
|
||||
// isolate_->counters()->wasm_compile_function_time());
|
||||
if (is_sync_) {
|
||||
// TODO(karlschimpf): Make this work when asynchronous.
|
||||
// https://bugs.chromium.org/p/v8/issues/detail?id=6361
|
||||
HistogramTimerScope wasm_compile_function_time_scope(
|
||||
isolate_->counters()->wasm_compile_function_time());
|
||||
ExecuteCompilationInternal();
|
||||
return;
|
||||
}
|
||||
ExecuteCompilationInternal();
|
||||
}
|
||||
|
||||
void WasmCompilationUnit::ExecuteCompilationInternal() {
|
||||
if (FLAG_trace_wasm_compiler) {
|
||||
if (func_name_.start() != nullptr) {
|
||||
PrintF("Compiling WASM function %d:'%.*s'\n\n", func_index(),
|
||||
@ -4023,10 +4035,11 @@ void WasmCompilationUnit::ExecuteCompilation() {
|
||||
!module_env_->module->is_wasm()));
|
||||
ok_ = job_->ExecuteJob() == CompilationJob::SUCCEEDED;
|
||||
// TODO(bradnelson): Improve histogram handling of size_t.
|
||||
// TODO(ahaas): The counters are not thread-safe at the moment.
|
||||
// isolate_->counters()->wasm_compile_function_peak_memory_bytes()
|
||||
// ->AddSample(
|
||||
// static_cast<int>(jsgraph->graph()->zone()->allocation_size()));
|
||||
if (is_sync_)
|
||||
// TODO(karlschimpf): Make this work when asynchronous.
|
||||
// https://bugs.chromium.org/p/v8/issues/detail?id=6361
|
||||
isolate_->counters()->wasm_compile_function_peak_memory_bytes()->AddSample(
|
||||
static_cast<int>(jsgraph_->graph()->zone()->allocation_size()));
|
||||
|
||||
if (FLAG_trace_wasm_decode_time) {
|
||||
double pipeline_ms = pipeline_timer.Elapsed().InMillisecondsF();
|
||||
|
@ -48,9 +48,10 @@ namespace compiler {
|
||||
class WasmCompilationUnit final {
|
||||
public:
|
||||
WasmCompilationUnit(Isolate* isolate, wasm::ModuleBytesEnv* module_env,
|
||||
const wasm::WasmFunction* function);
|
||||
const wasm::WasmFunction* function, bool is_sync = true);
|
||||
WasmCompilationUnit(Isolate* isolate, wasm::ModuleEnv* module_env,
|
||||
wasm::FunctionBody body, wasm::WasmName name, int index);
|
||||
wasm::FunctionBody body, wasm::WasmName name, int index,
|
||||
bool is_sync = true);
|
||||
|
||||
Zone* graph_zone() { return graph_zone_.get(); }
|
||||
int func_index() const { return func_index_; }
|
||||
@ -71,6 +72,7 @@ class WasmCompilationUnit final {
|
||||
wasm::ModuleEnv* module_env_;
|
||||
wasm::FunctionBody func_body_;
|
||||
wasm::WasmName func_name_;
|
||||
bool is_sync_;
|
||||
// The graph zone is deallocated at the end of ExecuteCompilation.
|
||||
std::unique_ptr<Zone> graph_zone_;
|
||||
JSGraph* jsgraph_;
|
||||
@ -87,6 +89,8 @@ class WasmCompilationUnit final {
|
||||
protected_instructions_; // Instructions that are protected by the signal
|
||||
// handler.
|
||||
|
||||
void ExecuteCompilationInternal();
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(WasmCompilationUnit);
|
||||
};
|
||||
|
||||
|
@ -1137,22 +1137,22 @@ class ModuleDecoder : public Decoder {
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
||||
ModuleResult DecodeWasmModule(Isolate* isolate, const byte* module_start,
|
||||
const byte* module_end, bool verify_functions,
|
||||
ModuleOrigin origin) {
|
||||
HistogramTimerScope wasm_decode_module_time_scope(
|
||||
IsWasm(origin) ? isolate->counters()->wasm_decode_wasm_module_time()
|
||||
: isolate->counters()->wasm_decode_asm_module_time());
|
||||
ModuleResult DecodeWasmModuleInternal(Isolate* isolate,
|
||||
const byte* module_start,
|
||||
const byte* module_end,
|
||||
bool verify_functions,
|
||||
ModuleOrigin origin, bool is_sync) {
|
||||
size_t size = module_end - module_start;
|
||||
if (module_start > module_end) return ModuleResult::Error("start > end");
|
||||
if (size >= kV8MaxWasmModuleSize)
|
||||
return ModuleResult::Error("size > maximum module size: %zu", size);
|
||||
// TODO(bradnelson): Improve histogram handling of size_t.
|
||||
(IsWasm(origin) ? isolate->counters()->wasm_wasm_module_size_bytes()
|
||||
: isolate->counters()->wasm_asm_module_size_bytes())
|
||||
->AddSample(static_cast<int>(size));
|
||||
if (is_sync)
|
||||
// TODO(karlschimpf): Make this work when asynchronous.
|
||||
// https://bugs.chromium.org/p/v8/issues/detail?id=6361
|
||||
(IsWasm(origin) ? isolate->counters()->wasm_wasm_module_size_bytes()
|
||||
: isolate->counters()->wasm_asm_module_size_bytes())
|
||||
->AddSample(static_cast<int>(size));
|
||||
// Signatures are stored in zone memory, which have the same lifetime
|
||||
// as the {module}.
|
||||
Zone* zone = new Zone(isolate->allocator(), ZONE_NAME);
|
||||
@ -1162,13 +1162,34 @@ ModuleResult DecodeWasmModule(Isolate* isolate, const byte* module_start,
|
||||
// TODO(titzer): this isn't accurate, since it doesn't count the data
|
||||
// allocated on the C++ heap.
|
||||
// https://bugs.chromium.org/p/chromium/issues/detail?id=657320
|
||||
(IsWasm(origin)
|
||||
? isolate->counters()->wasm_decode_wasm_module_peak_memory_bytes()
|
||||
: isolate->counters()->wasm_decode_asm_module_peak_memory_bytes())
|
||||
->AddSample(static_cast<int>(zone->allocation_size()));
|
||||
if (is_sync)
|
||||
// TODO(karlschimpf): Make this work when asynchronous.
|
||||
// https://bugs.chromium.org/p/v8/issues/detail?id=6361
|
||||
(IsWasm(origin)
|
||||
? isolate->counters()->wasm_decode_wasm_module_peak_memory_bytes()
|
||||
: isolate->counters()->wasm_decode_asm_module_peak_memory_bytes())
|
||||
->AddSample(static_cast<int>(zone->allocation_size()));
|
||||
return result;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
ModuleResult DecodeWasmModule(Isolate* isolate, const byte* module_start,
|
||||
const byte* module_end, bool verify_functions,
|
||||
ModuleOrigin origin, bool is_sync) {
|
||||
if (is_sync) {
|
||||
// TODO(karlschimpf): Make this work when asynchronous.
|
||||
// https://bugs.chromium.org/p/v8/issues/detail?id=6361
|
||||
HistogramTimerScope wasm_decode_module_time_scope(
|
||||
IsWasm(origin) ? isolate->counters()->wasm_decode_wasm_module_time()
|
||||
: isolate->counters()->wasm_decode_asm_module_time());
|
||||
return DecodeWasmModuleInternal(isolate, module_start, module_end,
|
||||
verify_functions, origin, true);
|
||||
}
|
||||
return DecodeWasmModuleInternal(isolate, module_start, module_end,
|
||||
verify_functions, origin, false);
|
||||
}
|
||||
|
||||
FunctionSig* DecodeWasmSignatureForTesting(Zone* zone, const byte* start,
|
||||
const byte* end) {
|
||||
ModuleDecoder decoder(zone, start, end, kWasmOrigin);
|
||||
@ -1182,27 +1203,55 @@ WasmInitExpr DecodeWasmInitExprForTesting(const byte* start, const byte* end) {
|
||||
return decoder.DecodeInitExpr(start);
|
||||
}
|
||||
|
||||
FunctionResult DecodeWasmFunction(Isolate* isolate, Zone* zone,
|
||||
ModuleBytesEnv* module_env,
|
||||
const byte* function_start,
|
||||
const byte* function_end) {
|
||||
bool is_wasm = module_env->module_env.is_wasm();
|
||||
HistogramTimerScope wasm_decode_function_time_scope(
|
||||
is_wasm ? isolate->counters()->wasm_decode_wasm_function_time()
|
||||
: isolate->counters()->wasm_decode_asm_function_time());
|
||||
namespace {
|
||||
|
||||
FunctionResult DecodeWasmFunctionInternal(Isolate* isolate, Zone* zone,
|
||||
ModuleBytesEnv* module_env,
|
||||
const byte* function_start,
|
||||
const byte* function_end,
|
||||
bool is_sync) {
|
||||
size_t size = function_end - function_start;
|
||||
if (function_start > function_end)
|
||||
return FunctionResult::Error("start > end");
|
||||
if (size > kV8MaxWasmFunctionSize)
|
||||
return FunctionResult::Error("size > maximum function size: %zu", size);
|
||||
(is_wasm ? isolate->counters()->wasm_wasm_function_size_bytes()
|
||||
: isolate->counters()->wasm_asm_function_size_bytes())
|
||||
->AddSample(static_cast<int>(size));
|
||||
if (is_sync) {
|
||||
// TODO(karlschimpf): Make this work when asynchronous.
|
||||
// https://bugs.chromium.org/p/v8/issues/detail?id=6361
|
||||
bool is_wasm = module_env->module_env.is_wasm();
|
||||
(is_wasm ? isolate->counters()->wasm_wasm_function_size_bytes()
|
||||
: isolate->counters()->wasm_asm_function_size_bytes())
|
||||
->AddSample(static_cast<int>(size));
|
||||
}
|
||||
ModuleDecoder decoder(zone, function_start, function_end, kWasmOrigin);
|
||||
return decoder.DecodeSingleFunction(
|
||||
module_env, std::unique_ptr<WasmFunction>(new WasmFunction()));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
FunctionResult DecodeWasmFunction(Isolate* isolate, Zone* zone,
|
||||
ModuleBytesEnv* module_env,
|
||||
const byte* function_start,
|
||||
const byte* function_end, bool is_sync) {
|
||||
if (is_sync) {
|
||||
// TODO(karlschimpf): Make this work when asynchronous.
|
||||
// https://bugs.chromium.org/p/v8/issues/detail?id=6361
|
||||
size_t size = function_end - function_start;
|
||||
bool is_wasm = module_env->module_env.is_wasm();
|
||||
(is_wasm ? isolate->counters()->wasm_wasm_function_size_bytes()
|
||||
: isolate->counters()->wasm_asm_function_size_bytes())
|
||||
->AddSample(static_cast<int>(size));
|
||||
HistogramTimerScope wasm_decode_function_time_scope(
|
||||
is_wasm ? isolate->counters()->wasm_decode_wasm_function_time()
|
||||
: isolate->counters()->wasm_decode_asm_function_time());
|
||||
return DecodeWasmFunctionInternal(isolate, zone, module_env, function_start,
|
||||
function_end, true);
|
||||
}
|
||||
return DecodeWasmFunctionInternal(isolate, zone, module_env, function_start,
|
||||
function_end, false);
|
||||
}
|
||||
|
||||
AsmJsOffsetsResult DecodeAsmJsOffsets(const byte* tables_start,
|
||||
const byte* tables_end) {
|
||||
AsmJsOffsets table;
|
||||
|
@ -57,11 +57,9 @@ typedef std::vector<std::vector<AsmJsOffsetEntry>> AsmJsOffsets;
|
||||
typedef Result<AsmJsOffsets> AsmJsOffsetsResult;
|
||||
|
||||
// Decodes the bytes of a WASM module between {module_start} and {module_end}.
|
||||
V8_EXPORT_PRIVATE ModuleResult DecodeWasmModule(Isolate* isolate,
|
||||
const byte* module_start,
|
||||
const byte* module_end,
|
||||
bool verify_functions,
|
||||
ModuleOrigin origin);
|
||||
V8_EXPORT_PRIVATE ModuleResult DecodeWasmModule(
|
||||
Isolate* isolate, const byte* module_start, const byte* module_end,
|
||||
bool verify_functions, ModuleOrigin origin, bool is_sync = true);
|
||||
|
||||
// Exposed for testing. Decodes a single function signature, allocating it
|
||||
// in the given zone. Returns {nullptr} upon failure.
|
||||
@ -71,11 +69,9 @@ V8_EXPORT_PRIVATE FunctionSig* DecodeWasmSignatureForTesting(Zone* zone,
|
||||
|
||||
// Decodes the bytes of a WASM function between
|
||||
// {function_start} and {function_end}.
|
||||
V8_EXPORT_PRIVATE FunctionResult DecodeWasmFunction(Isolate* isolate,
|
||||
Zone* zone,
|
||||
ModuleBytesEnv* env,
|
||||
const byte* function_start,
|
||||
const byte* function_end);
|
||||
V8_EXPORT_PRIVATE FunctionResult DecodeWasmFunction(
|
||||
Isolate* isolate, Zone* zone, ModuleBytesEnv* env,
|
||||
const byte* function_start, const byte* function_end, bool is_sync = true);
|
||||
|
||||
V8_EXPORT_PRIVATE WasmInitExpr DecodeWasmInitExprForTesting(const byte* start,
|
||||
const byte* end);
|
||||
|
@ -72,16 +72,22 @@ static void MemoryFinalizer(const v8::WeakCallbackInfo<void>& data) {
|
||||
GlobalHandles::Destroy(reinterpret_cast<Object**>(p));
|
||||
}
|
||||
|
||||
static void RecordStats(Isolate* isolate, Code* code) {
|
||||
isolate->counters()->wasm_generated_code_size()->Increment(code->body_size());
|
||||
isolate->counters()->wasm_reloc_size()->Increment(
|
||||
code->relocation_info()->length());
|
||||
static void RecordStats(Isolate* isolate, Code* code, bool is_sync) {
|
||||
if (is_sync) {
|
||||
// TODO(karlschimpf): Make this work when asynchronous.
|
||||
// https://bugs.chromium.org/p/v8/issues/detail?id=6361
|
||||
isolate->counters()->wasm_generated_code_size()->Increment(
|
||||
code->body_size());
|
||||
isolate->counters()->wasm_reloc_size()->Increment(
|
||||
code->relocation_info()->length());
|
||||
}
|
||||
}
|
||||
|
||||
static void RecordStats(Isolate* isolate, Handle<FixedArray> functions) {
|
||||
static void RecordStats(Isolate* isolate, Handle<FixedArray> functions,
|
||||
bool is_sync) {
|
||||
DisallowHeapAllocation no_gc;
|
||||
for (int i = 0; i < functions->length(); ++i) {
|
||||
RecordStats(isolate, Code::cast(functions->get(i)));
|
||||
RecordStats(isolate, Code::cast(functions->get(i)), is_sync);
|
||||
}
|
||||
}
|
||||
|
||||
@ -304,8 +310,9 @@ class CompilationHelper {
|
||||
// In {CompileToModuleObject}, it will transfer ownership to the generated
|
||||
// {WasmModuleWrapper}. If this method is not called, ownership may be
|
||||
// reclaimed by explicitely releasing the {module_} field.
|
||||
CompilationHelper(Isolate* isolate, std::unique_ptr<WasmModule> module)
|
||||
: isolate_(isolate), module_(std::move(module)) {}
|
||||
CompilationHelper(Isolate* isolate, std::unique_ptr<WasmModule> module,
|
||||
bool is_sync)
|
||||
: isolate_(isolate), module_(std::move(module)), is_sync_(is_sync) {}
|
||||
|
||||
// The actual runnable task that performs compilations in the background.
|
||||
class CompilationTask : public CancelableTask {
|
||||
@ -323,6 +330,7 @@ class CompilationHelper {
|
||||
|
||||
Isolate* isolate_;
|
||||
std::unique_ptr<WasmModule> module_;
|
||||
bool is_sync_;
|
||||
std::vector<std::unique_ptr<compiler::WasmCompilationUnit>>
|
||||
compilation_units_;
|
||||
std::queue<std::unique_ptr<compiler::WasmCompilationUnit>> executed_units_;
|
||||
@ -360,9 +368,11 @@ class CompilationHelper {
|
||||
compilation_units_.reserve(funcs_to_compile);
|
||||
for (uint32_t i = start; i < num_funcs; ++i) {
|
||||
const WasmFunction* func = &functions[i];
|
||||
constexpr bool is_sync = true;
|
||||
compilation_units_.push_back(
|
||||
std::unique_ptr<compiler::WasmCompilationUnit>(
|
||||
new compiler::WasmCompilationUnit(isolate_, &module_env, func)));
|
||||
new compiler::WasmCompilationUnit(isolate_, &module_env, func,
|
||||
!is_sync)));
|
||||
}
|
||||
return funcs_to_compile;
|
||||
}
|
||||
@ -528,12 +538,30 @@ class CompilationHelper {
|
||||
signature_tables->set(i, *temp_instance.signature_tables[i]);
|
||||
}
|
||||
|
||||
HistogramTimerScope wasm_compile_module_time_scope(
|
||||
module_->is_wasm()
|
||||
? isolate_->counters()->wasm_compile_wasm_module_time()
|
||||
: isolate_->counters()->wasm_compile_asm_module_time());
|
||||
if (is_sync_) {
|
||||
// TODO(karlschimpf): Make this work when asynchronous.
|
||||
// https://bugs.chromium.org/p/v8/issues/detail?id=6361
|
||||
HistogramTimerScope wasm_compile_module_time_scope(
|
||||
module_->is_wasm()
|
||||
? isolate_->counters()->wasm_compile_wasm_module_time()
|
||||
: isolate_->counters()->wasm_compile_asm_module_time());
|
||||
return CompileToModuleObjectInternal(
|
||||
thrower, wire_bytes, asm_js_script, asm_js_offset_table_bytes,
|
||||
factory, &temp_instance, &function_tables, &signature_tables);
|
||||
}
|
||||
return CompileToModuleObjectInternal(
|
||||
thrower, wire_bytes, asm_js_script, asm_js_offset_table_bytes, factory,
|
||||
&temp_instance, &function_tables, &signature_tables);
|
||||
}
|
||||
|
||||
ModuleBytesEnv module_env(module_.get(), &temp_instance, wire_bytes);
|
||||
private:
|
||||
MaybeHandle<WasmModuleObject> CompileToModuleObjectInternal(
|
||||
ErrorThrower* thrower, const ModuleWireBytes& wire_bytes,
|
||||
Handle<Script> asm_js_script,
|
||||
Vector<const byte> asm_js_offset_table_bytes, Factory* factory,
|
||||
WasmInstance* temp_instance, Handle<FixedArray>* function_tables,
|
||||
Handle<FixedArray>* signature_tables) {
|
||||
ModuleBytesEnv module_env(module_.get(), temp_instance, wire_bytes);
|
||||
|
||||
// The {code_table} array contains import wrappers and functions (which
|
||||
// are both included in {functions.size()}, and export wrappers.
|
||||
@ -554,12 +582,16 @@ class CompilationHelper {
|
||||
for (int i = 0, e = static_cast<int>(module_->functions.size()); i < e;
|
||||
++i) {
|
||||
code_table->set(i, *init_builtin);
|
||||
temp_instance.function_code[i] = init_builtin;
|
||||
temp_instance->function_code[i] = init_builtin;
|
||||
}
|
||||
|
||||
(module_->is_wasm() ? isolate_->counters()->wasm_functions_per_wasm_module()
|
||||
: isolate_->counters()->wasm_functions_per_asm_module())
|
||||
->AddSample(static_cast<int>(module_->functions.size()));
|
||||
if (is_sync_)
|
||||
// TODO(karlschimpf): Make this work when asynchronous.
|
||||
// https://bugs.chromium.org/p/v8/issues/detail?id=6361
|
||||
(module_->is_wasm()
|
||||
? isolate_->counters()->wasm_functions_per_wasm_module()
|
||||
: isolate_->counters()->wasm_functions_per_asm_module())
|
||||
->AddSample(static_cast<int>(module_->functions.size()));
|
||||
|
||||
if (!lazy_compile) {
|
||||
size_t funcs_to_compile =
|
||||
@ -567,21 +599,21 @@ class CompilationHelper {
|
||||
if (!FLAG_trace_wasm_decoder && FLAG_wasm_num_compilation_tasks != 0 &&
|
||||
funcs_to_compile > 1) {
|
||||
// Avoid a race condition by collecting results into a second vector.
|
||||
std::vector<Handle<Code>> results(temp_instance.function_code);
|
||||
std::vector<Handle<Code>> results(temp_instance->function_code);
|
||||
CompileInParallel(&module_env, results, thrower);
|
||||
temp_instance.function_code.swap(results);
|
||||
temp_instance->function_code.swap(results);
|
||||
} else {
|
||||
CompileSequentially(&module_env, temp_instance.function_code, thrower);
|
||||
CompileSequentially(&module_env, temp_instance->function_code, thrower);
|
||||
}
|
||||
if (thrower->error()) return {};
|
||||
}
|
||||
|
||||
// At this point, compilation has completed. Update the code table.
|
||||
for (size_t i = FLAG_skip_compiling_wasm_funcs;
|
||||
i < temp_instance.function_code.size(); ++i) {
|
||||
Code* code = *temp_instance.function_code[i];
|
||||
i < temp_instance->function_code.size(); ++i) {
|
||||
Code* code = *temp_instance->function_code[i];
|
||||
code_table->set(static_cast<int>(i), code);
|
||||
RecordStats(isolate_, code);
|
||||
RecordStats(isolate_, code, is_sync_);
|
||||
}
|
||||
|
||||
// Create heap objects for script, module bytes and asm.js offset table to
|
||||
@ -627,7 +659,7 @@ class CompilationHelper {
|
||||
// serializable. Instantiation may occur off a deserialized version of this
|
||||
// object.
|
||||
Handle<WasmCompiledModule> compiled_module = WasmCompiledModule::New(
|
||||
isolate_, shared, code_table, function_tables, signature_tables);
|
||||
isolate_, shared, code_table, *function_tables, *signature_tables);
|
||||
|
||||
// If we created a wasm script, finish it now and make it public to the
|
||||
// debugger.
|
||||
@ -649,7 +681,7 @@ class CompilationHelper {
|
||||
int export_index =
|
||||
static_cast<int>(module->functions.size() + func_index);
|
||||
code_table->set(export_index, *wrapper_code);
|
||||
RecordStats(isolate_, *wrapper_code);
|
||||
RecordStats(isolate_, *wrapper_code, is_sync_);
|
||||
func_index++;
|
||||
}
|
||||
|
||||
@ -1139,7 +1171,7 @@ class InstantiationHelper {
|
||||
UNREACHABLE();
|
||||
}
|
||||
}
|
||||
RecordStats(isolate_, code_table);
|
||||
RecordStats(isolate_, code_table, is_sync_);
|
||||
} else {
|
||||
// There was no owner, so we can reuse the original.
|
||||
compiled_module_ = original;
|
||||
@ -1416,7 +1448,7 @@ class InstantiationHelper {
|
||||
Handle<WasmExportedFunction> startup_fct = WasmExportedFunction::New(
|
||||
isolate_, instance, MaybeHandle<String>(), start_index,
|
||||
static_cast<int>(sig->parameter_count()), wrapper_code);
|
||||
RecordStats(isolate_, *startup_code);
|
||||
RecordStats(isolate_, *startup_code, is_sync_);
|
||||
// Call the JS function.
|
||||
Handle<Object> undefined = factory->undefined_value();
|
||||
MaybeHandle<Object> retval =
|
||||
@ -1450,6 +1482,7 @@ class InstantiationHelper {
|
||||
|
||||
Isolate* isolate_;
|
||||
WasmModule* const module_;
|
||||
constexpr static bool is_sync_ = true;
|
||||
ErrorThrower* thrower_;
|
||||
Handle<WasmModuleObject> module_object_;
|
||||
Handle<JSReceiver> ffi_; // TODO(titzer): Use MaybeHandle
|
||||
@ -1621,7 +1654,7 @@ class InstantiationHelper {
|
||||
return -1;
|
||||
}
|
||||
code_table->set(num_imported_functions, *import_wrapper);
|
||||
RecordStats(isolate_, *import_wrapper);
|
||||
RecordStats(isolate_, *import_wrapper, is_sync_);
|
||||
num_imported_functions++;
|
||||
break;
|
||||
}
|
||||
@ -2492,7 +2525,8 @@ MaybeHandle<WasmModuleObject> wasm::SyncCompileTranslatedAsmJs(
|
||||
|
||||
// Transfer ownership to the {WasmModuleWrapper} generated in
|
||||
// {CompileToModuleObject}.
|
||||
CompilationHelper helper(isolate, std::move(result.val));
|
||||
constexpr bool is_sync = true;
|
||||
CompilationHelper helper(isolate, std::move(result.val), is_sync);
|
||||
return helper.CompileToModuleObject(thrower, bytes, asm_js_script,
|
||||
asm_js_offset_table_bytes);
|
||||
}
|
||||
@ -2514,7 +2548,8 @@ MaybeHandle<WasmModuleObject> wasm::SyncCompile(Isolate* isolate,
|
||||
|
||||
// Transfer ownership to the {WasmModuleWrapper} generated in
|
||||
// {CompileToModuleObject}.
|
||||
CompilationHelper helper(isolate, std::move(result.val));
|
||||
constexpr bool is_sync = true;
|
||||
CompilationHelper helper(isolate, std::move(result.val), is_sync);
|
||||
return helper.CompileToModuleObject(thrower, bytes, Handle<Script>(),
|
||||
Vector<const byte>());
|
||||
}
|
||||
@ -2698,8 +2733,10 @@ class AsyncCompileJob {
|
||||
DisallowHeapAllocation no_allocation;
|
||||
// Decode the module bytes.
|
||||
TRACE_COMPILE("(1) Decoding module...\n");
|
||||
constexpr bool is_sync = true;
|
||||
result = DecodeWasmModule(job_->isolate_, job_->wire_bytes_.start(),
|
||||
job_->wire_bytes_.end(), false, kWasmOrigin);
|
||||
job_->wire_bytes_.end(), false, kWasmOrigin,
|
||||
!is_sync);
|
||||
}
|
||||
if (result.failed()) {
|
||||
// Decoding failure; reject the promise and clean up.
|
||||
@ -2792,8 +2829,9 @@ class AsyncCompileJob {
|
||||
// Transfer ownership of the {WasmModule} to the {CompilationHelper}, but
|
||||
// keep a pointer.
|
||||
WasmModule* module = module_.get();
|
||||
constexpr bool is_sync = true;
|
||||
job_->helper_.reset(
|
||||
new CompilationHelper(job_->isolate_, std::move(module_)));
|
||||
new CompilationHelper(job_->isolate_, std::move(module_), !is_sync));
|
||||
|
||||
DCHECK_LE(module->num_imported_functions, module->functions.size());
|
||||
size_t num_functions =
|
||||
@ -2934,10 +2972,11 @@ class AsyncCompileJob {
|
||||
TRACE_COMPILE("(5b) Finish compile...\n");
|
||||
HandleScope scope(job_->isolate_);
|
||||
// At this point, compilation has completed. Update the code table.
|
||||
constexpr bool is_sync = true;
|
||||
for (size_t i = FLAG_skip_compiling_wasm_funcs;
|
||||
i < job_->temp_instance_->function_code.size(); ++i) {
|
||||
Code* code = Code::cast(job_->code_table_->get(static_cast<int>(i)));
|
||||
RecordStats(job_->isolate_, code);
|
||||
RecordStats(job_->isolate_, code, !is_sync);
|
||||
}
|
||||
|
||||
// Create heap objects for script and module bytes to be stored in the
|
||||
@ -3003,6 +3042,7 @@ class AsyncCompileJob {
|
||||
HandleScope scope(job_->isolate_);
|
||||
JSToWasmWrapperCache js_to_wasm_cache;
|
||||
int func_index = 0;
|
||||
constexpr bool is_sync = true;
|
||||
WasmModule* module = job_->compiled_module_->module();
|
||||
for (auto exp : module->export_table) {
|
||||
if (exp.kind != kExternalFunction) continue;
|
||||
@ -3014,7 +3054,7 @@ class AsyncCompileJob {
|
||||
int export_index =
|
||||
static_cast<int>(module->functions.size() + func_index);
|
||||
job_->code_table_->set(export_index, *wrapper_code);
|
||||
RecordStats(job_->isolate_, *wrapper_code);
|
||||
RecordStats(job_->isolate_, *wrapper_code, !is_sync);
|
||||
func_index++;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user