[turbofan] Cache more common operators.

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 107 matching lines @@
   V(IfSuccess, Operator::kKontrol, 0, 0, 1, 0, 0, 1)       \
   V(IfException, Operator::kKontrol, 0, 0, 1, 0, 0, 1)     \
   V(IfDefault, Operator::kKontrol, 0, 0, 1, 0, 0, 1)       \
   V(Throw, Operator::kFoldable, 1, 1, 1, 0, 0, 1)          \
   V(Deoptimize, Operator::kNoThrow, 1, 1, 1, 0, 0, 1)      \
   V(Return, Operator::kNoThrow, 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_EFFECT_PHI_LIST(V) \
+  V(1)                            \
+  V(2)                            \
+  V(3)                            \
+  V(4)                            \
+  V(5)                            \
+  V(6)
+
+
 #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)
 
 
+#define CACHED_PHI_LIST(V) \
+  V(kMachAnyTagged, 1)     \
+  V(kMachAnyTagged, 2)     \
+  V(kMachAnyTagged, 3)     \
+  V(kMachAnyTagged, 4)     \
+  V(kMachAnyTagged, 5)     \
+  V(kMachAnyTagged, 6)     \
+  V(kMachBool, 2)          \
+  V(kMachFloat64, 2)       \
+  V(kMachInt32, 2)
+
+
+#define CACHED_PROJECTION_LIST(V) \
+  V(0)                            \
+  V(1)
+
+
+#define CACHED_STATE_VALUES_LIST(V) \
+  V(0)                              \
+  V(1)                              \
+  V(2)                              \
+  V(3)                              \
+  V(4)                              \
+  V(5)                              \
+  V(6)                              \
+  V(7)                              \
+  V(8)                              \
+  V(10)                             \
+  V(11)                             \
+  V(12)                             \
+  V(13)                             \
+  V(14)
+
+
 struct CommonOperatorGlobalCache FINAL {
 #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::kKontrol,  // opcode
               "Branch",                               // name
               1, 0, 1, 0, 0, 2,                       // counts
               kBranchHint) {}                         // parameter
   };
   BranchOperator<BranchHint::kNone> kBranchNoneOperator;
   BranchOperator<BranchHint::kTrue> kBranchTrueOperator;
   BranchOperator<BranchHint::kFalse> kBranchFalseOperator;
 
+  template <int kEffectInputCount>
+  struct EffectPhiOperator FINAL : public Operator {
+    EffectPhiOperator()
+        : Operator(                                   // --
+              IrOpcode::kEffectPhi, Operator::kPure,  // opcode
+              "EffectPhi",                            // name
+              0, kEffectInputCount, 1, 0, 1, 0) {}    // counts
+  };
+#define CACHED_EFFECT_PHI(input_count) \
+  EffectPhiOperator<input_count> kEffectPhi##input_count##Operator;
+  CACHED_EFFECT_PHI_LIST(CACHED_EFFECT_PHI)
+#undef CACHED_EFFECT_PHI
+
   template <size_t kInputCount>
   struct LoopOperator FINAL : public Operator {
     LoopOperator()
         : Operator(                                 // --
               IrOpcode::kLoop, Operator::kKontrol,  // opcode
               "Loop",                               // name
               0, 0, kInputCount, 0, 0, 1) {}        // counts
   };
 #define CACHED_LOOP(input_count) \
   LoopOperator<input_count> kLoop##input_count##Operator;
   CACHED_LOOP_LIST(CACHED_LOOP)
 #undef CACHED_LOOP
 
   template <size_t kInputCount>
   struct MergeOperator FINAL : public Operator {
     MergeOperator()
         : Operator(                                  // --
               IrOpcode::kMerge, Operator::kKontrol,  // opcode
               "Merge",                               // name
               0, 0, kInputCount, 0, 0, 1) {}         // counts
   };
 #define CACHED_MERGE(input_count) \
   MergeOperator<input_count> kMerge##input_count##Operator;
   CACHED_MERGE_LIST(CACHED_MERGE)
 #undef CACHED_MERGE
 
