Create multiple compilation jobs for ignition if compiling multiple literals

src/compiler.cc

 // Copyright 2012 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.
 
 #include "src/compiler.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "src/asmjs/asm-js.h"
 #include "src/asmjs/asm-typer.h"
 #include "src/ast/ast-numbering.h"
+#include "src/ast/collect-eager-literals.h"
 #include "src/ast/prettyprinter.h"
 #include "src/ast/scopes.h"
 #include "src/bootstrapper.h"
 #include "src/codegen.h"
 #include "src/compilation-cache.h"
 #include "src/compiler-dispatcher/optimizing-compile-dispatcher.h"
 #include "src/compiler/pipeline.h"
 #include "src/crankshaft/hydrogen.h"
 #include "src/debug/debug.h"
 #include "src/debug/liveedit.h"
@@ skipping 41 matching lines @@
 
   ~ScopedTimer() { *location_ += timer_.Elapsed(); }
 
   base::ElapsedTimer timer_;
   base::TimeDelta* location_;
 };
 
 // ----------------------------------------------------------------------------
 // Implementation of CompilationJob
 
+CompilationJob::CompilationJob(Isolate* isolate, CompilationInfo* info,
+                               const char* compiler_name, State initial_state)
+    : info_(info),
+      compiler_name_(compiler_name),
+      state_(initial_state),
+      stack_limit_(isolate->stack_guard()->real_climit()) {}
+
+CompilationJob::~CompilationJob() {}
+
 CompilationJob::Status CompilationJob::PrepareJob() {
   DCHECK(ThreadId::Current().Equals(info()->isolate()->thread_id()));
   DisallowJavascriptExecution no_js(isolate());
 
   if (FLAG_trace_opt && info()->IsOptimizing()) {
     OFStream os(stdout);
     os << "[compiling method " << Brief(*info()->closure()) << " using "
        << compiler_name_;
     if (info()->is_osr()) os << " OSR";
     os << "]" << std::endl;
@@ skipping 97 matching lines @@
   }
   if (FLAG_hydrogen_stats) {
     isolate()->GetHStatistics()->IncrementSubtotals(time_taken_to_prepare_,
                                                     time_taken_to_execute_,
                                                     time_taken_to_finalize_);
   }
 }
 
 Isolate* CompilationJob::isolate() const { return info()->isolate(); }
 
