[turbofan] Make MachineType a pair of enums.

test/unittests/compiler/machine-operator-unittest.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/machine-operator.h"
 #include "src/compiler/opcodes.h"
 #include "src/compiler/operator.h"
 #include "src/compiler/operator-properties.h"
 #include "test/unittests/test-utils.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
 #if GTEST_HAS_COMBINE
 
 template <typename T>
 class MachineOperatorTestWithParam
     : public TestWithZone,
-      public ::testing::WithParamInterface< ::testing::tuple<MachineType, T> > {
+      public ::testing::WithParamInterface<
+          ::testing::tuple<MachineRepresentation, T> > {
  protected:
-  MachineType type() const { return ::testing::get<0>(B::GetParam()); }
+  MachineRepresentation representation() const {
+    return ::testing::get<0>(B::GetParam());
+  }
   const T& GetParam() const { return ::testing::get<1>(B::GetParam()); }
 
  private:
-  typedef ::testing::WithParamInterface< ::testing::tuple<MachineType, T> > B;
+  typedef ::testing::WithParamInterface<
+      ::testing::tuple<MachineRepresentation, T> > B;
 };
 
 
 namespace {
 
-const MachineType kMachineReps[] = {kRepWord32, kRepWord64};
+const MachineRepresentation kMachineReps[] = {MachineRepresentation::kWord32,
+                                              MachineRepresentation::kWord64};
 
 
 const MachineType kMachineTypesForAccess[] = {
-    kMachFloat32, kMachFloat64,   kMachInt8,   kMachUint8, kMachInt16,
-    kMachUint16,  kMachInt32,     kMachUint32, kMachInt64, kMachUint64,
-    kMachPtr,     kMachAnyTagged, kMachPtr};
+    MachineType::Float32(), MachineType::Float64(),  MachineType::Int8(),
+    MachineType::Uint8(),   MachineType::Int16(),    MachineType::Uint16(),
+    MachineType::Int32(),   MachineType::Uint32(),   MachineType::Int64(),
+    MachineType::Uint64(),  MachineType::AnyTagged()};
 
 }  // namespace
 
 
 // -----------------------------------------------------------------------------
 // Load operator.
 
 
 typedef MachineOperatorTestWithParam<LoadRepresentation>
     MachineLoadOperatorTest;
 
 
 TEST_P(MachineLoadOperatorTest, InstancesAreGloballyShared) {
-  MachineOperatorBuilder machine1(zone(), type());
-  MachineOperatorBuilder machine2(zone(), type());
+  MachineOperatorBuilder machine1(zone(), representation());
+  MachineOperatorBuilder machine2(zone(), representation());
   EXPECT_EQ(machine1.Load(GetParam()), machine2.Load(GetParam()));
 }
 
 
 TEST_P(MachineLoadOperatorTest, NumberOfInputsAndOutputs) {
-  MachineOperatorBuilder machine(zone(), type());
+  MachineOperatorBuilder machine(zone(), representation());
   const Operator* op = machine.Load(GetParam());
 
   EXPECT_EQ(2, op->ValueInputCount());
   EXPECT_EQ(1, op->EffectInputCount());
   EXPECT_EQ(1, op->ControlInputCount());
   EXPECT_EQ(4, OperatorProperties::GetTotalInputCount(op));
 
   EXPECT_EQ(1, op->ValueOutputCount());
   EXPECT_EQ(1, op->EffectOutputCount());
   EXPECT_EQ(0, op->ControlOutputCount());
 }
 
 
 TEST_P(MachineLoadOperatorTest, OpcodeIsCorrect) {
-  MachineOperatorBuilder machine(zone(), type());
+  MachineOperatorBuilder machine(zone(), representation());
   EXPECT_EQ(IrOpcode::kLoad, machine.Load(GetParam())->opcode());
 }
 
 
 TEST_P(MachineLoadOperatorTest, ParameterIsCorrect) {
-  MachineOperatorBuilder machine(zone(), type());
+  MachineOperatorBuilder machine(zone(), representation());
   EXPECT_EQ(GetParam(),
             OpParameter<LoadRepresentation>(machine.Load(GetParam())));
 }
 
 
 INSTANTIATE_TEST_CASE_P(
     MachineOperatorTest, MachineLoadOperatorTest,
     ::testing::Combine(::testing::ValuesIn(kMachineReps),
                        ::testing::ValuesIn(kMachineTypesForAccess)));
 
