Create multiple compilation jobs for ignition if compiling multiple literals

src/interpreter/interpreter.cc

 // Copyright 2015 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/interpreter/interpreter.h"
 
 #include <fstream>
 #include <memory>
+#include <set>
 
+#include "src/ast/ast-traversal-visitor.h"
 #include "src/ast/prettyprinter.h"
 #include "src/code-factory.h"
 #include "src/compilation-info.h"
 #include "src/compiler.h"
 #include "src/factory.h"
 #include "src/interpreter/bytecode-flags.h"
 #include "src/interpreter/bytecode-generator.h"
 #include "src/interpreter/bytecodes.h"
 #include "src/interpreter/interpreter-assembler.h"
 #include "src/interpreter/interpreter-intrinsics.h"
 #include "src/log.h"
+#include "src/parsing/parse-info.h"
 #include "src/zone/zone.h"
 
 namespace v8 {
 namespace internal {
 namespace interpreter {
 
 using compiler::Node;
 typedef CodeStubAssembler::Label Label;
 typedef CodeStubAssembler::Variable Variable;
 typedef InterpreterAssembler::Arg Arg;
 
 #define __ assembler->
 
 class InterpreterCompilationJob final : public CompilationJob {
  public:
-  explicit InterpreterCompilationJob(CompilationInfo* info);
+  InterpreterCompilationJob(CompilationInfo* info,
+                            ShouldCompile should_compile);
+
+  InterpreterCompilationJob(std::unique_ptr<Zone> zone,
+                            std::unique_ptr<ParseInfo> parse_info,
+                            std::unique_ptr<CompilationInfo> info);
 
  protected:
   Status PrepareJobImpl() final;
   Status ExecuteJobImpl() final;
   Status FinalizeJobImpl() final;
 
  private:
   BytecodeGenerator* generator() { return &generator_; }
 
   BytecodeGenerator generator_;
 
+  ShouldCompile should_compile_;
+
+  std::unique_ptr<Zone> zone_;
+  std::unique_ptr<ParseInfo> parse_info_;
+  std::unique_ptr<CompilationInfo> info_;
+
   DISALLOW_COPY_AND_ASSIGN(InterpreterCompilationJob);
 };
 
 Interpreter::Interpreter(Isolate* isolate) : isolate_(isolate) {
   memset(dispatch_table_, 0, sizeof(dispatch_table_));
 }
 
 void Interpreter::Initialize() {
   if (IsDispatchTableInitialized()) return;
   Zone zone(isolate_->allocator());
@@ skipping 85 matching lines @@
       dispatch_table_[i] = reinterpret_cast<Code*>(code)->entry();
     }
   }
 }
 
 // static
 int Interpreter::InterruptBudget() {
   return FLAG_interrupt_budget * kCodeSizeMultiplier;
 }
 
-InterpreterCompilationJob::InterpreterCompilationJob(CompilationInfo* info)
-    : CompilationJob(info->isolate(), info, "Ignition"), generator_(info) {}
+InterpreterCompilationJob::InterpreterCompilationJob(
+    CompilationInfo* info, ShouldCompile should_compile)
+    : CompilationJob(info->isolate(), info, "Ignition"),
+      generator_(info),
+      should_compile_(should_compile) {}
+
+InterpreterCompilationJob::InterpreterCompilationJob(
+    std::unique_ptr<Zone> zone, std::unique_ptr<ParseInfo> parse_info,
+    std::unique_ptr<CompilationInfo> info)
+    : InterpreterCompilationJob(info.get(), ShouldCompile::kNever) {
+  zone_ = std::move(zone);
+  parse_info_ = std::move(parse_info);
+  info_ = std::move(info);
+}
 
 InterpreterCompilationJob::Status InterpreterCompilationJob::PrepareJobImpl() {
   if (FLAG_print_bytecode || FLAG_print_ast) {
     OFStream os(stdout);
     std::unique_ptr<char[]> name = info()->GetDebugName();
     os << "[generating bytecode for function: " << info()->GetDebugName().get()
        << "]" << std::endl
        << std::flush;
   }
 
@@ skipping 20 matching lines @@
 
   generator()->GenerateBytecode(stack_limit());
 
   if (generator()->HasStackOverflow()) {
     return FAILED;
   }
   return SUCCEEDED;
 }
 
 InterpreterCompilationJob::Status InterpreterCompilationJob::FinalizeJobImpl() {
-  Handle<BytecodeArray> bytecodes = generator()->FinalizeBytecode(isolate());
+  Handle<BytecodeArray> bytecodes =
+      generator()->FinalizeBytecode(isolate(), should_compile_);
   if (generator()->HasStackOverflow()) {
     return FAILED;
   }
 
   if (FLAG_print_bytecode) {
     OFStream os(stdout);
     bytecodes->Print(os);
     os << std::flush;
   }
 
   info()->SetBytecodeArray(bytecodes);
   info()->SetCode(info()->isolate()->builtins()->InterpreterEntryTrampoline());
   return SUCCEEDED;
 }
 
-CompilationJob* Interpreter::NewCompilationJob(CompilationInfo* info) {
-  return new InterpreterCompilationJob(info);
+class CollectEagerFunctionLiterals final
+    : public AstTraversalVisitor<CollectEagerFunctionLiterals> {
+ public:
+  explicit CollectEagerFunctionLiterals(CompilationInfo* info)
+      : AstTraversalVisitor(info->isolate(), info->parse_info()->literal()),
+        parse_info_(info->parse_info()) {}
+
+  const std::set<FunctionLiteral*>& eager_literals() const {
+    return eager_literals_;
+  }
+
+ private:
+  friend class AstTraversalVisitor<CollectEagerFunctionLiterals>;
+
+  void VisitFunctionDeclaration(FunctionDeclaration* decl) {
+    i::Variable* variable = decl->proxy()->var();
+    DCHECK(variable->mode() == LET || variable->mode() == VAR);
+    if (variable->location() == VariableLocation::UNALLOCATED) {
+      if (decl->fun()->ShouldEagerCompile()) {
+        eager_literals_.insert(decl->fun());
+      } else {
+        return;
+      }
+    }
+    AstTraversalVisitor::VisitFunctionDeclaration(decl);
+  }
+
+  void VisitFunctionLiteral(FunctionLiteral* fun) {
+    if (fun->ShouldEagerCompile()) {
+      if (fun != parse_info_->literal()) {
+        eager_literals_.insert(fun);
+      }
+      AstTraversalVisitor::VisitFunctionLiteral(fun);
+    }
+  }
+
+  std::set<FunctionLiteral*> eager_literals_;
+  ParseInfo* parse_info_;
+
+  DISALLOW_COPY_AND_ASSIGN(CollectEagerFunctionLiterals);
+};
+
+std::vector<std::unique_ptr<CompilationJob>> Interpreter::NewCompilationJob(
+    CompilationInfo* info) {
+  ShouldCompile should_compile =
+      info->is_debug() ? ShouldCompile::kIfNecessary : ShouldCompile::kNever;
+
+  std::vector<std::unique_ptr<CompilationJob>> jobs;
+  jobs.push_back(std::unique_ptr<InterpreterCompilationJob>(
+      new InterpreterCompilationJob(info, should_compile)));
+
+  if (should_compile == ShouldCompile::kIfNecessary) return jobs;
+
+  CollectEagerFunctionLiterals collector(info);
+  collector.Run();
+
+  for (auto fun : collector.eager_literals()) {
+    Handle<SharedFunctionInfo> sfi = Compiler::GetSharedFunctionInfo(
+        fun, info->script(), info, ShouldCompile::kNever);
+    std::unique_ptr<Zone> zone(new Zone(info->isolate()->allocator()));
+    std::unique_ptr<ParseInfo> parse_info(
+        new ParseInfo(zone.get(), info->script()));
+    std::unique_ptr<CompilationInfo> compilation_info(
+        new CompilationInfo(parse_info.get(), Handle<JSFunction>::null()));
+    parse_info->set_literal(fun);
+    parse_info->set_shared_info(sfi);
+    parse_info->set_language_mode(fun->scope()->language_mode());
+    if (info->will_serialize()) compilation_info->PrepareForSerializing();
+    DCHECK(!info->is_debug());
+    Compiler::Renumber(parse_info.get());

[jochen (gone - plz use gerrit), 2016/10/07 15:40:48]

^^^ like this

+    jobs.push_back(std::unique_ptr<InterpreterCompilationJob>(
+        new InterpreterCompilationJob(std::move(zone), std::move(parse_info),
+                                      std::move(compilation_info))));
+  }
+  return jobs;
 }
 
 bool Interpreter::IsDispatchTableInitialized() {
   if (FLAG_trace_ignition || FLAG_trace_ignition_codegen ||
       FLAG_trace_ignition_dispatches) {
     // Regenerate table to add bytecode tracing operations, print the assembly
     // code generated by TurboFan or instrument handlers with dispatch counters.
     return false;
   }
   return dispatch_table_[0] != nullptr;
@@ skipping 2412 matching lines @@
   __ StoreObjectField(generator, JSGeneratorObject::kContinuationOffset,
       __ SmiTag(new_state));
   __ SetAccumulator(old_state);
 
   __ Dispatch();
 }
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8