[turbofan] Implement OSR for outer loops.

src/compiler/common-operator.cc

 // Copyright 2014 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/common-operator.h"
 
 #include "src/assembler.h"
 #include "src/base/lazy-instance.h"
 #include "src/compiler/linkage.h"
 #include "src/compiler/opcodes.h"
@@ skipping 85 matching lines @@
                             info.state_combine());
 }
 
 
 std::ostream& operator<<(std::ostream& os, FrameStateCallInfo const& info) {
   return os << info.type() << ", " << info.bailout_id() << ", "
             << info.state_combine();
 }
 
 
-#define CACHED_OP_LIST(V)                     \
-  V(Dead, Operator::kFoldable, 0, 0, 0, 1)    \
-  V(End, Operator::kFoldable, 0, 0, 1, 0)     \
-  V(IfTrue, Operator::kFoldable, 0, 0, 1, 1)  \
-  V(IfFalse, Operator::kFoldable, 0, 0, 1, 1) \
-  V(Throw, Operator::kFoldable, 1, 1, 1, 1)   \
-  V(Return, Operator::kNoProperties, 1, 1, 1, 1)
+#define CACHED_OP_LIST(V)                                  \
+  V(Dead, Operator::kFoldable, 0, 0, 0, 0, 0, 1)           \
+  V(End, Operator::kFoldable, 0, 0, 1, 0, 0, 0)            \
+  V(IfTrue, Operator::kFoldable, 0, 0, 1, 0, 0, 1)         \
+  V(IfFalse, Operator::kFoldable, 0, 0, 1, 0, 0, 1)        \
+  V(Throw, Operator::kFoldable, 1, 1, 1, 0, 0, 1)          \
+  V(Return, Operator::kNoProperties, 1, 1, 1, 0, 0, 1)     \
+  V(OsrNormalEntry, Operator::kFoldable, 0, 1, 1, 0, 1, 1) \
+  V(OsrLoopEntry, Operator::kFoldable, 0, 1, 1, 0, 1, 1)
 
 
 #define CACHED_LOOP_LIST(V) \
   V(1)                      \
   V(2)
 
 
 #define CACHED_MERGE_LIST(V) \
   V(1)                       \
   V(2)                       \
   V(3)                       \
   V(4)                       \
   V(5)                       \
   V(6)                       \
   V(7)                       \
   V(8)
 
 
 #define CACHED_PARAMETER_LIST(V) \
   V(0)                           \
   V(1)                           \
   V(2)                           \
   V(3)                           \
   V(4)                           \
   V(5)                           \
   V(6)
 
 
 struct CommonOperatorGlobalCache FINAL {
-#define CACHED(Name, properties, value_input_count, effect_input_count,     \
-               control_input_count, control_output_count)                   \
-  struct Name##Operator FINAL : public Operator {                           \
-    Name##Operator()                                                        \
-        : Operator(IrOpcode::k##Name, properties, #Name, value_input_count, \
-                   effect_input_count, control_input_count, 0, 0,           \
-                   control_output_count) {}                                 \
-  };                                                                        \
+#define CACHED(Name, properties, value_input_count, effect_input_count,      \
+               control_input_count, value_output_count, effect_output_count, \
+               control_output_count)                                         \
+  struct Name##Operator FINAL : public Operator {                            \
+    Name##Operator()                                                         \
+        : Operator(IrOpcode::k##Name, properties, #Name, value_input_count,  \
+                   effect_input_count, control_input_count,                  \
+                   value_output_count, effect_output_count,                  \
+                   control_output_count) {}                                  \
+  };                                                                         \
   Name##Operator k##Name##Operator;
   CACHED_OP_LIST(CACHED)
 #undef CACHED
 
   template <BranchHint kBranchHint>
   struct BranchOperator FINAL : public Operator1<BranchHint> {
     BranchOperator()
         : Operator1<BranchHint>(                       // --
               IrOpcode::kBranch, Operator::kFoldable,  // opcode
               "Branch",                                // name
@@ skipping 47 matching lines @@
 
 
 static base::LazyInstance<CommonOperatorGlobalCache>::type kCache =
     LAZY_INSTANCE_INITIALIZER;
 
 
 CommonOperatorBuilder::CommonOperatorBuilder(Zone* zone)
     : cache_(kCache.Get()), zone_(zone) {}
 
 
-#define CACHED(Name, properties, value_input_count, effect_input_count, \
-               control_input_count, control_output_count)               \
-  const Operator* CommonOperatorBuilder::Name() {                       \
-    return &cache_.k##Name##Operator;                                   \
+#define CACHED(Name, properties, value_input_count, effect_input_count,      \
+               control_input_count, value_output_count, effect_output_count, \
+               control_output_count)                                         \
+  const Operator* CommonOperatorBuilder::Name() {                            \
+    return &cache_.k##Name##Operator;                                        \
   }
 CACHED_OP_LIST(CACHED)
 #undef CACHED
 
 
 const Operator* CommonOperatorBuilder::Branch(BranchHint hint) {
   switch (hint) {
     case BranchHint::kNone:
       return &cache_.kBranchNoneOperator;
     case BranchHint::kTrue:
@@ skipping 72 matching lines @@
   }
   // Uncached.
   return new (zone()) Operator1<int>(         // --
       IrOpcode::kParameter, Operator::kPure,  // opcode
       "Parameter",                            // name
       1, 0, 0, 1, 0, 0,                       // counts
       index);                                 // parameter
 }
 
 
+const Operator* CommonOperatorBuilder::OsrValue(int index) {
+  return new (zone()) Operator1<int>(        // --
+      IrOpcode::kOsrValue, Operator::kPure,  // opcode
+      "OsrValue",                            // name
+      0, 0, 1, 1, 0, 0,                      // counts
+      index);                                // parameter
+}
+
+
 const Operator* CommonOperatorBuilder::Int32Constant(int32_t value) {
   return new (zone()) Operator1<int32_t>(         // --
       IrOpcode::kInt32Constant, Operator::kPure,  // opcode
       "Int32Constant",                            // name
       0, 0, 0, 1, 0, 0,                           // counts
       value);                                     // parameter
 }
 
 
 const Operator* CommonOperatorBuilder::Int64Constant(int64_t value) {
@@ skipping 145 matching lines @@
   return new (zone()) Operator1<size_t>(       // --
       IrOpcode::kProjection, Operator::kPure,  // opcode
       "Projection",                            // name
       1, 0, 0, 1, 0, 0,                        // counts
       index);                                  // parameter
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8