@@ skipping 10 matching lines @@
     return StoreRepresentation(
         ::testing::get<0>(MachineOperatorTestWithParam<
             ::testing::tuple<MachineType, WriteBarrierKind> >::GetParam()),
         ::testing::get<1>(MachineOperatorTestWithParam<
             ::testing::tuple<MachineType, WriteBarrierKind> >::GetParam()));
   }
 };
 
 
 TEST_P(MachineStoreOperatorTest, InstancesAreGloballyShared) {
-  MachineOperatorBuilder machine1(zone(), type());
-  MachineOperatorBuilder machine2(zone(), type());
+  MachineOperatorBuilder machine1(zone(), representation());
+  MachineOperatorBuilder machine2(zone(), representation());
   EXPECT_EQ(machine1.Store(GetParam()), machine2.Store(GetParam()));
 }
 
 
 TEST_P(MachineStoreOperatorTest, NumberOfInputsAndOutputs) {
-  MachineOperatorBuilder machine(zone(), type());
+  MachineOperatorBuilder machine(zone(), representation());
   const Operator* op = machine.Store(GetParam());
 
   EXPECT_EQ(3, op->ValueInputCount());
   EXPECT_EQ(1, op->EffectInputCount());
   EXPECT_EQ(1, op->ControlInputCount());
   EXPECT_EQ(5, OperatorProperties::GetTotalInputCount(op));
 
   EXPECT_EQ(0, op->ValueOutputCount());
   EXPECT_EQ(1, op->EffectOutputCount());
   EXPECT_EQ(0, op->ControlOutputCount());
 }
 
 
 TEST_P(MachineStoreOperatorTest, OpcodeIsCorrect) {
-  MachineOperatorBuilder machine(zone(), type());
+  MachineOperatorBuilder machine(zone(), representation());
   EXPECT_EQ(IrOpcode::kStore, machine.Store(GetParam())->opcode());
 }
 
 
 TEST_P(MachineStoreOperatorTest, ParameterIsCorrect) {
-  MachineOperatorBuilder machine(zone(), type());
+  MachineOperatorBuilder machine(zone(), representation());
   EXPECT_EQ(GetParam(),
             OpParameter<StoreRepresentation>(machine.Store(GetParam())));
 }
 
 
 INSTANTIATE_TEST_CASE_P(
     MachineOperatorTest, MachineStoreOperatorTest,
     ::testing::Combine(
         ::testing::ValuesIn(kMachineReps),
         ::testing::Combine(::testing::ValuesIn(kMachineTypesForAccess),
@@ skipping 99 matching lines @@
     PURE(Float64ExtractHighWord32, 1, 0, 1),  // --
     PURE(Float64InsertLowWord32, 2, 0, 1),    // --
     PURE(Float64InsertHighWord32, 2, 0, 1),   // --
 #undef PURE
 };
 
 }  // namespace
 
 class MachinePureOperatorTest : public TestWithZone {
  protected:
-  MachineType word_type() { return kMachPtr; }
+  MachineRepresentation word_type() {
+    return MachineType::PointerRepresentation();
+  }
 };
 
 
 TEST_F(MachinePureOperatorTest, PureOperators) {
-  TRACED_FOREACH(MachineType, machine_rep1, kMachineReps) {
+  TRACED_FOREACH(MachineRepresentation, machine_rep1, kMachineReps) {
     MachineOperatorBuilder machine1(zone(), machine_rep1);
-    TRACED_FOREACH(MachineType, machine_rep2, kMachineReps) {
+    TRACED_FOREACH(MachineRepresentation, machine_rep2, kMachineReps) {
       MachineOperatorBuilder machine2(zone(), machine_rep2);
       TRACED_FOREACH(PureOperator, pop, kPureOperators) {
         const Operator* op1 = (machine1.*pop.constructor)();
         const Operator* op2 = (machine2.*pop.constructor)();
         EXPECT_EQ(op1, op2);
         EXPECT_EQ(pop.value_input_count, op1->ValueInputCount());
         EXPECT_EQ(pop.control_input_count, op1->ControlInputCount());
         EXPECT_EQ(pop.value_output_count, op1->ValueOutputCount());
       }
     }
@@ skipping 33 matching lines @@
     OPTIONAL_ENTRY(Float64RoundDown, 1, 0, 1),      // --
     OPTIONAL_ENTRY(Float64RoundTruncate, 1, 0, 1),  // --
     OPTIONAL_ENTRY(Float64RoundTiesAway, 1, 0, 1),  // --
 #undef OPTIONAL_ENTRY
 };
 }  // namespace
 
 
 class MachineOptionalOperatorTest : public TestWithZone {
  protected:
-  MachineType word_type() { return kMachPtr; }
+  MachineRepresentation word_rep() {
+    return MachineType::PointerRepresentation();
+  }
 };
 
 
 TEST_F(MachineOptionalOperatorTest, OptionalOperators) {
   TRACED_FOREACH(OptionalOperatorEntry, pop, kOptionalOperators) {
-    TRACED_FOREACH(MachineType, machine_rep1, kMachineReps) {
+    TRACED_FOREACH(MachineRepresentation, machine_rep1, kMachineReps) {
       MachineOperatorBuilder machine1(zone(), machine_rep1, pop.enabling_flag);
-      TRACED_FOREACH(MachineType, machine_rep2, kMachineReps) {
+      TRACED_FOREACH(MachineRepresentation, machine_rep2, kMachineReps) {
         MachineOperatorBuilder machine2(zone(), machine_rep2,
                                         pop.enabling_flag);
         const Operator* op1 = (machine1.*pop.constructor)().op();
         const Operator* op2 = (machine2.*pop.constructor)().op();
         EXPECT_EQ(op1, op2);
         EXPECT_EQ(pop.value_input_count, op1->ValueInputCount());
         EXPECT_EQ(pop.control_input_count, op1->ControlInputCount());
         EXPECT_EQ(pop.value_output_count, op1->ValueOutputCount());
 
-        MachineOperatorBuilder machine3(zone(), word_type());
+        MachineOperatorBuilder machine3(zone(), word_rep());
         EXPECT_TRUE((machine1.*pop.constructor)().IsSupported());
         EXPECT_FALSE((machine3.*pop.constructor)().IsSupported());
       }
     }
   }
 }
 
 
 // -----------------------------------------------------------------------------
 // Pseudo operators.
 
 
 namespace {
 
 typedef TestWithZone MachineOperatorTest;
 
 }  // namespace
 
 
 TEST_F(MachineOperatorTest, PseudoOperatorsWhenWordSizeIs32Bit) {
-  MachineOperatorBuilder machine(zone(), kRepWord32);
+  MachineOperatorBuilder machine(zone(), MachineRepresentation::kWord32);
   EXPECT_EQ(machine.Word32And(), machine.WordAnd());
   EXPECT_EQ(machine.Word32Or(), machine.WordOr());
   EXPECT_EQ(machine.Word32Xor(), machine.WordXor());
   EXPECT_EQ(machine.Word32Shl(), machine.WordShl());
   EXPECT_EQ(machine.Word32Shr(), machine.WordShr());
   EXPECT_EQ(machine.Word32Sar(), machine.WordSar());
   EXPECT_EQ(machine.Word32Ror(), machine.WordRor());
   EXPECT_EQ(machine.Word32Equal(), machine.WordEqual());
   EXPECT_EQ(machine.Int32Add(), machine.IntAdd());
   EXPECT_EQ(machine.Int32Sub(), machine.IntSub());
   EXPECT_EQ(machine.Int32Mul(), machine.IntMul());
   EXPECT_EQ(machine.Int32Div(), machine.IntDiv());
   EXPECT_EQ(machine.Uint32Div(), machine.UintDiv());
   EXPECT_EQ(machine.Int32Mod(), machine.IntMod());
   EXPECT_EQ(machine.Uint32Mod(), machine.UintMod());
   EXPECT_EQ(machine.Int32LessThan(), machine.IntLessThan());
   EXPECT_EQ(machine.Int32LessThanOrEqual(), machine.IntLessThanOrEqual());
 }
 
 
 TEST_F(MachineOperatorTest, PseudoOperatorsWhenWordSizeIs64Bit) {
-  MachineOperatorBuilder machine(zone(), kRepWord64);
+  MachineOperatorBuilder machine(zone(), MachineRepresentation::kWord64);
   EXPECT_EQ(machine.Word64And(), machine.WordAnd());
   EXPECT_EQ(machine.Word64Or(), machine.WordOr());
   EXPECT_EQ(machine.Word64Xor(), machine.WordXor());
   EXPECT_EQ(machine.Word64Shl(), machine.WordShl());
   EXPECT_EQ(machine.Word64Shr(), machine.WordShr());
   EXPECT_EQ(machine.Word64Sar(), machine.WordSar());
   EXPECT_EQ(machine.Word64Ror(), machine.WordRor());
   EXPECT_EQ(machine.Word64Equal(), machine.WordEqual());
   EXPECT_EQ(machine.Int64Add(), machine.IntAdd());
   EXPECT_EQ(machine.Int64Sub(), machine.IntSub());
   EXPECT_EQ(machine.Int64Mul(), machine.IntMul());
   EXPECT_EQ(machine.Int64Div(), machine.IntDiv());
   EXPECT_EQ(machine.Uint64Div(), machine.UintDiv());
   EXPECT_EQ(machine.Int64Mod(), machine.IntMod());
   EXPECT_EQ(machine.Uint64Mod(), machine.UintMod());
   EXPECT_EQ(machine.Int64LessThan(), machine.IntLessThan());
   EXPECT_EQ(machine.Int64LessThanOrEqual(), machine.IntLessThanOrEqual());
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8