Commit f5f22cfc authored by bradnelson's avatar bradnelson Committed by Commit bot

Revert of [wasm][asm.js] Do same work even when not printing asm info....

Revert of [wasm][asm.js] Do same work even when not printing asm info. (patchset #1 id:1 of https://codereview.chromium.org/2629043002/ )

Reason for revert:
Triggers flaky tests.

Original issue's description:
> [wasm][asm.js] Do same work even when not printing asm info.
>
> Skipping this work seems to perturb a gc-stress issue.
> More investigation is likely needed.
>
> BUG=v8:4203
> R=danno@chromium.org
>
> Review-Url: https://codereview.chromium.org/2629043002
> Cr-Commit-Position: refs/heads/master@{#42248}
> Committed: https://chromium.googlesource.com/v8/v8/+/785cedf1ee6671399c2b2b7f6c6a8119f55195b4

TBR=danno@chromium.org,bradnelson@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=v8:4203

Review-Url: https://codereview.chromium.org/2623383002
Cr-Commit-Position: refs/heads/master@{#42252}
parent bd7fed19
...@@ -209,21 +209,25 @@ MaybeHandle<FixedArray> AsmJs::CompileAsmViaWasm(CompilationInfo* info) { ...@@ -209,21 +209,25 @@ MaybeHandle<FixedArray> AsmJs::CompileAsmViaWasm(CompilationInfo* info) {
result->set(kWasmDataScriptPosition, result->set(kWasmDataScriptPosition,
Smi::FromInt(info->literal()->position())); Smi::FromInt(info->literal()->position()));
MessageLocation location(info->script(), info->literal()->position(), if (FLAG_trace_asm_time) {
info->literal()->position()); MessageLocation location(info->script(), info->literal()->position(),
char text[100]; info->literal()->position());
int length = base::OS::SNPrintF( char text[100];
text, arraysize(text), "success, asm->wasm: %0.3f ms, compile: %0.3f ms", int length =
asm_wasm_time, compile_time); base::OS::SNPrintF(text, arraysize(text),
DCHECK_NE(-1, length); "success, asm->wasm: %0.3f ms, compile: %0.3f ms",
USE(length); asm_wasm_time, compile_time);
Handle<String> stext(info->isolate()->factory()->InternalizeUtf8String(text)); DCHECK_NE(-1, length);
Handle<JSMessageObject> message = MessageHandler::MakeMessageObject( USE(length);
info->isolate(), MessageTemplate::kAsmJsCompiled, &location, stext, Handle<String> stext(
Handle<JSArray>::null()); info->isolate()->factory()->InternalizeUtf8String(text));
message->set_error_level(v8::Isolate::kMessageInfo); Handle<JSMessageObject> message = MessageHandler::MakeMessageObject(
if (FLAG_trace_asm_time && !FLAG_suppress_asm_messages) { info->isolate(), MessageTemplate::kAsmJsCompiled, &location, stext,
MessageHandler::ReportMessage(info->isolate(), &location, message); Handle<JSArray>::null());
message->set_error_level(v8::Isolate::kMessageInfo);
if (!FLAG_suppress_asm_messages) {
MessageHandler::ReportMessage(info->isolate(), &location, message);
}
} }
return result; return result;
...@@ -314,25 +318,28 @@ MaybeHandle<Object> AsmJs::InstantiateAsmWasm(i::Isolate* isolate, ...@@ -314,25 +318,28 @@ MaybeHandle<Object> AsmJs::InstantiateAsmWasm(i::Isolate* isolate,
return single_function; return single_function;
} }
i::Handle<i::Script> script(i::Script::cast(wasm_data->get(kWasmDataScript))); if (FLAG_trace_asm_time) {
int32_t position = 0; i::Handle<i::Script> script(
if (!wasm_data->get(kWasmDataScriptPosition)->ToInt32(&position)) { i::Script::cast(wasm_data->get(kWasmDataScript)));
UNREACHABLE(); int32_t position = 0;
} if (!wasm_data->get(kWasmDataScriptPosition)->ToInt32(&position)) {
MessageLocation location(script, position, position); UNREACHABLE();
char text[50]; }
int length = MessageLocation location(script, position, position);
base::OS::SNPrintF(text, arraysize(text), "success, %0.3f ms", char text[50];
instantiate_timer.Elapsed().InMillisecondsF()); int length =
DCHECK_NE(-1, length); base::OS::SNPrintF(text, arraysize(text), "success, %0.3f ms",
USE(length); instantiate_timer.Elapsed().InMillisecondsF());
Handle<String> stext(isolate->factory()->InternalizeUtf8String(text)); DCHECK_NE(-1, length);
Handle<JSMessageObject> message = MessageHandler::MakeMessageObject( USE(length);
isolate, MessageTemplate::kAsmJsInstantiated, &location, stext, Handle<String> stext(isolate->factory()->InternalizeUtf8String(text));
Handle<JSArray>::null()); Handle<JSMessageObject> message = MessageHandler::MakeMessageObject(
message->set_error_level(v8::Isolate::kMessageInfo); isolate, MessageTemplate::kAsmJsInstantiated, &location, stext,
if (FLAG_trace_asm_time && !FLAG_suppress_asm_messages) { Handle<JSArray>::null());
MessageHandler::ReportMessage(isolate, &location, message); message->set_error_level(v8::Isolate::kMessageInfo);
if (!FLAG_suppress_asm_messages) {
MessageHandler::ReportMessage(isolate, &location, message);
}
} }
return module_object; return module_object;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment