[Turbofan] Allow FP operands and vregs in InstructionSequenceTest.

test/unittests/compiler/instruction-sequence-unittest.h

Index: test/unittests/compiler/instruction-sequence-unittest.h
diff --git a/test/unittests/compiler/instruction-sequence-unittest.h b/test/unittests/compiler/instruction-sequence-unittest.h
index 956f5d55b939095722dc849400bf2ff2f7697594..9e886a2254f7678da44e80419b056027ac6c2beb 100644
--- a/test/unittests/compiler/instruction-sequence-unittest.h
+++ b/test/unittests/compiler/instruction-sequence-unittest.h
@@ -19,14 +19,20 @@ class InstructionSequenceTest : public TestWithIsolateAndZone {
  public:
   static const int kDefaultNRegs = 8;
   static const int kNoValue = kMinInt;
+  static const MachineRepresentation kNoRep = MachineRepresentation::kNone;
+  static const MachineRepresentation kFloat32 = MachineRepresentation::kFloat32;

[Mircea Trofin, 2016/10/08 16:38:56]

why do we need this re-assignment?

[bbudge, 2016/10/10 10:30:07]

I'll use kFloat32 and kSimd128 when I add aliasing tests. But I'll delete them
for now.

+  static const MachineRepresentation kFloat64 = MachineRepresentation::kFloat64;
+  static const MachineRepresentation kSimd128 = MachineRepresentation::kSimd128;
 
   typedef RpoNumber Rpo;
 
   struct VReg {
     VReg() : value_(kNoValue) {}
     VReg(PhiInstruction* phi) : value_(phi->virtual_register()) {}  // NOLINT
-    explicit VReg(int value) : value_(value) {}
+    explicit VReg(int value, MachineRepresentation rep = kNoRep)
+        : value_(value), rep_(rep) {}
     int value_;
+    MachineRepresentation rep_ = kNoRep;
   };
 
   typedef std::pair<VReg, VReg> VRegPair;
@@ -47,43 +53,57 @@ class InstructionSequenceTest : public TestWithIsolateAndZone {
   };
 
   struct TestOperand {
-    TestOperand() : type_(kInvalid), vreg_(), value_(kNoValue) {}
-    TestOperand(TestOperandType type, int imm)
-        : type_(type), vreg_(), value_(imm) {}
+    TestOperand() : type_(kInvalid), vreg_(), value_(kNoValue), rep_(kNoRep) {}
+    explicit TestOperand(TestOperandType type)
+        : type_(type), vreg_(), value_(kNoValue), rep_(kNoRep) {}
+    // For tests that do register allocation.
     TestOperand(TestOperandType type, VReg vreg, int value = kNoValue)
-        : type_(type), vreg_(vreg), value_(value) {}
+        : type_(type), vreg_(vreg), value_(value), rep_(vreg.rep_) {}
+    // For immediates, constants, and tests that don't do register allocation.
+    TestOperand(TestOperandType type, int value,
+                MachineRepresentation rep = kNoRep)
+        : type_(type), vreg_(), value_(value), rep_(rep) {}
 
     TestOperandType type_;
     VReg vreg_;
     int value_;
+    MachineRepresentation rep_;
   };
 
-  static TestOperand Same() { return TestOperand(kSameAsFirst, VReg()); }
+  static TestOperand Same() { return TestOperand(kSameAsFirst); }
 
   static TestOperand ExplicitReg(int index) {
     TestOperandType type = kExplicit;
-    return TestOperand(type, VReg(), index);
+    return TestOperand(type, index);
   }
 
   static TestOperand Reg(VReg vreg, int index = kNoValue) {
-    TestOperandType type = kRegister;
-    if (index != kNoValue) type = kFixedRegister;
+    TestOperandType type = (index == kNoValue) ? kRegister : kFixedRegister;
     return TestOperand(type, vreg, index);
   }
 
-  static TestOperand Reg(int index = kNoValue) { return Reg(VReg(), index); }
+  static TestOperand Reg(int index = kNoValue,
+                         MachineRepresentation rep = kNoRep) {
+    return Reg(VReg(kNoValue, rep), index);
+  }
+
+  static TestOperand FPReg(MachineRepresentation rep, int index = kNoValue) {
+    return Reg(index, rep);
+  }
 
   static TestOperand Slot(VReg vreg, int index = kNoValue) {
-    TestOperandType type = kSlot;
-    if (index != kNoValue) type = kFixedSlot;
+    TestOperandType type = (index == kNoValue) ? kSlot : kFixedSlot;
     return TestOperand(type, vreg, index);
   }
 
-  static TestOperand Slot(int index = kNoValue) { return Slot(VReg(), index); }
+  static TestOperand Slot(int index = kNoValue,
+                          MachineRepresentation rep = kNoRep) {
+    return Slot(VReg(kNoValue, rep), index);
+  }
 
   static TestOperand Const(int index) {
     CHECK_NE(kNoValue, index);
-    return TestOperand(kConstant, VReg(), index);
+    return TestOperand(kConstant, index);
   }
 
   static TestOperand Use(VReg vreg) { return TestOperand(kNone, vreg); }
@@ -129,6 +149,7 @@ class InstructionSequenceTest : public TestWithIsolateAndZone {
   InstructionSequenceTest();
 
   void SetNumRegs(int num_general_registers, int num_double_registers);
+  int GetNumRegs(MachineRepresentation rep);
   RegisterConfiguration* config();
   InstructionSequence* sequence();
 
@@ -140,6 +161,12 @@ class InstructionSequenceTest : public TestWithIsolateAndZone {
   TestOperand Imm(int32_t imm = 0);
   VReg Define(TestOperand output_op);
   VReg Parameter(TestOperand output_op = Reg()) { return Define(output_op); }
+  VReg FPParameter(MachineRepresentation rep) { return Parameter(FPReg(rep)); }
+
+  MachineRepresentation GetCanonicalRep(TestOperand op) {
+    return IsFloatingPoint(op.rep_) ? op.rep_
+                                    : sequence()->DefaultRepresentation();
+  }
 
   Instruction* Return(TestOperand input_op_0);
   Instruction* Return(VReg vreg) { return Return(Reg(vreg, 0)); }
@@ -177,16 +204,21 @@ class InstructionSequenceTest : public TestWithIsolateAndZone {
                 TestOperand input_op_3 = TestOperand());
 
   InstructionBlock* current_block() const { return current_block_; }
-  int num_general_registers() const { return num_general_registers_; }
-  int num_double_registers() const { return num_double_registers_; }
 
   // Called after all instructions have been inserted.
   void WireBlocks();
 
  private:
-  VReg NewReg() { return VReg(sequence()->NextVirtualRegister()); }
+  virtual bool DoesRegisterAllocation() { return true; }

[Mircea Trofin, 2016/10/08 16:38:56]

can you mark this const, please?

[bbudge, 2016/10/10 10:30:07]

Done.

+
+  VReg NewReg(TestOperand op = TestOperand()) {
+    int vreg = sequence()->NextVirtualRegister();
+    if (IsFloatingPoint(op.rep_))
+      sequence()->MarkAsRepresentation(op.rep_, vreg);
+    return VReg(vreg, op.rep_);
+  }
 
-  static TestOperand Invalid() { return TestOperand(kInvalid, VReg()); }
+  static TestOperand Invalid() { return TestOperand(kInvalid); }
 
   Instruction* EmitBranch(TestOperand input_op);
   Instruction* EmitFallThrough();