[turbofan] Make MachineType a pair of enums.

test/unittests/compiler/interpreter-assembler-unittest.cc

 // Copyright 2015 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 "test/unittests/compiler/interpreter-assembler-unittest.h"
 
 #include "src/code-factory.h"
 #include "src/compiler/graph.h"
 #include "src/compiler/node.h"
 #include "src/interface-descriptors.h"
@@ skipping 78 matching lines @@
     const Matcher<const CallDescriptor*>& descriptor_matcher, A... args) {
   return ::i::compiler::IsCall(descriptor_matcher, args..., graph()->start(),
                                graph()->start());
 }
 
 
 Matcher<Node*>
 InterpreterAssemblerTest::InterpreterAssemblerForTest::IsBytecodeOperand(
     int offset) {
   return IsLoad(
-      kMachUint8, IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
+      MachineType::Uint8(),
+      IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
       IsIntPtrAdd(IsParameter(Linkage::kInterpreterBytecodeOffsetParameter),
                   IsInt32Constant(offset)));
 }
 
 
 Matcher<Node*> InterpreterAssemblerTest::InterpreterAssemblerForTest::
     IsBytecodeOperandSignExtended(int offset) {
   Matcher<Node*> load_matcher = IsLoad(
-      kMachInt8, IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
+      MachineType::Int8(),
+      IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
       IsIntPtrAdd(IsParameter(Linkage::kInterpreterBytecodeOffsetParameter),
                   IsInt32Constant(offset)));
   if (kPointerSize == 8) {
     load_matcher = IsChangeInt32ToInt64(load_matcher);
   }
   return load_matcher;
 }
 
 
 Matcher<Node*>
 InterpreterAssemblerTest::InterpreterAssemblerForTest::IsBytecodeOperandShort(
     int offset) {
   if (TargetSupportsUnalignedAccess()) {
     return IsLoad(
-        kMachUint16, IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
+        MachineType::Uint16(),
+        IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
         IsIntPtrAdd(IsParameter(Linkage::kInterpreterBytecodeOffsetParameter),
                     IsInt32Constant(offset)));
   } else {
     Matcher<Node*> first_byte = IsLoad(
-        kMachUint8, IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
+        MachineType::Uint8(),
+        IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
         IsIntPtrAdd(IsParameter(Linkage::kInterpreterBytecodeOffsetParameter),
                     IsInt32Constant(offset)));
     Matcher<Node*> second_byte = IsLoad(
-        kMachUint8, IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
+        MachineType::Uint8(),
+        IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
         IsIntPtrAdd(IsParameter(Linkage::kInterpreterBytecodeOffsetParameter),
                     IsInt32Constant(offset + 1)));
 #if V8_TARGET_LITTLE_ENDIAN
     return IsWordOr(IsWordShl(second_byte, IsInt32Constant(kBitsPerByte)),
                     first_byte);
 #elif V8_TARGET_BIG_ENDIAN
     return IsWordOr(IsWordShl(first_byte, IsInt32Constant(kBitsPerByte)),
                     second_byte);
 #else
 #error "Unknown Architecture"
 #endif
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, Dispatch) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     m.Dispatch();
     Graph* graph = m.graph();
 
     Node* end = graph->end();
     EXPECT_EQ(1, end->InputCount());
     Node* tail_call_node = end->InputAt(0);
 
     Matcher<Node*> next_bytecode_offset_matcher =
         IsIntPtrAdd(IsParameter(Linkage::kInterpreterBytecodeOffsetParameter),
                     IsInt32Constant(interpreter::Bytecodes::Size(bytecode)));
-    Matcher<Node*> target_bytecode_matcher = m.IsLoad(
-        kMachUint8, IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
-        next_bytecode_offset_matcher);
-    Matcher<Node*> code_target_matcher = m.IsLoad(
-        kMachPtr, IsParameter(Linkage::kInterpreterDispatchTableParameter),
-        IsWord32Shl(target_bytecode_matcher,
-                    IsInt32Constant(kPointerSizeLog2)));
+    Matcher<Node*> target_bytecode_matcher =
+        m.IsLoad(MachineType::Uint8(),
+                 IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
+                 next_bytecode_offset_matcher);
+    Matcher<Node*> code_target_matcher =
+        m.IsLoad(MachineType::Pointer(),
+                 IsParameter(Linkage::kInterpreterDispatchTableParameter),
+                 IsWord32Shl(target_bytecode_matcher,
+                             IsInt32Constant(kPointerSizeLog2)));
 
     EXPECT_EQ(CallDescriptor::kCallCodeObject, m.call_descriptor()->kind());
     EXPECT_TRUE(m.call_descriptor()->flags() & CallDescriptor::kCanUseRoots);
     EXPECT_THAT(
         tail_call_node,
         IsTailCall(m.call_descriptor(), code_target_matcher,
                    IsParameter(Linkage::kInterpreterAccumulatorParameter),
                    IsParameter(Linkage::kInterpreterRegisterFileParameter),
                    next_bytecode_offset_matcher,
                    IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
@@ skipping 11 matching lines @@
       InterpreterAssemblerForTest m(this, bytecode);
       m.Jump(m.Int32Constant(jump_offset));
       Graph* graph = m.graph();
       Node* end = graph->end();
       EXPECT_EQ(1, end->InputCount());
       Node* tail_call_node = end->InputAt(0);
 
       Matcher<Node*> next_bytecode_offset_matcher =
           IsIntPtrAdd(IsParameter(Linkage::kInterpreterBytecodeOffsetParameter),
                       IsInt32Constant(jump_offset));
-      Matcher<Node*> target_bytecode_matcher = m.IsLoad(
-          kMachUint8, IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
-          next_bytecode_offset_matcher);
-      Matcher<Node*> code_target_matcher = m.IsLoad(
-          kMachPtr, IsParameter(Linkage::kInterpreterDispatchTableParameter),
-          IsWord32Shl(target_bytecode_matcher,
-                      IsInt32Constant(kPointerSizeLog2)));
+      Matcher<Node*> target_bytecode_matcher =
+          m.IsLoad(MachineType::Uint8(),
+                   IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
+                   next_bytecode_offset_matcher);
+      Matcher<Node*> code_target_matcher =
+          m.IsLoad(MachineType::Pointer(),
+                   IsParameter(Linkage::kInterpreterDispatchTableParameter),
+                   IsWord32Shl(target_bytecode_matcher,
+                               IsInt32Constant(kPointerSizeLog2)));
 
       EXPECT_EQ(CallDescriptor::kCallCodeObject, m.call_descriptor()->kind());
       EXPECT_TRUE(m.call_descriptor()->flags() & CallDescriptor::kCanUseRoots);
       EXPECT_THAT(
           tail_call_node,
           IsTailCall(m.call_descriptor(), code_target_matcher,
                      IsParameter(Linkage::kInterpreterAccumulatorParameter),
                      IsParameter(Linkage::kInterpreterRegisterFileParameter),
                      next_bytecode_offset_matcher,
                      IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
@@ skipping 18 matching lines @@
     Graph* graph = m.graph();
     Node* end = graph->end();
     EXPECT_EQ(2, end->InputCount());
 
     int jump_offsets[] = {kJumpIfTrueOffset,
                           interpreter::Bytecodes::Size(bytecode)};
     for (int i = 0; i < static_cast<int>(arraysize(jump_offsets)); i++) {
       Matcher<Node*> next_bytecode_offset_matcher =
           IsIntPtrAdd(IsParameter(Linkage::kInterpreterBytecodeOffsetParameter),
                       IsInt32Constant(jump_offsets[i]));
-      Matcher<Node*> target_bytecode_matcher = m.IsLoad(
-          kMachUint8, IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
-          next_bytecode_offset_matcher);
-      Matcher<Node*> code_target_matcher = m.IsLoad(
-          kMachPtr, IsParameter(Linkage::kInterpreterDispatchTableParameter),
-          IsWord32Shl(target_bytecode_matcher,
-                      IsInt32Constant(kPointerSizeLog2)));
+      Matcher<Node*> target_bytecode_matcher =
+          m.IsLoad(MachineType::Uint8(),
+                   IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
+                   next_bytecode_offset_matcher);
+      Matcher<Node*> code_target_matcher =
+          m.IsLoad(MachineType::Pointer(),
+                   IsParameter(Linkage::kInterpreterDispatchTableParameter),
+                   IsWord32Shl(target_bytecode_matcher,
+                               IsInt32Constant(kPointerSizeLog2)));
       EXPECT_THAT(
           end->InputAt(i),
           IsTailCall(m.call_descriptor(), code_target_matcher,
                      IsParameter(Linkage::kInterpreterAccumulatorParameter),
                      IsParameter(Linkage::kInterpreterRegisterFileParameter),
                      next_bytecode_offset_matcher,
                      IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
                      IsParameter(Linkage::kInterpreterDispatchTableParameter),
                      IsParameter(Linkage::kInterpreterContextParameter),
                      graph->start(), graph->start()));
@@ skipping 115 matching lines @@
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, LoadRegister) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     Node* reg_index_node = m.Int32Constant(44);
     Node* load_reg_node = m.LoadRegister(reg_index_node);
     EXPECT_THAT(
         load_reg_node,
-        m.IsLoad(kMachAnyTagged,
+        m.IsLoad(MachineType::AnyTagged(),
                  IsParameter(Linkage::kInterpreterRegisterFileParameter),
                  IsWordShl(reg_index_node, IsInt32Constant(kPointerSizeLog2))));
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, StoreRegister) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     Node* store_value = m.Int32Constant(0xdeadbeef);
     Node* reg_index_node = m.Int32Constant(44);
     Node* store_reg_node = m.StoreRegister(store_value, reg_index_node);
     EXPECT_THAT(
         store_reg_node,
-        m.IsStore(StoreRepresentation(kMachAnyTagged, kNoWriteBarrier),
-                  IsParameter(Linkage::kInterpreterRegisterFileParameter),
-                  IsWordShl(reg_index_node, IsInt32Constant(kPointerSizeLog2)),
-                  store_value));
+        m.IsStore(
+            StoreRepresentation(MachineType::AnyTagged(), kNoWriteBarrier),
+            IsParameter(Linkage::kInterpreterRegisterFileParameter),
+            IsWordShl(reg_index_node, IsInt32Constant(kPointerSizeLog2)),
+            store_value));
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, SmiTag) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     Node* value = m.Int32Constant(44);
     EXPECT_THAT(m.SmiTag(value),
                 IsWordShl(value, IsInt32Constant(kSmiShiftSize + kSmiTagSize)));
@@ skipping 34 matching lines @@
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, LoadConstantPoolEntry) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     Node* index = m.Int32Constant(2);
     Node* load_constant = m.LoadConstantPoolEntry(index);
     Matcher<Node*> constant_pool_matcher = m.IsLoad(
-        kMachAnyTagged,
+        MachineType::AnyTagged(),
         IsParameter(Linkage::kInterpreterBytecodeArrayParameter),
         IsIntPtrConstant(BytecodeArray::kConstantPoolOffset - kHeapObjectTag));
     EXPECT_THAT(
         load_constant,
-        m.IsLoad(kMachAnyTagged, constant_pool_matcher,
+        m.IsLoad(MachineType::AnyTagged(), constant_pool_matcher,
                  IsIntPtrAdd(
                      IsIntPtrConstant(FixedArray::kHeaderSize - kHeapObjectTag),
                      IsWordShl(index, IsInt32Constant(kPointerSizeLog2)))));
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, LoadFixedArrayElement) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     int index = 3;
     Node* fixed_array = m.IntPtrConstant(0xdeadbeef);
     Node* load_element = m.LoadFixedArrayElement(fixed_array, index);
     EXPECT_THAT(
         load_element,
-        m.IsLoad(kMachAnyTagged, fixed_array,
+        m.IsLoad(MachineType::AnyTagged(), fixed_array,
                  IsIntPtrAdd(
                      IsIntPtrConstant(FixedArray::kHeaderSize - kHeapObjectTag),
                      IsWordShl(IsInt32Constant(index),
                                IsInt32Constant(kPointerSizeLog2)))));
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, LoadObjectField) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     Node* object = m.IntPtrConstant(0xdeadbeef);
     int offset = 16;
     Node* load_field = m.LoadObjectField(object, offset);
     EXPECT_THAT(load_field,
-                m.IsLoad(kMachAnyTagged, object,
+                m.IsLoad(MachineType::AnyTagged(), object,
                          IsIntPtrConstant(offset - kHeapObjectTag)));
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, LoadContextSlot) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     Node* context = m.Int32Constant(1);
     Node* slot_index = m.Int32Constant(22);
     Node* load_context_slot = m.LoadContextSlot(context, slot_index);
 
     Matcher<Node*> offset =
         IsIntPtrAdd(IsWordShl(slot_index, IsInt32Constant(kPointerSizeLog2)),
                     IsInt32Constant(Context::kHeaderSize - kHeapObjectTag));
-    EXPECT_THAT(load_context_slot, m.IsLoad(kMachAnyTagged, context, offset));
+    EXPECT_THAT(load_context_slot,
+                m.IsLoad(MachineType::AnyTagged(), context, offset));
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, StoreContextSlot) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     Node* context = m.Int32Constant(1);
     Node* slot_index = m.Int32Constant(22);
     Node* value = m.Int32Constant(100);
     Node* store_context_slot = m.StoreContextSlot(context, slot_index, value);
 
     Matcher<Node*> offset =
         IsIntPtrAdd(IsWordShl(slot_index, IsInt32Constant(kPointerSizeLog2)),
                     IsInt32Constant(Context::kHeaderSize - kHeapObjectTag));
-    EXPECT_THAT(
-        store_context_slot,
-        m.IsStore(StoreRepresentation(kMachAnyTagged, kFullWriteBarrier),
-                  context, offset, value));
+    EXPECT_THAT(store_context_slot,
+                m.IsStore(StoreRepresentation(MachineType::AnyTagged(),
+                                              kFullWriteBarrier),
+                          context, offset, value));
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, CallRuntime2) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     Node* arg1 = m.Int32Constant(2);
     Node* arg2 = m.Int32Constant(3);
     Node* call_runtime = m.CallRuntime(Runtime::kAdd, arg1, arg2);