+  template <MachineType kType, int kInputCount>
+  struct PhiOperator FINAL : public Operator1<MachineType> {
+    PhiOperator()
+        : Operator1<MachineType>(               //--
+              IrOpcode::kPhi, Operator::kPure,  // opcode
+              "Phi",                            // name
+              kInputCount, 0, 1, 1, 0, 0,       // counts
+              kType) {}                         // parameter
+  };
+#define CACHED_PHI(type, input_count) \
+  PhiOperator<type, input_count> kPhi##type##input_count##Operator;
+  CACHED_PHI_LIST(CACHED_PHI)
+#undef CACHED_PHI
+
   template <int kIndex>
   struct ParameterOperator FINAL : public Operator1<int> {
     ParameterOperator()
         : Operator1<int>(                             // --
               IrOpcode::kParameter, Operator::kPure,  // opcode
               "Parameter",                            // name
               1, 0, 0, 1, 0, 0,                       // counts,
               kIndex) {}                              // parameter
   };
 #define CACHED_PARAMETER(index) \
   ParameterOperator<index> kParameter##index##Operator;
   CACHED_PARAMETER_LIST(CACHED_PARAMETER)
 #undef CACHED_PARAMETER
+
+  template <size_t kIndex>
+  struct ProjectionOperator FINAL : public Operator1<size_t> {
+    ProjectionOperator()
+        : Operator1<size_t>(                             // --
+              IrOpcode::kProjection,                     // opcode
+              Operator::kFoldable | Operator::kNoThrow,  // flags
+              "Projection",                              // name
+              1, 0, 0, 1, 0, 0,                          // counts,
+              kIndex) {}                                 // parameter
+  };
+#define CACHED_PROJECTION(index) \
+  ProjectionOperator<index> kProjection##index##Operator;
+  CACHED_PROJECTION_LIST(CACHED_PROJECTION)
+#undef CACHED_PROJECTION
+
+  template <int kInputCount>
+  struct StateValuesOperator FINAL : public Operator {
+    StateValuesOperator()
+        : Operator(                           // --
+              IrOpcode::kStateValues,         // opcode
+              Operator::kPure,                // flags
+              "StateValues",                  // name
+              kInputCount, 0, 0, 1, 0, 0) {}  // counts
+  };
+#define CACHED_STATE_VALUES(input_count) \
+  StateValuesOperator<input_count> kStateValues##input_count##Operator;
+  CACHED_STATE_VALUES_LIST(CACHED_STATE_VALUES)
+#undef CACHED_STATE_VALUES
 };
 
 
 static base::LazyInstance<CommonOperatorGlobalCache>::type kCache =
     LAZY_INSTANCE_INITIALIZER;
 
 
 CommonOperatorBuilder::CommonOperatorBuilder(Zone* zone)
     : cache_(kCache.Get()), zone_(zone) {}
 
@@ skipping 185 matching lines @@
 const Operator* CommonOperatorBuilder::Select(MachineType type,
                                               BranchHint hint) {
   return new (zone()) Operator1<SelectParameters>(  // --
       IrOpcode::kSelect, Operator::kPure,           // opcode
       "Select",                                     // name
       3, 0, 0, 1, 0, 0,                             // counts
       SelectParameters(type, hint));                // parameter
 }
 
 
