Add support for XMM registers in SSA code generation pipeline.

runtime/vm/intermediate_language.h

 // Copyright (c) 2012, 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 85 matching lines @@
   M(CatchEntry, CatchEntryComp)                                                \
   M(BinarySmiOp, BinarySmiOpComp)                                              \
   M(BinaryMintOp, BinaryMintOpComp)                                            \
   M(BinaryDoubleOp, BinaryDoubleOpComp)                                        \
   M(UnarySmiOp, UnarySmiOpComp)                                                \
   M(NumberNegate, NumberNegateComp)                                            \
   M(CheckStackOverflow, CheckStackOverflowComp)                                \
   M(DoubleToDouble, DoubleToDoubleComp)                                        \
   M(SmiToDouble, SmiToDoubleComp)                                              \
   M(CheckClass, CheckClassComp)                                                \
-  M(Materialize, MaterializeComp)
+  M(Materialize, MaterializeComp)                                              \
+  M(CheckEitherNonSmi, CheckEitherNonSmiComp)                                  \
+  M(UnboxedDoubleBinaryOp, UnboxedDoubleBinaryOpComp)                          \
+  M(UnboxDouble, UnboxDoubleComp)                                              \
+  M(BoxDouble, BoxDoubleComp)
 
 
 #define FORWARD_DECLARATION(ShortName, ClassName) class ClassName;
 FOR_EACH_COMPUTATION(FORWARD_DECLARATION)
 FOR_EACH_VALUE(FORWARD_DECLARATION)
 #undef FORWARD_DECLARATION
 
 // Forward declarations.
 class BindInstr;
 class BranchInstr;
 class BufferFormatter;
 class ComparisonComp;
 class Definition;
 class Instruction;
 class PushArgumentInstr;
 class Value;
 
+
+enum Representation {
+  kTagged, kUnboxedDouble
+};
+
+
 class Computation : public ZoneAllocated {
  public:
   Computation() : deopt_id_(Isolate::kNoDeoptId), ic_data_(NULL), locs_(NULL) {
     Isolate* isolate = Isolate::Current();
     deopt_id_ = isolate->GetNextDeoptId();
     ic_data_ = isolate->GetICDataForDeoptId(deopt_id_);
   }
 
   // Unique id used for deoptimization.
   intptr_t deopt_id() const { return deopt_id_; }
@@ skipping 84 matching lines @@
   enum ComputationKind {
 #define DECLARE_COMPUTATION_KIND(ShortName, ClassName) k##ShortName,
 
   FOR_EACH_COMPUTATION(DECLARE_COMPUTATION_KIND)
 
 #undef DECLARE_COMPUTATION_KIND
   };
 
   virtual ComputationKind computation_kind() const = 0;
 
+  virtual Representation representation() const {
+    return kTagged;
+  }
+
   // Declare predicate for each computation.
 #define DECLARE_PREDICATE(ShortName, ClassName)                                \
   inline bool Is##ShortName() const;                                           \
   inline const ClassName* As##ShortName() const;                               \
   inline ClassName* As##ShortName();
 FOR_EACH_COMPUTATION(DECLARE_PREDICATE)
 #undef DECLARE_PREDICATE
 
  private:
   intptr_t deopt_id_;
@@ skipping 182 matching lines @@
 
   UseVal* next_use() const { return next_use_; }
   UseVal* previous_use() const { return previous_use_; }
   virtual void RemoveFromUseList();
   virtual void RemoveInputUses() { RemoveFromUseList(); }
 
   virtual intptr_t ResultCid() const;
 
  private:
   void AddToUseList();
+
   Definition* definition_;
   UseVal* next_use_;
   UseVal* previous_use_;
 
   friend class Definition;
 
   DISALLOW_COPY_AND_ASSIGN(UseVal);
 };
 
 
@@ skipping 1203 matching lines @@
   virtual bool CanDeoptimize() const { return false; }
 
  private:
   const LocalVariable& exception_var_;
   const LocalVariable& stacktrace_var_;
 
   DISALLOW_COPY_AND_ASSIGN(CatchEntryComp);
 };
 
 
