Merge TRUNCDIV and MOD into one instruction. Icorporated feedback from CL https://codereview.chromi…

runtime/vm/intermediate_language.h

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 654 matching lines @@
   M(UnboxInteger)                                                              \
   M(BoxInteger)                                                                \
   M(BinaryMintOp)                                                              \
   M(ShiftMintOp)                                                               \
   M(UnaryMintOp)                                                               \
   M(CheckArrayBound)                                                           \
   M(Constraint)                                                                \
   M(StringFromCharCode)                                                        \
   M(StringInterpolate)                                                         \
   M(InvokeMathCFunction)                                                       \
+  M(MergedMath)                                                                \
   M(GuardField)                                                                \
   M(IfThenElse)                                                                \
   M(BinaryFloat32x4Op)                                                         \
   M(Simd32x4Shuffle)                                                           \
   M(Simd32x4ShuffleMix)                                                        \
   M(Simd32x4GetSignMask)                                                       \
   M(Float32x4Constructor)                                                      \
   M(Float32x4Zero)                                                             \
   M(Float32x4Splat)                                                            \
   M(Float32x4Comparison)                                                       \
@@ skipping 306 matching lines @@
   friend class MathMinMaxInstr;
   friend class CheckClassInstr;
   friend class GuardFieldInstr;
   friend class CheckSmiInstr;
   friend class CheckArrayBoundInstr;
   friend class CheckEitherNonSmiInstr;
   friend class LICM;
   friend class DoubleToSmiInstr;
   friend class DoubleToDoubleInstr;
   friend class InvokeMathCFunctionInstr;
+  friend class MergedMathInstr;
   friend class FlowGraphOptimizer;
   friend class LoadIndexedInstr;
   friend class StoreIndexedInstr;
   friend class StoreInstanceFieldInstr;
   friend class ComparisonInstr;
   friend class TargetEntryInstr;
   friend class JoinEntryInstr;
   friend class InstanceOfInstr;
   friend class PolymorphicInstanceCallInstr;
   friend class SmiToDoubleInstr;
@@ skipping 5548 matching lines @@
   ZoneGrowableArray<Value*>* inputs_;
 
   LocationSummary* locs_;
 
   const MethodRecognizer::Kind recognized_kind_;
 
   DISALLOW_COPY_AND_ASSIGN(InvokeMathCFunctionInstr);
 };
 
 
+class MergedMathInstr : public Definition {
+ public:
+  enum Kind {
+    kTruncDivMod,
+    kTruncDivRem,
+    kSinCos,
+  };
+
+  MergedMathInstr(ZoneGrowableArray<Value*>* inputs,
+                  intptr_t original_deopt_id,
+                  MergedMathInstr::Kind kind);
+
+  static intptr_t ArgumentCountFor(MergedMathInstr::Kind kind) {

[Florian Schneider, 2013/11/21 11:15:41]

We ususally use ArgumentCount for #arguments to a call. Maybe rename to
InputCountFor?

[srdjan, 2013/11/21 17:32:44]

Done.

+    if (kind == kTruncDivMod) {
+      return 2;
+    } else {
+      UNIMPLEMENTED();
+      return -1;
+    }
+  }
+
+  MergedMathInstr::Kind kind() const { return kind_; }
+
+  virtual intptr_t InputCount() const { return inputs_->length(); }
+
+  virtual Value* InputAt(intptr_t i) const {
+    return (*inputs_)[i];
+  }
+
+  virtual CompileType ComputeType() const;
+  virtual void PrintOperandsTo(BufferFormatter* f) const;
+
+  virtual bool CanDeoptimize() const {
+    if (kind_ == kTruncDivMod) {
+      return true;
+    } else {
+      UNIMPLEMENTED();
+      return false;
+    }
+  }
+
+  virtual Representation representation() const {
+    if (kind_ == kTruncDivMod) {
+      return kTagged;
+    } else {
+      UNIMPLEMENTED();
+      return kTagged;
+    }
+  }
+
+  virtual Representation RequiredInputRepresentation(intptr_t idx) const {
+    if (kind_ == kTruncDivMod) {
+      ASSERT((0 <= idx) && (idx < InputCount()));
+      return kTagged;
+    } else {
+      UNIMPLEMENTED();
+      return kTagged;
+    }
+  }
+
+  virtual intptr_t DeoptimizationTarget() const { return deopt_id_; }
+
+  DECLARE_INSTRUCTION(MergedMath)
+
+  // Returns a structure describing the location constraints required
+  // to emit native code for this definition.
+  LocationSummary* locs() {
+    if (locs_ == NULL) {
+      locs_ = MakeLocationSummary();
+    }
+    return locs_;
+  }
+
+  virtual bool AllowsCSE() const { return true; }
+  virtual EffectSet Effects() const { return EffectSet::None(); }
+  virtual EffectSet Dependencies() const { return EffectSet::None(); }
+  virtual bool AttributesEqual(Instruction* other) const {
+    MergedMathInstr* other_invoke = other->AsMergedMath();
+    return other_invoke->kind() == kind();
+  }
+
+  virtual bool MayThrow() const { return false; }
+
+  static const char* KindToCString(MergedMathInstr::Kind kind) {
+    if (kind == kTruncDivMod) return "TruncDivMod";
+    UNIMPLEMENTED();
+    return "";
+  }
+
+ private:
+  virtual void RawSetInputAt(intptr_t i, Value* value) {
+    (*inputs_)[i] = value;
+  }
+
+  ZoneGrowableArray<Value*>* inputs_;
+  LocationSummary* locs_;
+  MergedMathInstr::Kind kind_;
+
+  DISALLOW_COPY_AND_ASSIGN(MergedMathInstr);
+};
+
+
 class CheckClassInstr : public TemplateInstruction<1> {
  public:
   CheckClassInstr(Value* value,
                   intptr_t deopt_id,
                   const ICData& unary_checks);
 
   DECLARE_INSTRUCTION(CheckClass)
 
   virtual intptr_t ArgumentCount() const { return 0; }
 
@@ skipping 316 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_