[turbofan] Make MachineType a pair of enums.

test/unittests/compiler/machine-operator-reducer-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/base/bits.h"
 #include "src/base/division-by-constant.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/machine-operator-reducer.h"
 #include "src/compiler/typer.h"
 #include "src/conversions-inl.h"
@@ skipping 429 matching lines @@
 }
 
 
 TEST_F(MachineOperatorReducerTest, TruncateFloat64ToInt32WithPhi) {
   Node* const p0 = Parameter(0);
   Node* const p1 = Parameter(1);
   Node* const merge = graph()->start();
   TRACED_FOREACH(TruncationMode, mode, kTruncationModes) {
     Reduction reduction = Reduce(graph()->NewNode(
         machine()->TruncateFloat64ToInt32(mode),
-        graph()->NewNode(common()->Phi(kMachFloat64, 2), p0, p1, merge)));
+        graph()->NewNode(common()->Phi(MachineRepresentation::kFloat64, 2), p0,
+                         p1, merge)));
     ASSERT_TRUE(reduction.Changed());
-    EXPECT_THAT(reduction.replacement(),
-                IsPhi(kMachInt32, IsTruncateFloat64ToInt32(p0),
-                      IsTruncateFloat64ToInt32(p1), merge));
+    EXPECT_THAT(
+        reduction.replacement(),
+        IsPhi(MachineRepresentation::kWord32, IsTruncateFloat64ToInt32(p0),
+              IsTruncateFloat64ToInt32(p1), merge));
   }
 }
 
 
 // -----------------------------------------------------------------------------
 // TruncateInt64ToInt32
 
 
 TEST_F(MachineOperatorReducerTest, TruncateInt64ToInt32WithChangeInt32ToInt64) {
   Node* value = Parameter(0);
@@ skipping 356 matching lines @@
     ASSERT_TRUE(r.Changed());
     EXPECT_THAT(r.replacement(), IsInt32Sub(IsInt32Constant(0), cmp));
   }
 }
 
 
 TEST_F(MachineOperatorReducerTest, Word32SarWithWord32ShlAndLoad) {
   Node* const p0 = Parameter(0);
   Node* const p1 = Parameter(1);
   {
-    Node* const l = graph()->NewNode(machine()->Load(kMachInt8), p0, p1,
-                                     graph()->start(), graph()->start());
+    Node* const l = graph()->NewNode(machine()->Load(MachineType::Int8()), p0,
+                                     p1, graph()->start(), graph()->start());
     Reduction const r = Reduce(graph()->NewNode(
         machine()->Word32Sar(),
         graph()->NewNode(machine()->Word32Shl(), l, Int32Constant(24)),
         Int32Constant(24)));
     ASSERT_TRUE(r.Changed());
     EXPECT_EQ(l, r.replacement());
   }
   {
-    Node* const l = graph()->NewNode(machine()->Load(kMachInt16), p0, p1,
-                                     graph()->start(), graph()->start());
+    Node* const l = graph()->NewNode(machine()->Load(MachineType::Int16()), p0,
+                                     p1, graph()->start(), graph()->start());
     Reduction const r = Reduce(graph()->NewNode(
         machine()->Word32Sar(),
         graph()->NewNode(machine()->Word32Shl(), l, Int32Constant(16)),
         Int32Constant(16)));
     ASSERT_TRUE(r.Changed());
     EXPECT_EQ(l, r.replacement());
   }
 }
 
 