+class CheckEitherNonSmiComp : public TemplateComputation<2> {
+ public:
+  CheckEitherNonSmiComp(Value* left, Value* right, InstanceCallComp* original)
+      : original_(original) {
+    ASSERT(left != NULL);
+    ASSERT(right != NULL);
+    inputs_[0] = left;
+    inputs_[1] = right;
+  }
+
+  DECLARE_COMPUTATION(CheckEitherNonSmi)
+
+  virtual bool CanDeoptimize() const { return true; }
+
+  virtual bool HasSideEffect() const { return false; }
+
+  Value* left() const { return inputs_[0]; }
+
+  Value* right() const { return inputs_[0]; }
+
+  intptr_t deopt_id() const { return original_->deopt_id(); }

[Florian Schneider, 2012/08/24 11:09:28]

Either add accessors to the other deoptimizing instructions like UnboxDoubleComp
as well, or always access deopt_id, try_index via the original()->deopt_id() in
the code generator (which is currently the more common style)

[Vyacheslav Egorov (Google), 2012/08/24 13:23:01]

Done.

[Vyacheslav Egorov (Google), 2012/08/24 13:23:01]

Done.

+  intptr_t try_index() const { return original_->try_index(); }
+
+ private:
+  InstanceCallComp* original_;

[Florian Schneider, 2012/08/24 11:09:28]

Maybe rename to instance_call_ for consistency?

[Vyacheslav Egorov (Google), 2012/08/24 13:23:01]

Done.

+
+  DISALLOW_COPY_AND_ASSIGN(CheckEitherNonSmiComp);
+};
+
+
+class BoxDoubleComp : public TemplateComputation<1> {
+ public:
+  BoxDoubleComp(Value* value, InstanceCallComp* instance_call)
+      : instance_call_(instance_call) {
+    ASSERT(value != NULL);
+    inputs_[0] = value;
+  }
+
+  Value* value() const { return inputs_[0]; }
+  InstanceCallComp* instance_call() const { return instance_call_; }
+
+  virtual bool CanDeoptimize() const { return false; }
+
+  virtual intptr_t ResultCid() const;
+
+  DECLARE_COMPUTATION(BoxDouble)
+
+ private:
+  InstanceCallComp* instance_call_;
+
+  DISALLOW_COPY_AND_ASSIGN(BoxDoubleComp);
+};
+
+
+class UnboxDoubleComp : public TemplateComputation<1> {
+ public:
+  UnboxDoubleComp(Value* value, InstanceCallComp* instance_call)
+      : instance_call_(instance_call) {
+    ASSERT(value != NULL);
+    inputs_[0] = value;
+  }
+
+  Value* value() const { return inputs_[0]; }
+  InstanceCallComp* instance_call() const { return instance_call_; }
+
+  virtual bool CanDeoptimize() const { return true; }

[Florian Schneider, 2012/08/24 11:09:28]

More precisely:

return (value()->ResultCid() != kDoubleCid);

[Vyacheslav Egorov (Google), 2012/08/24 13:23:01]

Done.

+
+  virtual Representation representation() const {
+    return kUnboxedDouble;
+  }
+
+  DECLARE_COMPUTATION(UnboxDouble)
+
+ private:
+  InstanceCallComp* instance_call_;
+
+  DISALLOW_COPY_AND_ASSIGN(UnboxDoubleComp);
+};
+
+
+class UnboxedDoubleBinaryOpComp : public TemplateComputation<2> {
+ public:
+  UnboxedDoubleBinaryOpComp(Token::Kind op_kind,
+                            InstanceCallComp* instance_call,
+                            Value* left,
+                            Value* right)
+      : op_kind_(op_kind),
+        instance_call_(instance_call) {
+    ASSERT(left != NULL);
+    ASSERT(right != NULL);
+    inputs_[0] = left;
+    inputs_[1] = right;
+  }
+
+  Value* left() const { return inputs_[0]; }
+  Value* right() const { return inputs_[1]; }
+
+  Token::Kind op_kind() const { return op_kind_; }
+
+  InstanceCallComp* instance_call() const { return instance_call_; }
+
+  virtual void PrintOperandsTo(BufferFormatter* f) const;
+
+  virtual bool CanDeoptimize() const { return false; }
+
+  virtual Representation representation() const {
+    return kUnboxedDouble;
+  }
+
+  DECLARE_COMPUTATION(UnboxedDoubleBinaryOp)
+
+ private:
+  const Token::Kind op_kind_;
+  InstanceCallComp* instance_call_;

[Florian Schneider, 2012/08/24 11:09:28]

No need for instance_call_ here. This instruction does not deoptimize and does
not need deopt_id, etc. from the original instance call.

[Vyacheslav Egorov (Google), 2012/08/24 13:23:01]

Done.

+
+  DISALLOW_COPY_AND_ASSIGN(UnboxedDoubleBinaryOpComp);
+};
+
+
 class BinarySmiOpComp : public TemplateComputation<2> {
  public:
   BinarySmiOpComp(Token::Kind op_kind,
                   InstanceCallComp* instance_call,
                   Value* left,
                   Value* right)
       : op_kind_(op_kind),
         instance_call_(instance_call) {
     ASSERT(left != NULL);
     ASSERT(right != NULL);
@@ skipping 423 matching lines @@
   }
 
   Environment* env() const { return env_; }
   void set_env(Environment* env) { env_ = env; }
 
   intptr_t lifetime_position() const { return lifetime_position_; }
   void set_lifetime_position(intptr_t pos) {
     lifetime_position_ = pos;
   }
 
+  virtual Representation representation() const {
+    return kTagged;
+  }
+
  private:
   friend class BindInstr;  // Needed for BindInstr::InsertBefore.
 
   intptr_t lifetime_position_;  // Position used by register allocator.
   Instruction* previous_;
   Instruction* next_;
   Environment* env_;
   DISALLOW_COPY_AND_ASSIGN(Instruction);
 };
 
@@ skipping 548 matching lines @@
     return computation()->locs();
   }
 
   virtual void EmitNativeCode(FlowGraphCompiler* compiler);
 
   virtual void RemoveInputUses() { computation()->RemoveInputUses(); }
 
   // Insert this instruction before 'next'.
   void InsertBefore(BindInstr* next);
 
+  virtual Representation representation() const {
+    return computation()->representation();
+  }
+
  private:
   Computation* computation_;
   const bool is_used_;
 
   DISALLOW_COPY_AND_ASSIGN(BindInstr);
 };
 
 
 class PhiInstr : public Definition {
  public:
@@ skipping 384 matching lines @@
     ASSERT((ix >= 0) && (ix < values_.length()));
     return &locations_[ix];
   }
 
   intptr_t fixed_parameter_count() const {
     return fixed_parameter_count_;
   }
 
   void PrintTo(BufferFormatter* f) const;
 
+  Environment* Clone() const {
+    return new Environment(values_, fixed_parameter_count_);
+  }
+
  private:
+  Environment(const GrowableArray<Value*>& values,
+              intptr_t fixed_parameter_count);
+
   GrowableArray<Value*> values_;
   Location* locations_;
   const intptr_t fixed_parameter_count_;
 
   DISALLOW_COPY_AND_ASSIGN(Environment);
 };
 
 
 // Visitor base class to visit each instruction and computation in a flow
 // graph as defined by a reversed list of basic blocks.
@@ skipping 30 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_