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

Unified Diff: runtime/vm/flow_graph_optimizer.cc

Issue 24837002: Optimize string interpolation by running it at compile time if all inputs are constant. This is don… (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 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_builder.cc ('k') | runtime/vm/intermediate_language.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/flow_graph_optimizer.cc
===================================================================
--- runtime/vm/flow_graph_optimizer.cc (revision 27957)
+++ runtime/vm/flow_graph_optimizer.cc (working copy)
@@ -6047,7 +6047,66 @@
void ConstantPropagator::VisitStaticCall(StaticCallInstr* instr) {
- SetValue(instr, non_constant_);
+ MethodRecognizer::Kind recognized_kind =
+ MethodRecognizer::RecognizeKind(instr->function());
+ if (recognized_kind == MethodRecognizer::kStringBaseInterpolate) {
+ // static String _interpolate(List values)
+ //
+ // Code for calling interpolate is generated by the compiler:
+ // v2 <- CreateArray(v0)
+ // StoreIndexed(v2, v3, v4) -- v3:constant index, v4: value.
+ // ..
+ // PushArgument(v2)
+ // v8 <- StaticCall(_interpolate, v2)
+ // Detect that all values are constant, interpolate at compile
+ // time.
+ ASSERT(instr->ArgumentCount() == 1);
+ CreateArrayInstr* create_array =
+ instr->PushArgumentAt(0)->InputAt(0)->definition()->AsCreateArray();
Kevin Millikin (Google) 2013/09/27 10:22:39 PushArgumentAt(0)->InputAt(0)->definition() can be
srdjan 2013/10/01 19:36:49 Done.
+ ASSERT(create_array != NULL);
+ const Array& value_arr =
+ Array::Handle(Array::New(create_array->num_elements()));
Kevin Millikin (Google) 2013/09/27 10:22:39 I don't think we should create this array in the h
srdjan 2013/10/01 19:36:49 Done.
+ GrowableArray<StoreIndexedInstr*> store_instructions;
+ // Build the array of literal values to interpolate, abort if a value is
+ // not literal.
+ for (Value::Iterator it(create_array->input_use_list());
+ !it.Done();
+ it.Advance()) {
+ Instruction* curr = it.Current()->instruction();
+ StoreIndexedInstr* store = curr->AsStoreIndexed();
+ if (store == NULL) {
+ ASSERT(curr == instr->PushArgumentAt(0));
+ } else {
+ store_instructions.Add(store);
+ ASSERT(store->index()->BindsToConstant() &&
+ store->index()->IsSmiValue());
+ if (!store->value()->BindsToConstant()) {
Kevin Millikin (Google) 2013/09/27 10:22:39 We actually want to ask what is the analysis's com
srdjan 2013/10/01 19:36:49 Done.
+ SetValue(instr, non_constant_);
+ return;
+ }
+ const intptr_t i = Smi::Cast(store->index()->BoundConstant()).Value();
+ value_arr.SetAt(i, store->value()->BoundConstant());
+ }
+ }
+ // Build argument array to pass to the interpolation function.
+ const Array& interpolate_arg = Array::Handle(Array::New(1));
+ interpolate_arg.SetAt(0, value_arr);
+ // Call interpolation function.
+ String& concatenated = String::ZoneHandle();
+ concatenated ^=
+ DartEntry::InvokeFunction(instr->function(), interpolate_arg);
+ concatenated ^= concatenated.CheckAndCanonicalize(NULL);
+ // Remove unnecessary instructions.
+ instr->PushArgumentAt(0)->RemoveFromGraph();
Kevin Millikin (Google) 2013/09/27 10:22:39 This is not safe. Remember the lattice is unknown
+ for (intptr_t i = 0; i < store_instructions.length(); i++) {
+ store_instructions[i]->RemoveFromGraph();
+ }
+ create_array->RemoveFromGraph();
+
+ SetValue(instr, concatenated);
+ } else {
+ SetValue(instr, non_constant_);
+ }
}
« no previous file with comments | « runtime/vm/flow_graph_builder.cc ('k') | runtime/vm/intermediate_language.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698