@@ skipping 282 matching lines @@
     }
   }
   TRACED_FORRANGE(int32_t, shift, 1, 30) {
     Reduction const r =
         Reduce(graph()->NewNode(machine()->Int32Mod(), p0,
                                 Int32Constant(1 << shift), graph()->start()));
     int32_t const mask = (1 << shift) - 1;
     ASSERT_TRUE(r.Changed());
     EXPECT_THAT(
         r.replacement(),
-        IsSelect(kMachInt32, IsInt32LessThan(p0, IsInt32Constant(0)),
+        IsSelect(MachineRepresentation::kWord32,
+                 IsInt32LessThan(p0, IsInt32Constant(0)),
                  IsInt32Sub(IsInt32Constant(0),
                             IsWord32And(IsInt32Sub(IsInt32Constant(0), p0),
                                         IsInt32Constant(mask))),
                  IsWord32And(p0, IsInt32Constant(mask))));
   }
   TRACED_FORRANGE(int32_t, shift, 1, 31) {
     Reduction const r = Reduce(graph()->NewNode(
         machine()->Int32Mod(), p0,
         Uint32Constant(bit_cast<uint32_t, int32_t>(-1) << shift),
         graph()->start()));
     int32_t const mask = bit_cast<int32_t, uint32_t>((1U << shift) - 1);
     ASSERT_TRUE(r.Changed());
     EXPECT_THAT(
         r.replacement(),
-        IsSelect(kMachInt32, IsInt32LessThan(p0, IsInt32Constant(0)),
+        IsSelect(MachineRepresentation::kWord32,
+                 IsInt32LessThan(p0, IsInt32Constant(0)),
                  IsInt32Sub(IsInt32Constant(0),
                             IsWord32And(IsInt32Sub(IsInt32Constant(0), p0),
                                         IsInt32Constant(mask))),
                  IsWord32And(p0, IsInt32Constant(mask))));
   }
   TRACED_FOREACH(int32_t, divisor, kInt32Values) {
     if (divisor == 0 || base::bits::IsPowerOfTwo32(Abs(divisor))) continue;
     Reduction const r = Reduce(graph()->NewNode(
         machine()->Int32Mod(), p0, Int32Constant(divisor), graph()->start()));
     ASSERT_TRUE(r.Changed());
@@ skipping 378 matching lines @@
     }
   }
 }
 
 
 // -----------------------------------------------------------------------------
 // Store
 
 
 TEST_F(MachineOperatorReducerTest, StoreRepWord8WithWord32And) {
-  const StoreRepresentation rep(kMachUint8, kNoWriteBarrier);
+  const StoreRepresentation rep(MachineType::Uint8(), kNoWriteBarrier);
   Node* const base = Parameter(0);
   Node* const index = Parameter(1);
   Node* const value = Parameter(2);
   Node* const effect = graph()->start();
   Node* const control = graph()->start();
   TRACED_FOREACH(uint32_t, x, kUint32Values) {
     Node* const node =
         graph()->NewNode(machine()->Store(rep), base, index,
                          graph()->NewNode(machine()->Word32And(), value,
                                           Uint32Constant(x | 0xffu)),
                          effect, control);
 
     Reduction r = Reduce(node);
     ASSERT_TRUE(r.Changed());
     EXPECT_THAT(r.replacement(),
                 IsStore(rep, base, index, value, effect, control));
   }
 }
 
 
 TEST_F(MachineOperatorReducerTest, StoreRepWord8WithWord32SarAndWord32Shl) {
-  const StoreRepresentation rep(kMachUint8, kNoWriteBarrier);
+  const StoreRepresentation rep(MachineType::Uint8(), kNoWriteBarrier);
   Node* const base = Parameter(0);
   Node* const index = Parameter(1);
   Node* const value = Parameter(2);
   Node* const effect = graph()->start();
   Node* const control = graph()->start();
   TRACED_FORRANGE(int32_t, x, 1, 24) {
     Node* const node = graph()->NewNode(
         machine()->Store(rep), base, index,
         graph()->NewNode(
             machine()->Word32Sar(),
             graph()->NewNode(machine()->Word32Shl(), value, Int32Constant(x)),
             Int32Constant(x)),
         effect, control);
 
     Reduction r = Reduce(node);
     ASSERT_TRUE(r.Changed());
     EXPECT_THAT(r.replacement(),
                 IsStore(rep, base, index, value, effect, control));
   }
 }
 
 
 TEST_F(MachineOperatorReducerTest, StoreRepWord16WithWord32And) {
-  const StoreRepresentation rep(kMachUint16, kNoWriteBarrier);
+  const StoreRepresentation rep(MachineType::Uint16(), kNoWriteBarrier);
   Node* const base = Parameter(0);
   Node* const index = Parameter(1);
   Node* const value = Parameter(2);
   Node* const effect = graph()->start();
   Node* const control = graph()->start();
   TRACED_FOREACH(uint32_t, x, kUint32Values) {
     Node* const node =
         graph()->NewNode(machine()->Store(rep), base, index,
                          graph()->NewNode(machine()->Word32And(), value,
                                           Uint32Constant(x | 0xffffu)),
                          effect, control);
 
     Reduction r = Reduce(node);
     ASSERT_TRUE(r.Changed());
     EXPECT_THAT(r.replacement(),
                 IsStore(rep, base, index, value, effect, control));
   }
 }
 
 
 TEST_F(MachineOperatorReducerTest, StoreRepWord16WithWord32SarAndWord32Shl) {
-  const StoreRepresentation rep(kMachUint16, kNoWriteBarrier);
+  const StoreRepresentation rep(MachineType::Uint16(), kNoWriteBarrier);
   Node* const base = Parameter(0);
   Node* const index = Parameter(1);
   Node* const value = Parameter(2);
   Node* const effect = graph()->start();
   Node* const control = graph()->start();
   TRACED_FORRANGE(int32_t, x, 1, 16) {
     Node* const node = graph()->NewNode(
         machine()->Store(rep), base, index,
         graph()->NewNode(
             machine()->Word32Sar(),
             graph()->NewNode(machine()->Word32Shl(), value, Int32Constant(x)),
             Int32Constant(x)),
         effect, control);
 
     Reduction r = Reduce(node);
     ASSERT_TRUE(r.Changed());
     EXPECT_THAT(r.replacement(),
                 IsStore(rep, base, index, value, effect, control));
   }
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8