Add support for XMM registers in SSA code generation pipeline.

runtime/vm/locations.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_LOCATIONS_H_
 #define VM_LOCATIONS_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/bitfield.h"
@@ skipping 17 matching lines @@
     // Number of bits required to encode Kind value.
     kBitsForKind = 3,
     kBitsForPayload = kWordSize * kBitsPerByte - kBitsForKind,
   };
 
   static const uword kInvalidLocation = 0;
   static const uword kConstantMask = 0x3;
   static const intptr_t kStackIndexBias =
       static_cast<intptr_t>(1) << (kBitsForPayload - 1);
 
+  static const intptr_t kMachineRegisterMask = 0x6;
+  static const intptr_t kMachineRegister = 0x6;
+
  public:
   // Constant payload can overlap with kind field so Kind values
   // have to be chosen in a way that their last 2 bits are never
   // the same as kConstant.
   enum Kind {
     // This location is invalid.  Payload must be zero.
     kInvalid = 0,
 
     // Constant value. This location contains a tagged Object handle.
     kConstant = 1,
 
     // Unallocated location represents a location that is not fixed and can be
     // allocated by a register allocator.  Each unallocated location has
     // a policy that specifies what kind of location is suitable. Payload
     // contains register allocation policy.
     kUnallocated = 2,
 
+    // Spill slot allocated by the register allocator.  Payload contains
+    // a spill index.
+    kStackSlot = 3,
+    kDoubleStackSlot = 4,
+
     // Register location represents a fixed register.  Payload contains
     // register code.
-    kRegister = 3,
+    kRegister = 6,
 
-    // Spill slot allocated by the register allocator.  Payload contains
-    // a spill index.
-    kStackSlot = 4,
+    // XmmRegister location represents a fixed xmm register.  Payload contains
+    // its code.
+    kXmmRegister = 7,
   };
 
   Location() : value_(kInvalidLocation) {
     ASSERT(IsInvalid());
   }
 
   bool IsInvalid() const {
     return value_ == kInvalidLocation;
   }
 
@@ skipping 13 matching lines @@
     ASSERT(IsConstant());
     return *reinterpret_cast<const Object*>(value_ & ~kConstantMask);
   }
 
   // Unallocated locations.
   // TODO(vegorov): writable register policy?
   enum Policy {
     kAny,
     kPrefersRegister,
     kRequiresRegister,
+    kRequiresXmmRegister,
     kSameAsFirstInput,
   };
 
   bool IsUnallocated() const {
     return kind() == kUnallocated;
   }
 
   bool IsRegisterBeneficial() {
     return !Equals(Any());
   }
 
   static Location UnallocatedLocation(Policy policy) {
     return Location(kUnallocated, PolicyField::encode(policy));
   }
 
   // Any free register is suitable to replace this unallocated location.
   static Location Any() {
     return UnallocatedLocation(kAny);
   }
 
   static Location PrefersRegister() {
     return UnallocatedLocation(kPrefersRegister);
   }
 
   static Location RequiresRegister() {
     return UnallocatedLocation(kRequiresRegister);
   }
 
+  static Location RequiresXmmRegister() {
+    return UnallocatedLocation(kRequiresXmmRegister);
+  }
+
   // The location of the first input to the instruction will be
   // used to replace this unallocated location.
   static Location SameAsFirstInput() {
     return UnallocatedLocation(kSameAsFirstInput);
   }
 
   // Empty location. Used if there the location should be ignored.
   static Location NoLocation() {
     return Location();
   }
@@ skipping 10 matching lines @@
 
   bool IsRegister() const {
     return kind() == kRegister;
   }
 
   Register reg() const {
     ASSERT(IsRegister());
     return static_cast<Register>(payload());
   }
 
+  // XmmRegister locations.
+  static Location XmmRegisterLocation(XmmRegister reg) {
+    return Location(kXmmRegister, static_cast<uword>(reg));
+  }
+
+  bool IsXmmRegister() const {
+    return kind() == kXmmRegister;
+  }
+
+  XmmRegister xmm_reg() const {
+    ASSERT(IsXmmRegister());
+    return static_cast<XmmRegister>(payload());
+  }
+
+

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

-1 line.