@@ skipping 12 matching lines @@
     Node* function_id = m.Int32Constant(0);
     Node* first_arg = m.Int32Constant(1);
     Node* arg_count = m.Int32Constant(2);
 
     Matcher<Node*> function_table = IsExternalConstant(
         ExternalReference::runtime_function_table_address(isolate()));
     Matcher<Node*> function = IsIntPtrAdd(
         function_table,
         IsInt32Mul(function_id, IsInt32Constant(sizeof(Runtime::Function))));
     Matcher<Node*> function_entry =
-        m.IsLoad(kMachPtr, function,
+        m.IsLoad(MachineType::Pointer(), function,
                  IsInt32Constant(offsetof(Runtime::Function, entry)));
 
     Node* call_runtime = m.CallRuntime(function_id, first_arg, arg_count);
     EXPECT_THAT(call_runtime,
                 m.IsCall(_, IsHeapConstant(builtin.code()), arg_count,
                          first_arg, function_entry,
                          IsParameter(Linkage::kInterpreterContextParameter)));
   }
 }
 
@@ skipping 29 matching lines @@
                  function, IsParameter(Linkage::kInterpreterContextParameter)));
   }
 }
 
 
 TARGET_TEST_F(InterpreterAssemblerTest, LoadTypeFeedbackVector) {
   TRACED_FOREACH(interpreter::Bytecode, bytecode, kBytecodes) {
     InterpreterAssemblerForTest m(this, bytecode);
     Node* feedback_vector = m.LoadTypeFeedbackVector();
 
-    Matcher<Node*> load_function_matcher = m.IsLoad(
-        kMachAnyTagged, IsParameter(Linkage::kInterpreterRegisterFileParameter),
-        IsIntPtrConstant(
-            InterpreterFrameConstants::kFunctionFromRegisterPointer));
+    Matcher<Node*> load_function_matcher =
+        m.IsLoad(MachineType::AnyTagged(),
+                 IsParameter(Linkage::kInterpreterRegisterFileParameter),
+                 IsIntPtrConstant(
+                     InterpreterFrameConstants::kFunctionFromRegisterPointer));
     Matcher<Node*> load_shared_function_info_matcher =
-        m.IsLoad(kMachAnyTagged, load_function_matcher,
+        m.IsLoad(MachineType::AnyTagged(), load_function_matcher,
                  IsIntPtrConstant(JSFunction::kSharedFunctionInfoOffset -
                                   kHeapObjectTag));
 
     EXPECT_THAT(
         feedback_vector,
-        m.IsLoad(kMachAnyTagged, load_shared_function_info_matcher,
+        m.IsLoad(MachineType::AnyTagged(), load_shared_function_info_matcher,
                  IsIntPtrConstant(SharedFunctionInfo::kFeedbackVectorOffset -
                                   kHeapObjectTag)));
   }
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8