Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1088)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/vm/flow_graph_inliner.cc

Issue 1314673008: Migrate logging infrastructure Isolate->Thread (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Fix test. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/flow_graph_compiler.cc ('k') | runtime/vm/flow_graph_optimizer.cc » ('j') | runtime/vm/thread.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_inliner.cc
diff --git a/runtime/vm/flow_graph_inliner.cc b/runtime/vm/flow_graph_inliner.cc
index 6c14228f5b3e08e33b953aeb9f6d6f76e3b95b09..09cc2c73e685bffc14745a7fcb21453397e9d0aa 100644
--- a/runtime/vm/flow_graph_inliner.cc
+++ b/runtime/vm/flow_graph_inliner.cc
@@ -563,13 +563,13 @@ class CallSiteInliner : public ValueObject {
inlining_depth_,
&inlined_info_);
while (collected_call_sites_->HasCalls()) {
- TRACE_INLINING(ISL_Print(" Depth %" Pd " ----------\n",
+ TRACE_INLINING(THR_Print(" Depth %" Pd " ----------\n",
inlining_depth_));
if (collected_call_sites_->NumCalls() > FLAG_max_inlined_per_depth) {
break;
}
if (FLAG_print_inlining_tree) {
- ISL_Print("**Depth % " Pd " calls to inline %" Pd "\n",
+ THR_Print("**Depth % " Pd " calls to inline %" Pd "\n",
inlining_depth_, collected_call_sites_->NumCalls());
}
// Swap collected and inlining arrays and clear the new collecting array.
@@ -614,7 +614,7 @@ class CallSiteInliner : public ValueObject {
bool TryInlining(const Function& function,
const Array& argument_names,
InlinedCallData* call_data) {
- TRACE_INLINING(ISL_Print(" => %s (deopt count %d)\n",
+ TRACE_INLINING(THR_Print(" => %s (deopt count %d)\n",
function.ToCString(),
function.deoptimization_counter()));
@@ -623,7 +623,7 @@ class CallSiteInliner : public ValueObject {
const Code& unoptimized_code = Code::Handle(function.unoptimized_code());
// Abort if the inlinable bit on the function is low.
if (!function.CanBeInlined()) {
- TRACE_INLINING(ISL_Print(" Bailout: not inlinable\n"));
+ TRACE_INLINING(THR_Print(" Bailout: not inlinable\n"));
PRINT_INLINING_TREE("Not inlinable",
&call_data->caller, &function, call_data->call);
return false;
@@ -633,7 +633,7 @@ class CallSiteInliner : public ValueObject {
if (function.deoptimization_counter() >=
FLAG_deoptimization_counter_threshold) {
function.set_is_inlinable(false);
- TRACE_INLINING(ISL_Print(" Bailout: deoptimization threshold\n"));
+ TRACE_INLINING(THR_Print(" Bailout: deoptimization threshold\n"));
PRINT_INLINING_TREE("Deoptimization threshold exceeded",
&call_data->caller, &function, call_data->call);
return false;
@@ -642,7 +642,7 @@ class CallSiteInliner : public ValueObject {
const char* kNeverInlineAnnotation = "NeverInline";
if (FLAG_enable_inlining_annotations &&
HasAnnotation(function, kNeverInlineAnnotation)) {
- TRACE_INLINING(ISL_Print(" Bailout: NeverInline annotation\n"));
+ TRACE_INLINING(THR_Print(" Bailout: NeverInline annotation\n"));
return false;
}
@@ -652,7 +652,7 @@ class CallSiteInliner : public ValueObject {
function.optimized_instruction_count(),
function.optimized_call_site_count(),
constant_arguments)) {
- TRACE_INLINING(ISL_Print(" Bailout: early heuristics with "
+ TRACE_INLINING(THR_Print(" Bailout: early heuristics with "
"code size: %" Pd ", "
"call sites: %" Pd ", "
"const args: %" Pd "\n",
@@ -670,7 +670,7 @@ class CallSiteInliner : public ValueObject {
volatile bool is_recursive_call = IsCallRecursive(function, call);
if (is_recursive_call &&
inlining_recursion_depth_ >= FLAG_inlining_recursion_depth_threshold) {
- TRACE_INLINING(ISL_Print(" Bailout: recursive function\n"));
+ TRACE_INLINING(THR_Print(" Bailout: recursive function\n"));
PRINT_INLINING_TREE("Recursive function",
&call_data->caller, &function, call_data->call);
return false;
@@ -733,14 +733,14 @@ class CallSiteInliner : public ValueObject {
// arrays so that actual arguments are in one-to-one with the formal
// parameters.
if (function.HasOptionalParameters()) {
- TRACE_INLINING(ISL_Print(" adjusting for optional parameters\n"));
+ TRACE_INLINING(THR_Print(" adjusting for optional parameters\n"));
if (!AdjustForOptionalParameters(*parsed_function,
argument_names,
arguments,
param_stubs,
callee_graph)) {
function.set_is_inlinable(false);
- TRACE_INLINING(ISL_Print(" Bailout: optional arg mismatch\n"));
+ TRACE_INLINING(THR_Print(" Bailout: optional arg mismatch\n"));
PRINT_INLINING_TREE("Optional arg mismatch",
&call_data->caller, &function, call_data->call);
return false;
@@ -791,7 +791,7 @@ class CallSiteInliner : public ValueObject {
if (FLAG_trace_inlining &&
(FLAG_print_flow_graph || FLAG_print_flow_graph_optimized)) {
- ISL_Print("Callee graph for inlining %s\n",
+ THR_Print("Callee graph for inlining %s\n",
function.ToFullyQualifiedCString());
FlowGraphPrinter printer(*callee_graph);
printer.PrintBlocks();
@@ -821,7 +821,7 @@ class CallSiteInliner : public ValueObject {
function.set_is_inlinable(false);
}
isolate()->set_deopt_id(prev_deopt_id);
- TRACE_INLINING(ISL_Print(" Bailout: heuristics with "
+ TRACE_INLINING(THR_Print(" Bailout: heuristics with "
"code size: %" Pd ", "
"call sites: %" Pd ", "
"const args: %" Pd "\n",
@@ -872,7 +872,7 @@ class CallSiteInliner : public ValueObject {
// We allocate a ZoneHandle for the unoptimized code so that it cannot be
// disconnected from its function during the rest of compilation.
Code::ZoneHandle(unoptimized_code.raw());
- TRACE_INLINING(ISL_Print(" Success\n"));
+ TRACE_INLINING(THR_Print(" Success\n"));
PRINT_INLINING_TREE(NULL,
&call_data->caller, &function, call);
return true;
@@ -881,7 +881,7 @@ class CallSiteInliner : public ValueObject {
error = isolate()->object_store()->sticky_error();
isolate()->object_store()->clear_sticky_error();
isolate()->set_deopt_id(prev_deopt_id);
- TRACE_INLINING(ISL_Print(" Bailout: %s\n", error.ToErrorCString()));
+ TRACE_INLINING(THR_Print(" Bailout: %s\n", error.ToErrorCString()));
PRINT_INLINING_TREE("Bailout",
&call_data->caller, &function, call);
return false;
@@ -890,7 +890,7 @@ class CallSiteInliner : public ValueObject {
void PrintInlinedInfo(const Function& top) {
if (inlined_info_.length() > 0) {
- ISL_Print("Inlining into: '%s' growth: %f (%" Pd " -> %" Pd ")\n",
+ THR_Print("Inlining into: '%s' growth: %f (%" Pd " -> %" Pd ")\n",
top.ToFullyQualifiedCString(),
GrowthFactor(),
initial_size_,
@@ -923,9 +923,9 @@ class CallSiteInliner : public ValueObject {
(info.caller->raw() == caller.raw()) &&
!Contains(call_instructions_printed, info.call_instr->GetDeoptId())) {
for (int t = 0; t < depth; t++) {
- ISL_Print(" ");
+ THR_Print(" ");
}
- ISL_Print("%" Pd " %s\n",
+ THR_Print("%" Pd " %s\n",
info.call_instr->GetDeoptId(),
info.inlined->ToQualifiedCString());
PrintInlinedInfoFor(*info.inlined, depth + 1);
@@ -943,9 +943,9 @@ class CallSiteInliner : public ValueObject {
(info.caller->raw() == caller.raw()) &&
!Contains(call_instructions_printed, info.call_instr->GetDeoptId())) {
for (int t = 0; t < depth; t++) {
- ISL_Print(" ");
+ THR_Print(" ");
}
- ISL_Print("NO %" Pd " %s - %s\n",
+ THR_Print("NO %" Pd " %s - %s\n",
info.call_instr->GetDeoptId(),
info.inlined->ToQualifiedCString(),
info.bailout_reason);
@@ -1043,7 +1043,7 @@ class CallSiteInliner : public ValueObject {
void InlineStaticCalls() {
const GrowableArray<CallSites::StaticCallInfo>& call_info =
inlining_call_sites_->static_calls();
- TRACE_INLINING(ISL_Print(" Static Calls (%" Pd ")\n", call_info.length()));
+ TRACE_INLINING(THR_Print(" Static Calls (%" Pd ")\n", call_info.length()));
for (intptr_t call_idx = 0; call_idx < call_info.length(); ++call_idx) {
StaticCallInstr* call = call_info[call_idx].call;
if (call->function().name() == Symbols::ListFactory().raw()) {
@@ -1061,7 +1061,7 @@ class CallSiteInliner : public ValueObject {
const Function& target = call->function();
if (!inliner_->AlwaysInline(target) &&
(call_info[call_idx].ratio * 100) < FLAG_inlining_hotness) {
- TRACE_INLINING(ISL_Print(
+ TRACE_INLINING(THR_Print(
" => %s (deopt count %d)\n Bailout: cold %f\n",
target.ToCString(),
target.deoptimization_counter(),
@@ -1086,7 +1086,7 @@ class CallSiteInliner : public ValueObject {
void InlineClosureCalls() {
const GrowableArray<CallSites::ClosureCallInfo>& call_info =
inlining_call_sites_->closure_calls();
- TRACE_INLINING(ISL_Print(" Closure Calls (%" Pd ")\n",
+ TRACE_INLINING(THR_Print(" Closure Calls (%" Pd ")\n",
call_info.length()));
for (intptr_t call_idx = 0; call_idx < call_info.length(); ++call_idx) {
ClosureCallInstr* call = call_info[call_idx].call;
@@ -1108,7 +1108,7 @@ class CallSiteInliner : public ValueObject {
}
if (target.IsNull()) {
- TRACE_INLINING(ISL_Print(" Bailout: non-closure operator\n"));
+ TRACE_INLINING(THR_Print(" Bailout: non-closure operator\n"));
continue;
}
GrowableArray<Value*> arguments(call->ArgumentCount());
@@ -1129,7 +1129,7 @@ class CallSiteInliner : public ValueObject {
void InlineInstanceCalls() {
const GrowableArray<CallSites::InstanceCallInfo>& call_info =
inlining_call_sites_->instance_calls();
- TRACE_INLINING(ISL_Print(" Polymorphic Instance Calls (%" Pd ")\n",
+ TRACE_INLINING(THR_Print(" Polymorphic Instance Calls (%" Pd ")\n",
call_info.length()));
for (intptr_t call_idx = 0; call_idx < call_info.length(); ++call_idx) {
PolymorphicInstanceCallInstr* call = call_info[call_idx].call;
@@ -1148,7 +1148,7 @@ class CallSiteInliner : public ValueObject {
const Function& target = Function::ZoneHandle(ic_data.GetTargetAt(0));
if (!inliner_->AlwaysInline(target) &&
(call_info[call_idx].ratio * 100) < FLAG_inlining_hotness) {
- TRACE_INLINING(ISL_Print(
+ TRACE_INLINING(THR_Print(
" => %s (deopt count %d)\n Bailout: cold %f\n",
target.ToCString(),
target.deoptimization_counter(),
@@ -1829,7 +1829,7 @@ bool FlowGraphInliner::AlwaysInline(const Function& function) {
const char* kAlwaysInlineAnnotation = "AlwaysInline";
if (FLAG_enable_inlining_annotations &&
HasAnnotation(function, kAlwaysInlineAnnotation)) {
- TRACE_INLINING(ISL_Print("AlwaysInline annotation for %s\n",
+ TRACE_INLINING(THR_Print("AlwaysInline annotation for %s\n",
function.ToCString()));
return true;
}
@@ -1857,11 +1857,11 @@ void FlowGraphInliner::Inline() {
return;
}
- TRACE_INLINING(ISL_Print("Inlining calls in %s\n", top.ToCString()));
+ TRACE_INLINING(THR_Print("Inlining calls in %s\n", top.ToCString()));
if (trace_inlining() &&
(FLAG_print_flow_graph || FLAG_print_flow_graph_optimized)) {
- ISL_Print("Before Inlining of %s\n", flow_graph_->
+ THR_Print("Before Inlining of %s\n", flow_graph_->
function().ToFullyQualifiedCString());
FlowGraphPrinter printer(*flow_graph_);
printer.PrintBlocks();
@@ -1876,9 +1876,9 @@ void FlowGraphInliner::Inline() {
if (inliner.inlined()) {
flow_graph_->DiscoverBlocks();
if (trace_inlining()) {
- ISL_Print("Inlining growth factor: %f\n", inliner.GrowthFactor());
+ THR_Print("Inlining growth factor: %f\n", inliner.GrowthFactor());
if (FLAG_print_flow_graph || FLAG_print_flow_graph_optimized) {
- ISL_Print("After Inlining of %s\n", flow_graph_->
+ THR_Print("After Inlining of %s\n", flow_graph_->
function().ToFullyQualifiedCString());
FlowGraphPrinter printer(*flow_graph_);
printer.PrintBlocks();
« no previous file with comments | « runtime/vm/flow_graph_compiler.cc ('k') | runtime/vm/flow_graph_optimizer.cc » ('j') | runtime/vm/thread.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698