-const Operator* CommonOperatorBuilder::Phi(MachineType type, int arguments) {
-  DCHECK(arguments > 0);                       // Disallow empty phis.
+const Operator* CommonOperatorBuilder::Phi(MachineType type,
+                                           int value_input_count) {
+  DCHECK(value_input_count > 0);  // Disallow empty phis.
+#define CACHED_PHI(kType, kValueInputCount)                     \
+  if (kType == type && kValueInputCount == value_input_count) { \
+    return &cache_.kPhi##kType##kValueInputCount##Operator;     \
+  }
+  CACHED_PHI_LIST(CACHED_PHI)
+#undef CACHED_PHI
+  // Uncached.
   return new (zone()) Operator1<MachineType>(  // --
       IrOpcode::kPhi, Operator::kPure,         // opcode
       "Phi",                                   // name
-      arguments, 0, 1, 1, 0, 0,                // counts
+      value_input_count, 0, 1, 1, 0, 0,        // counts
       type);                                   // parameter
 }
 
 
-const Operator* CommonOperatorBuilder::EffectPhi(int arguments) {
-  DCHECK(arguments > 0);                      // Disallow empty phis.
+const Operator* CommonOperatorBuilder::EffectPhi(int effect_input_count) {
+  DCHECK(effect_input_count > 0);  // Disallow empty effect phis.
+  switch (effect_input_count) {
+#define CACHED_EFFECT_PHI(input_count) \
+  case input_count:                    \
+    return &cache_.kEffectPhi##input_count##Operator;
+    CACHED_EFFECT_PHI_LIST(CACHED_EFFECT_PHI)
+#undef CACHED_EFFECT_PHI
+    default:
+      break;
+  }
+  // Uncached.
   return new (zone()) Operator(               // --
       IrOpcode::kEffectPhi, Operator::kPure,  // opcode
       "EffectPhi",                            // name
-      0, arguments, 1, 0, 1, 0);              // counts
+      0, effect_input_count, 1, 0, 1, 0);     // counts
 }
 
 
 const Operator* CommonOperatorBuilder::EffectSet(int arguments) {
   DCHECK(arguments > 1);                      // Disallow empty/singleton sets.
   return new (zone()) Operator(               // --
       IrOpcode::kEffectSet, Operator::kPure,  // opcode
       "EffectSet",                            // name
       0, arguments, 0, 0, 1, 0);              // counts
 }
@@ skipping 11 matching lines @@
 const Operator* CommonOperatorBuilder::Finish(int arguments) {
   DCHECK(arguments > 0);                   // Disallow empty finishes.
   return new (zone()) Operator(            // --
       IrOpcode::kFinish, Operator::kPure,  // opcode
       "Finish",                            // name
       1, arguments, 0, 1, 0, 0);           // counts
 }
 
 
 const Operator* CommonOperatorBuilder::StateValues(int arguments) {
+  switch (arguments) {
+#define CACHED_STATE_VALUES(arguments) \
+  case arguments:                      \
+    return &cache_.kStateValues##arguments##Operator;
+    CACHED_STATE_VALUES_LIST(CACHED_STATE_VALUES)
+#undef CACHED_STATE_VALUES
+    default:
+      break;
+  }
+  // Uncached.
   return new (zone()) Operator(                 // --
       IrOpcode::kStateValues, Operator::kPure,  // opcode
       "StateValues",                            // name
       arguments, 0, 0, 1, 0, 0);                // counts
 }
 
 
 const Operator* CommonOperatorBuilder::FrameState(
     FrameStateType type, BailoutId bailout_id,
     OutputFrameStateCombine state_combine, MaybeHandle<JSFunction> jsfunction) {
@@ skipping 20 matching lines @@
 
     void PrintParameter(std::ostream& os) const OVERRIDE {
       os << "[" << *parameter() << "]";
     }
   };
   return new (zone()) CallOperator(descriptor, "Call");
 }
 
 
 const Operator* CommonOperatorBuilder::Projection(size_t index) {
+  switch (index) {
+#define CACHED_PROJECTION(index) \
+  case index:                    \
+    return &cache_.kProjection##index##Operator;
+    CACHED_PROJECTION_LIST(CACHED_PROJECTION)
+#undef CACHED_PROJECTION
+    default:
+      break;
+  }
+  // Uncached.
   return new (zone()) Operator1<size_t>(         // --
       IrOpcode::kProjection,                     // opcode
       Operator::kFoldable | Operator::kNoThrow,  // flags
       "Projection",                              // name
       1, 0, 0, 1, 0, 0,                          // counts
       index);                                    // parameter
 }
 
 
 const Operator* CommonOperatorBuilder::ResizeMergeOrPhi(const Operator* op,
                                                         int size) {
   if (op->opcode() == IrOpcode::kPhi) {
     return Phi(OpParameter<MachineType>(op), size);
   } else if (op->opcode() == IrOpcode::kEffectPhi) {
     return EffectPhi(size);
   } else if (op->opcode() == IrOpcode::kMerge) {
     return Merge(size);
   } else if (op->opcode() == IrOpcode::kLoop) {
     return Loop(size);
   } else {
     UNREACHABLE();
     return nullptr;
   }
 }
 
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8