+void CompilationJob::TakeOwnershipOfCompilationInfo() {
+  DCHECK_NULL(compilation_info_.get());
+  compilation_info_.reset(info_);
+  parse_info_.reset(info_->parse_info());
+  zone_.reset(info_->parse_info()->zone());
+}
+
 namespace {
 
 void AddWeakObjectToCodeDependency(Isolate* isolate, Handle<HeapObject> object,
                                    Handle<Code> code) {
   Handle<WeakCell> cell = Code::WeakCellFor(code);
   Heap* heap = isolate->heap();
   if (heap->InNewSpace(*object)) {
     heap->AddWeakNewSpaceObjectToCodeDependency(object, cell);
   } else {
     Handle<DependentCode> dep(heap->LookupWeakObjectToCodeDependency(object));
@@ skipping 138 matching lines @@
   // Checks whether top level functions should be passed by the filter.
   if (info->shared_info()->is_toplevel()) {
     Vector<const char> filter = CStrVector(FLAG_ignition_filter);
     return (filter.length() == 0) || (filter.length() == 1 && filter[0] == '*');
   }
 
   // Finally respect the filter.
   return info->shared_info()->PassesFilter(FLAG_ignition_filter);
 }
 
-CompilationJob* GetUnoptimizedCompilationJob(CompilationInfo* info) {
+bool Renumber(ParseInfo* parse_info) {
+  // Create a canonical handle scope if compiling ignition bytecode. This is
+  // required by the constant array builder to de-duplicate objects without
+  // dereferencing handles.
+  std::unique_ptr<CanonicalHandleScope> canonical;
+  if (FLAG_ignition) {
+    canonical.reset(new CanonicalHandleScope(parse_info->isolate()));
+  }
+
+  if (!AstNumbering::Renumber(parse_info->isolate(), parse_info->zone(),
+                              parse_info->literal())) {
+    return false;
+  }
+  Handle<SharedFunctionInfo> shared_info = parse_info->shared_info();
+  if (!shared_info.is_null()) {
+    FunctionLiteral* lit = parse_info->literal();
+    shared_info->set_ast_node_count(lit->ast_node_count());
+    if (lit->dont_optimize_reason() != kNoReason) {
+      shared_info->DisableOptimization(lit->dont_optimize_reason());
+    }
+    if (lit->flags() & AstProperties::kDontCrankshaft) {
+      shared_info->set_dont_crankshaft(true);
+    }
+  }
+  return true;
+}
+
+std::vector<std::unique_ptr<CompilationJob>> GetUnoptimizedCompilationJobs(
+    CompilationInfo* info) {
   // Function should have been parsed and analyzed before creating a compilation
   // job.
   DCHECK_NOT_NULL(info->literal());
   DCHECK_NOT_NULL(info->scope());
 
   EnsureFeedbackMetadata(info);
+
+  std::vector<std::unique_ptr<CompilationJob>> result;
+
   if (ShouldUseIgnition(info)) {
-    return interpreter::Interpreter::NewCompilationJob(info);
+    // When compiling eagerly, the majority of work might happen in the
+    // finalization phase, when we get the SharedFunctionInfos for all the
+    // functions referenced from the function we actually want to compile.
+    //
+    // This is undesirable when we want to schedule the compilation work (which
+    // is only the case for ignition at this point). To avoid this compilation
+    // during finalization, walk the AST and create separate compilation jobs
+    // for each eager function literal we encounter.
+    //
+    // This doesn't work for debug code, as GetSharedFunctionInfo only caches
+    // the SharedFunctionInfos with non-debug code.
+    ShouldCompile should_compile =
+        (FLAG_ignition_split_jobs && !info->is_debug())
+            ? ShouldCompile::kNever
+            : ShouldCompile::kIfNecessary;
+    result.push_back(std::unique_ptr<CompilationJob>(
+        interpreter::Interpreter::NewCompilationJob(info, should_compile)));
+
+    if (should_compile == ShouldCompile::kNever) {
+      CollectEagerLiterals collector(info);
+      collector.Run();
+
+      for (auto fun : collector.eager_literals()) {
+        Handle<SharedFunctionInfo> sfi = Compiler::GetSharedFunctionInfo(
+            fun, info->script(), info, ShouldCompile::kNever);
+
+        std::unique_ptr<ParseInfo> parse_info(new ParseInfo(
+            new Zone(info->isolate()->allocator()), info->script()));
+        parse_info->set_literal(fun);
+        parse_info->set_shared_info(sfi);
+        parse_info->set_language_mode(fun->scope()->language_mode());
+
+        std::unique_ptr<CompilationInfo> compilation_info(new CompilationInfo(
+            parse_info.release(), Handle<JSFunction>::null()));
+        if (info->will_serialize()) compilation_info->PrepareForSerializing();
+        DCHECK(!info->is_debug());
+
+        Renumber(compilation_info->parse_info());
+        EnsureFeedbackMetadata(compilation_info.get());
+        DCHECK(ShouldUseIgnition(compilation_info.get()));
+        std::unique_ptr<CompilationJob> job(
+            interpreter::Interpreter::NewCompilationJob(
+                compilation_info.release(), ShouldCompile::kNever));
+        job->TakeOwnershipOfCompilationInfo();
+        result.push_back(std::move(job));
+      }
+    }
+
+    return result;
   } else {
-    return FullCodeGenerator::NewCompilationJob(info);
+    std::unique_ptr<CompilationJob> job(
+        FullCodeGenerator::NewCompilationJob(info));
+    result.push_back(std::move(job));
+    return result;
   }
 }
 
 void InstallSharedScopeInfo(CompilationInfo* info,
                             Handle<SharedFunctionInfo> shared) {
   Handle<ScopeInfo> scope_info = info->scope()->scope_info();
   shared->set_scope_info(*scope_info);
   Scope* outer_scope = info->scope()->GetOuterScopeWithContext();
   if (outer_scope) {
     shared->set_outer_scope_info(*outer_scope->scope_info());
@@ skipping 42 matching lines @@
     MaybeHandle<FixedArray> wasm_data;
     wasm_data = AsmJs::ConvertAsmToWasm(info->parse_info());
     if (!wasm_data.is_null()) {
       info->shared_info()->set_asm_wasm_data(*wasm_data.ToHandleChecked());
       info->SetCode(info->isolate()->builtins()->InstantiateAsmJs());
       InstallUnoptimizedCode(info);
       return true;
     }
   }
 
-  std::unique_ptr<CompilationJob> job(GetUnoptimizedCompilationJob(info));
-  if (job->PrepareJob() != CompilationJob::SUCCEEDED) return false;
-  if (job->ExecuteJob() != CompilationJob::SUCCEEDED) return false;
-  if (FinalizeUnoptimizedCompilationJob(job.get()) !=
-      CompilationJob::SUCCEEDED) {
-    return false;
+  std::vector<std::unique_ptr<CompilationJob>> jobs(
+      GetUnoptimizedCompilationJobs(info));
+  for (auto& job : jobs) {
+    if (job->PrepareJob() != CompilationJob::SUCCEEDED) return false;
+    if (job->ExecuteJob() != CompilationJob::SUCCEEDED) return false;
+    if (FinalizeUnoptimizedCompilationJob(job.get()) !=
+        CompilationJob::SUCCEEDED) {
+      return false;
+    }
+    job.reset();
   }
   return true;
 }
 
 bool CompileUnoptimizedCode(CompilationInfo* info) {
   DCHECK(AllowCompilation::IsAllowed(info->isolate()));
   if (!Compiler::Analyze(info->parse_info()) ||
       !GenerateUnoptimizedCode(info)) {
     Isolate* isolate = info->isolate();
     if (!isolate->has_pending_exception()) isolate->StackOverflow();
@@ skipping 52 matching lines @@
 
   // Cache optimized context-specific code.
   Handle<JSFunction> function = info->closure();
   Handle<SharedFunctionInfo> shared(function->shared());
   Handle<LiteralsArray> literals(function->literals());
   Handle<Context> native_context(function->context()->native_context());
   SharedFunctionInfo::AddToOptimizedCodeMap(shared, native_context, code,
                                             literals, info->osr_ast_id());
 }
 
-bool Renumber(ParseInfo* parse_info) {
-  // Create a canonical handle scope if compiling ignition bytecode. This is
-  // required by the constant array builder to de-duplicate objects without
-  // dereferencing handles.
-  std::unique_ptr<CanonicalHandleScope> canonical;
-  if (FLAG_ignition) {
-    canonical.reset(new CanonicalHandleScope(parse_info->isolate()));
-  }
-
-  if (!AstNumbering::Renumber(parse_info->isolate(), parse_info->zone(),
-                              parse_info->literal())) {
-    return false;
-  }
-  Handle<SharedFunctionInfo> shared_info = parse_info->shared_info();
-  if (!shared_info.is_null()) {
-    FunctionLiteral* lit = parse_info->literal();
-    shared_info->set_ast_node_count(lit->ast_node_count());
-    if (lit->dont_optimize_reason() != kNoReason) {
-      shared_info->DisableOptimization(lit->dont_optimize_reason());
-    }
-    if (lit->flags() & AstProperties::kDontCrankshaft) {
-      shared_info->set_dont_crankshaft(true);
-    }
-  }
-  return true;
-}
-
 bool UseTurboFan(Handle<SharedFunctionInfo> shared) {
   bool optimization_disabled = shared->optimization_disabled();
   bool dont_crankshaft = shared->dont_crankshaft();
 
   // Check the enabling conditions for Turbofan.
   // 1. "use asm" code.
   bool is_turbofanable_asm =
       FLAG_turbo_asm && shared->asm_function() && !optimization_disabled;
 
   // 2. Fallback for features unsupported by Crankshaft.
@@ skipping 1150 matching lines @@
   CompilationInfo compile_info(parse_info, Handle<JSFunction>::null());
 
   // The source was parsed lazily, so compiling for debugging is not possible.
   DCHECK(!compile_info.is_debug());
 
   Handle<SharedFunctionInfo> result = CompileToplevel(&compile_info);
   if (!result.is_null()) isolate->debug()->OnAfterCompile(script);
   return result;
 }
 
-
 Handle<SharedFunctionInfo> Compiler::GetSharedFunctionInfo(
     FunctionLiteral* literal, Handle<Script> script,
-    CompilationInfo* outer_info) {
+    CompilationInfo* outer_info, ShouldCompile should_compile) {
   // Precondition: code has been parsed and scopes have been analyzed.
   Isolate* isolate = outer_info->isolate();
   MaybeHandle<SharedFunctionInfo> maybe_existing;
 
   // Find any previously allocated shared function info for the given literal.
-  if (outer_info->shared_info()->never_compiled()) {
+  if (outer_info->shared_info()->never_compiled() &&
+      should_compile == ShouldCompile::kIfNecessary) {
     // On the first compile, there are no existing shared function info for
     // inner functions yet, so do not try to find them. All bets are off for
     // live edit though.
     SLOW_DCHECK(script->FindSharedFunctionInfo(literal).is_null() ||
                 isolate->debug()->live_edit_enabled());
   } else {
     maybe_existing = script->FindSharedFunctionInfo(literal);
   }
 
   // We found an existing shared function info. If it has any sort of code
   // attached, don't worry about compiling and simply return it. Otherwise,
   // continue to decide whether to eagerly compile.
   // Note that we also carry on if we are compiling eager to obtain code for
   // debugging, unless we already have code with debug break slots.
   Handle<SharedFunctionInfo> existing;
   if (maybe_existing.ToHandle(&existing)) {
     DCHECK(!existing->is_toplevel());
     if (existing->HasBaselineCode() || existing->HasBytecodeArray()) {
       if (!outer_info->is_debug() || existing->HasDebugCode()) {
         return existing;
       }
+    } else if (should_compile == ShouldCompile::kNever) {
+      return existing;

[Michael Starzinger, 2016/10/17 13:16:03]

nit: Please add a DCHECK(!outer_info->is_debug()) before this early return.

     }
   }
 
   // Allocate a shared function info object.
   Handle<SharedFunctionInfo> result;
   if (!maybe_existing.ToHandle(&result)) {
     result = NewSharedFunctionInfoForLiteral(isolate, literal, script);
     result->set_is_toplevel(false);
 
     // If the outer function has been compiled before, we cannot be sure that
     // shared function info for this function literal has been created for the
     // first time. It may have already been compiled previously.
     result->set_never_compiled(outer_info->shared_info()->never_compiled());
   }
 
   Zone zone(isolate->allocator());
   ParseInfo parse_info(&zone, script);
   CompilationInfo info(&parse_info, Handle<JSFunction>::null());
   parse_info.set_literal(literal);
   parse_info.set_shared_info(result);
   parse_info.set_language_mode(literal->scope()->language_mode());
   if (outer_info->will_serialize()) info.PrepareForSerializing();
   if (outer_info->is_debug()) info.MarkAsDebug();
 
   // Generate code
   TimerEventScope<TimerEventCompileCode> timer(isolate);
   RuntimeCallTimerScope runtimeTimer(isolate, &RuntimeCallStats::CompileCode);
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("v8.compile"), "V8.CompileCode");
 
-  if (!literal->ShouldEagerCompile()) {
+  if (!literal->ShouldEagerCompile() ||
+      should_compile == ShouldCompile::kNever) {
     info.SetCode(isolate->builtins()->CompileLazy());
     Scope* outer_scope = literal->scope()->GetOuterScopeWithContext();
     if (outer_scope) {
       result->set_outer_scope_info(*outer_scope->scope_info());
     }
   } else if (Renumber(info.parse_info()) && GenerateUnoptimizedCode(&info)) {
     // Code generation will ensure that the feedback vector is present and
     // appropriately sized.
     DCHECK(!info.code().is_null());
     if (literal->should_be_used_once_hint()) {
@@ skipping 43 matching lines @@
 }
 
 MaybeHandle<Code> Compiler::GetOptimizedCodeForOSR(Handle<JSFunction> function,
                                                    BailoutId osr_ast_id,
                                                    JavaScriptFrame* osr_frame) {
   DCHECK(!osr_ast_id.IsNone());
   DCHECK_NOT_NULL(osr_frame);
   return GetOptimizedCode(function, NOT_CONCURRENT, osr_ast_id, osr_frame);
 }
 
-CompilationJob* Compiler::PrepareUnoptimizedCompilationJob(
-    CompilationInfo* info) {
+std::vector<std::unique_ptr<CompilationJob>>
+Compiler::PrepareUnoptimizedCompilationJobs(CompilationInfo* info) {
   VMState<COMPILER> state(info->isolate());
-  std::unique_ptr<CompilationJob> job(GetUnoptimizedCompilationJob(info));
-  if (job->PrepareJob() != CompilationJob::SUCCEEDED) {
-    return nullptr;
+  std::vector<std::unique_ptr<CompilationJob>> jobs(
+      GetUnoptimizedCompilationJobs(info));
+  for (auto& job : jobs) {
+    if (job->PrepareJob() != CompilationJob::SUCCEEDED) {
+      std::vector<std::unique_ptr<CompilationJob>> result;
+      return result;
+    }
   }
-  return job.release();
+  return jobs;
 }
 
 bool Compiler::FinalizeCompilationJob(CompilationJob* raw_job) {
   // Take ownership of compilation job.  Deleting job also tears down the zone.
   std::unique_ptr<CompilationJob> job(raw_job);
 
   VMState<COMPILER> state(job->info()->isolate());
   if (job->info()->IsOptimizing()) {
     return FinalizeOptimizedCompilationJob(job.get()) ==
            CompilationJob::SUCCEEDED;
@@ skipping 29 matching lines @@
     DCHECK(shared->is_compiled());
     function->set_literals(cached.literals);
   } else if (shared->is_compiled()) {
     // TODO(mvstanton): pass pretenure flag to EnsureLiterals.
     JSFunction::EnsureLiterals(function);
   }
 }
 
 }  // namespace internal
 }  // namespace v8