+  static bool IsMachineRegisterKind(Kind kind) {
+    return (kind & kMachineRegisterMask) == kMachineRegister;
+  }
+
+  static Location MachineRegisterLocation(Kind kind, intptr_t reg) {
+    return Location(kind, reg);
+  }
+
+  bool IsMachineRegister() const {
+    return IsMachineRegisterKind(kind());
+  }
+
+  intptr_t register_code() const {
+    ASSERT(IsMachineRegister());
+    return static_cast<intptr_t>(payload());
+  }
+
   // Spill slots.
   static Location StackSlot(intptr_t stack_index) {
     ASSERT((-kStackIndexBias <= stack_index) &&
            (stack_index < kStackIndexBias));
     Location loc(kStackSlot, static_cast<uword>(kStackIndexBias + stack_index));
     // Ensure that sign is preserved.
     ASSERT(loc.stack_index() == stack_index);
     return loc;
   }
 
   bool IsStackSlot() const {
     return kind() == kStackSlot;
   }
 
+  static Location DoubleStackSlot(intptr_t stack_index) {
+    ASSERT((-kStackIndexBias <= stack_index) &&
+           (stack_index < kStackIndexBias));
+    Location loc(kDoubleStackSlot,
+                 static_cast<uword>(kStackIndexBias + stack_index));
+    // Ensure that sign is preserved.
+    ASSERT(loc.stack_index() == stack_index);
+    return loc;
+  }
+
+  bool IsDoubleStackSlot() const {
+    return kind() == kDoubleStackSlot;
+  }
+
+
   intptr_t stack_index() const {
-    ASSERT(IsStackSlot());
+    ASSERT(IsStackSlot() || IsDoubleStackSlot());
     // Decode stack index manually to preserve sign.
     return payload() - kStackIndexBias;
   }
 
   const char* Name() const;
   void PrintTo(BufferFormatter* f) const;
   void Print() const;
 
   // Compare two locations.
   bool Equals(Location other) const {
@@ skipping 13 matching lines @@
   // If current location is constant might return something that
   // is not equal to any Kind.
   Kind kind() const {
     return KindField::decode(value_);
   }
 
   typedef BitField<Kind, 0, kBitsForKind> KindField;
   typedef BitField<uword, kBitsForKind, kBitsForPayload> PayloadField;
 
   // Layout for kUnallocated locations payload.
-  typedef BitField<Policy, 0, 2> PolicyField;
+  typedef BitField<Policy, 0, 3> PolicyField;
 
   // Location either contains kind and payload fields or a tagged handle for
   // a constant locations. Values of enumeration Kind are selected in such a
   // way that none of them can be interpreted as a kConstant tag.
   uword value_;
 };
 
 
 class RegisterSet : public ValueObject {
  public:
-  RegisterSet() : registers_(0) {
+  RegisterSet() : cpu_registers_(0), xmm_registers_(0) {
     ASSERT(kNumberOfCpuRegisters < (kWordSize * kBitsPerByte));
+    ASSERT(kNumberOfXmmRegisters < (kWordSize * kBitsPerByte));
   }
 
-  void Add(Register reg) {
-    registers_ |= (1 << reg);
+
+  void Add(Location loc) {
+    if (loc.IsRegister()) {
+      cpu_registers_ |= (1 << loc.reg());
+    } else if (loc.IsXmmRegister()) {
+      xmm_registers_ |= (1 << loc.xmm_reg());
+    }
   }
 
-  bool Contains(Register reg) {
-    return (registers_ & (1 << reg)) != 0;
+  void Remove(Location loc) {
+    if (loc.IsRegister()) {
+      cpu_registers_ &= ~(1 << loc.reg());
+    } else if (loc.IsXmmRegister()) {
+      xmm_registers_ &= ~(1 << loc.xmm_reg());
+    }
+  }
+
+  bool ContainsRegister(Register reg) {
+    return (cpu_registers_ & (1 << reg)) != 0;
+  }
+
+  bool ContainsXmmRegister(XmmRegister xmm_reg) {
+    return (xmm_registers_ & (1 << xmm_reg)) != 0;
+  }
+
+  intptr_t xmm_regs_count() {
+    intptr_t count = 0;
+    for (intptr_t reg_idx = 0; reg_idx < kNumberOfXmmRegisters; reg_idx++) {
+      if (ContainsXmmRegister(static_cast<XmmRegister>(reg_idx))) {
+        count++;
+      }
+    }
+    return count;
   }
 
  private:
-  intptr_t registers_;
+  intptr_t cpu_registers_;
+  intptr_t xmm_registers_;
 
   DISALLOW_COPY_AND_ASSIGN(RegisterSet);
 };
 
 
 // Specification of locations for inputs and output.
 class LocationSummary : public ZoneAllocated {
  public:
   enum ContainsCall {
     kNoCall,
@@ skipping 80 matching lines @@
   BitmapBuilder* stack_bitmap_;
 
   const ContainsCall contains_call_;
   RegisterSet live_registers_;
 };
 
 
 }  // namespace dart
 
 #endif  // VM_LOCATIONS_H_