[interpreter] Remove OperandScale from front stages of pipeline.

test/unittests/interpreter/bytecode-peephole-optimizer-unittest.cc

 // Copyright 2016 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/v8.h"
 
 #include "src/factory.h"
 #include "src/interpreter/bytecode-label.h"
 #include "src/interpreter/bytecode-peephole-optimizer.h"
 #include "src/interpreter/constant-array-builder.h"
@@ skipping 47 matching lines @@
 
   int write_count_ = 0;
   BytecodeNode last_written_;
 };
 
 // Sanity tests.
 
 TEST_F(BytecodePeepholeOptimizerTest, FlushOnJump) {
   CHECK_EQ(write_count(), 0);
 
-  BytecodeNode add(Bytecode::kAdd, Register(0).ToOperand(),
-                   OperandScale::kSingle);
+  BytecodeNode add(Bytecode::kAdd, Register(0).ToOperand());
   optimizer()->Write(&add);
   CHECK_EQ(write_count(), 0);
 
   BytecodeLabel target;
-  BytecodeNode jump(Bytecode::kJump, 0, OperandScale::kSingle);
+  BytecodeNode jump(Bytecode::kJump, 0);
   optimizer()->WriteJump(&jump, &target);
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(jump, last_written());
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, FlushOnBind) {
   CHECK_EQ(write_count(), 0);
 
-  BytecodeNode add(Bytecode::kAdd, Register(0).ToOperand(),
-                   OperandScale::kSingle);
+  BytecodeNode add(Bytecode::kAdd, Register(0).ToOperand());
   optimizer()->Write(&add);
   CHECK_EQ(write_count(), 0);
 
   BytecodeLabel target;
   optimizer()->BindLabel(&target);
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(add, last_written());
 }
 
 // Nop elimination tests.
 
 TEST_F(BytecodePeepholeOptimizerTest, ElideEmptyNop) {
   BytecodeNode nop(Bytecode::kNop);
   optimizer()->Write(&nop);
-  BytecodeNode add(Bytecode::kAdd, Register(0).ToOperand(),
-                   OperandScale::kSingle);
+  BytecodeNode add(Bytecode::kAdd, Register(0).ToOperand());
   optimizer()->Write(&add);
   Flush();
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(add, last_written());
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, ElideExpressionNop) {
   BytecodeNode nop(Bytecode::kNop);
   nop.source_info().Update({3, false});
   optimizer()->Write(&nop);
-  BytecodeNode add(Bytecode::kAdd, Register(0).ToOperand(),
-                   OperandScale::kSingle);
+  BytecodeNode add(Bytecode::kAdd, Register(0).ToOperand());
   optimizer()->Write(&add);
   Flush();
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(add, last_written());
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, KeepStatementNop) {
   BytecodeNode nop(Bytecode::kNop);
   nop.source_info().Update({3, true});
   optimizer()->Write(&nop);
-  BytecodeNode add(Bytecode::kAdd, Register(0).ToOperand(),
-                   OperandScale::kSingle);
+  BytecodeNode add(Bytecode::kAdd, Register(0).ToOperand());
   add.source_info().Update({3, false});
   optimizer()->Write(&add);
   Flush();
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(add, last_written());
 }
 
 // Tests covering BytecodePeepholeOptimizer::UpdateCurrentBytecode().
 
 TEST_F(BytecodePeepholeOptimizerTest, KeepJumpIfToBooleanTrue) {
   BytecodeNode first(Bytecode::kLdaNull);
-  BytecodeNode second(Bytecode::kJumpIfToBooleanTrue, 3, OperandScale::kSingle);
+  BytecodeNode second(Bytecode::kJumpIfToBooleanTrue, 3);
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written(), first);
   Flush();
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(last_written(), second);
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, ElideJumpIfToBooleanTrue) {
   BytecodeNode first(Bytecode::kLdaTrue);
-  BytecodeNode second(Bytecode::kJumpIfToBooleanTrue, 3, OperandScale::kSingle);
+  BytecodeNode second(Bytecode::kJumpIfToBooleanTrue, 3);
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written(), first);
   Flush();
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(last_written().bytecode(), Bytecode::kJumpIfTrue);
   CHECK_EQ(last_written().operand(0), second.operand(0));
 }
@@ skipping 20 matching lines @@
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written(), first);
   Flush();
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(last_written().bytecode(), Bytecode::kLogicalNot);
 }
 
 // Tests covering BytecodePeepholeOptimizer::CanElideCurrent().
 
 TEST_F(BytecodePeepholeOptimizerTest, StarRxLdarRy) {
-  BytecodeNode first(Bytecode::kStar, Register(0).ToOperand(),
-                     OperandScale::kSingle);
-  BytecodeNode second(Bytecode::kLdar, Register(1).ToOperand(),
-                      OperandScale::kSingle);
+  BytecodeNode first(Bytecode::kStar, Register(0).ToOperand());
+  BytecodeNode second(Bytecode::kLdar, Register(1).ToOperand());
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written(), first);
   Flush();
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(last_written(), second);
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, StarRxLdarRx) {
   BytecodeLabel label;
-  BytecodeNode first(Bytecode::kStar, Register(0).ToOperand(),
-                     OperandScale::kSingle);
-  BytecodeNode second(Bytecode::kLdar, Register(0).ToOperand(),
-                      OperandScale::kSingle);
+  BytecodeNode first(Bytecode::kStar, Register(0).ToOperand());
+  BytecodeNode second(Bytecode::kLdar, Register(0).ToOperand());
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written(), first);
   Flush();
   CHECK_EQ(write_count(), 1);
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, StarRxLdarRxStatement) {
-  BytecodeNode first(Bytecode::kStar, Register(0).ToOperand(),
-                     OperandScale::kSingle);
-  BytecodeNode second(Bytecode::kLdar, Register(0).ToOperand(),
-                      OperandScale::kSingle);
+  BytecodeNode first(Bytecode::kStar, Register(0).ToOperand());
+  BytecodeNode second(Bytecode::kLdar, Register(0).ToOperand());
   second.source_info().Update({0, true});
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written(), first);
   Flush();
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(last_written().bytecode(), Bytecode::kNop);
   CHECK_EQ(last_written().source_info(), second.source_info());
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, StarRxLdarRxStatementStarRy) {
   BytecodeLabel label;
-  BytecodeNode first(Bytecode::kStar, Register(0).ToOperand(),
-                     OperandScale::kSingle);
-  BytecodeNode second(Bytecode::kLdar, Register(0).ToOperand(),
-                      OperandScale::kSingle);
-  BytecodeNode third(Bytecode::kStar, Register(3).ToOperand(),
-                     OperandScale::kSingle);
+  BytecodeNode first(Bytecode::kStar, Register(0).ToOperand());
+  BytecodeNode second(Bytecode::kLdar, Register(0).ToOperand());
+  BytecodeNode third(Bytecode::kStar, Register(3).ToOperand());
   second.source_info().Update({0, true});
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written(), first);
   optimizer()->Write(&third);
   CHECK_EQ(write_count(), 1);
   Flush();
   CHECK_EQ(write_count(), 2);
   // Source position should move |second| to |third| when |second| is elided.
   third.source_info().Update(second.source_info());
   CHECK_EQ(last_written(), third);
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, LdarToName) {
-  BytecodeNode first(Bytecode::kLdar, Register(0).ToOperand(),
-                     OperandScale::kSingle);
+  BytecodeNode first(Bytecode::kLdar, Register(0).ToOperand());
   BytecodeNode second(Bytecode::kToName);
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written(), first);
   Flush();
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(last_written(), second);
 }
@@ skipping 19 matching lines @@
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written(), first);
   Flush();
   CHECK_EQ(write_count(), 1);
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, LdaConstantStringToName) {
   Handle<Object> word =
       isolate()->factory()->NewStringFromStaticChars("optimizing");
   size_t index = constant_array()->Insert(word);
-  BytecodeNode first(Bytecode::kLdaConstant, static_cast<uint32_t>(index),
-                     OperandScale::kSingle);
+  BytecodeNode first(Bytecode::kLdaConstant, static_cast<uint32_t>(index));
   BytecodeNode second(Bytecode::kToName);
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written(), first);
   Flush();
   CHECK_EQ(write_count(), 1);
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, LdaConstantNumberToName) {
   Handle<Object> word = isolate()->factory()->NewNumber(0.380);
   size_t index = constant_array()->Insert(word);
-  BytecodeNode first(Bytecode::kLdaConstant, static_cast<uint32_t>(index),
-                     OperandScale::kSingle);
+  BytecodeNode first(Bytecode::kLdaConstant, static_cast<uint32_t>(index));
   BytecodeNode second(Bytecode::kToName);
   optimizer()->Write(&first);
   CHECK_EQ(write_count(), 0);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written(), first);
   Flush();
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(last_written(), second);
 }
@@ skipping 54 matching lines @@
 
 // Tests covering BytecodePeepholeOptimizer::UpdateLastAndCurrentBytecodes().
 
 TEST_F(BytecodePeepholeOptimizerTest, MergeLoadICStar) {
   const uint32_t operands[] = {
       static_cast<uint32_t>(Register(31).ToOperand()), 32, 33,
       static_cast<uint32_t>(Register(256).ToOperand())};
   const int expected_operand_count = static_cast<int>(arraysize(operands));
 
   BytecodeNode first(Bytecode::kLdaNamedProperty, operands[0], operands[1],
-                     operands[2], OperandScale::kSingle);
-  BytecodeNode second(Bytecode::kStar, operands[3], OperandScale::kDouble);
+                     operands[2]);
+  BytecodeNode second(Bytecode::kStar, operands[3]);
   BytecodeNode third(Bytecode::kReturn);
   optimizer()->Write(&first);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written().bytecode(), Bytecode::kLdrNamedProperty);
   CHECK_EQ(last_written().operand_count(), expected_operand_count);
   for (int i = 0; i < expected_operand_count; ++i) {
     CHECK_EQ(last_written().operand(i), operands[i]);
   }
-  CHECK_EQ(last_written().operand_scale(),
-           std::max(first.operand_scale(), second.operand_scale()));
   optimizer()->Write(&third);
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(last_written().bytecode(), Bytecode::kLdar);
   CHECK_EQ(last_written().operand(0), operands[expected_operand_count - 1]);
   Flush();
   CHECK_EQ(last_written().bytecode(), third.bytecode());
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, MergeLdaKeyedPropertyStar) {
   const uint32_t operands[] = {static_cast<uint32_t>(Register(31).ToOperand()),
                                9999997,
                                static_cast<uint32_t>(Register(1).ToOperand())};
   const int expected_operand_count = static_cast<int>(arraysize(operands));
 
-  BytecodeNode first(Bytecode::kLdaKeyedProperty, operands[0], operands[1],
-                     OperandScale::kQuadruple);
-  BytecodeNode second(Bytecode::kStar, operands[2], OperandScale::kSingle);
+  BytecodeNode first(Bytecode::kLdaKeyedProperty, operands[0], operands[1]);
+  BytecodeNode second(Bytecode::kStar, operands[2]);
   BytecodeNode third(Bytecode::kReturn);
   optimizer()->Write(&first);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written().bytecode(), Bytecode::kLdrKeyedProperty);
   CHECK_EQ(last_written().operand_count(), expected_operand_count);
   for (int i = 0; i < expected_operand_count; ++i) {
     CHECK_EQ(last_written().operand(i), operands[i]);
   }
-  CHECK_EQ(last_written().operand_scale(),
-           std::max(first.operand_scale(), second.operand_scale()));
   optimizer()->Write(&third);
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(last_written().bytecode(), Bytecode::kLdar);
   CHECK_EQ(last_written().operand(0), operands[expected_operand_count - 1]);
   Flush();
   CHECK_EQ(last_written().bytecode(), third.bytecode());
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, MergeLdaGlobalStar) {
   const uint32_t operands[] = {54321, 19191,
                                static_cast<uint32_t>(Register(1).ToOperand())};
   const int expected_operand_count = static_cast<int>(arraysize(operands));
 
-  BytecodeNode first(Bytecode::kLdaGlobal, operands[0], operands[1],
-                     OperandScale::kDouble);
-  BytecodeNode second(Bytecode::kStar, operands[2], OperandScale::kSingle);
+  BytecodeNode first(Bytecode::kLdaGlobal, operands[0], operands[1]);
+  BytecodeNode second(Bytecode::kStar, operands[2]);
   BytecodeNode third(Bytecode::kReturn);
   optimizer()->Write(&first);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written().bytecode(), Bytecode::kLdrGlobal);
   CHECK_EQ(last_written().operand_count(), expected_operand_count);
   for (int i = 0; i < expected_operand_count; ++i) {
     CHECK_EQ(last_written().operand(i), operands[i]);
   }
-  CHECK_EQ(last_written().operand_scale(),
-           std::max(first.operand_scale(), second.operand_scale()));
   optimizer()->Write(&third);
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(last_written().bytecode(), Bytecode::kLdar);
   CHECK_EQ(last_written().operand(0), operands[expected_operand_count - 1]);
   Flush();
   CHECK_EQ(last_written().bytecode(), third.bytecode());
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, MergeLdaContextSlotStar) {
   const uint32_t operands[] = {
       static_cast<uint32_t>(Register(200000).ToOperand()), 55005500,
       static_cast<uint32_t>(Register(1).ToOperand())};
   const int expected_operand_count = static_cast<int>(arraysize(operands));
 
-  BytecodeNode first(Bytecode::kLdaContextSlot, operands[0], operands[1],
-                     OperandScale::kQuadruple);
-  BytecodeNode second(Bytecode::kStar, operands[2], OperandScale::kSingle);
+  BytecodeNode first(Bytecode::kLdaContextSlot, operands[0], operands[1]);
+  BytecodeNode second(Bytecode::kStar, operands[2]);
   BytecodeNode third(Bytecode::kReturn);
   optimizer()->Write(&first);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written().bytecode(), Bytecode::kLdrContextSlot);
   CHECK_EQ(last_written().operand_count(), expected_operand_count);
   for (int i = 0; i < expected_operand_count; ++i) {
     CHECK_EQ(last_written().operand(i), operands[i]);
   }
-  CHECK_EQ(last_written().operand_scale(),
-           std::max(first.operand_scale(), second.operand_scale()));
   optimizer()->Write(&third);
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(last_written().bytecode(), Bytecode::kLdar);
   CHECK_EQ(last_written().operand(0), operands[expected_operand_count - 1]);
   Flush();
   CHECK_EQ(last_written().bytecode(), third.bytecode());
 }
 
 TEST_F(BytecodePeepholeOptimizerTest, MergeLdaUndefinedStar) {
   const uint32_t operands[] = {
       static_cast<uint32_t>(Register(100000).ToOperand())};
   const int expected_operand_count = static_cast<int>(arraysize(operands));
 
   BytecodeNode first(Bytecode::kLdaUndefined);
-  BytecodeNode second(Bytecode::kStar, operands[0], OperandScale::kQuadruple);
+  BytecodeNode second(Bytecode::kStar, operands[0]);
   BytecodeNode third(Bytecode::kReturn);
   optimizer()->Write(&first);
   optimizer()->Write(&second);
   CHECK_EQ(write_count(), 1);
   CHECK_EQ(last_written().bytecode(), Bytecode::kLdrUndefined);
   CHECK_EQ(last_written().operand_count(), expected_operand_count);
   for (int i = 0; i < expected_operand_count; ++i) {
     CHECK_EQ(last_written().operand(i), operands[i]);
   }
-  CHECK_EQ(last_written().operand_scale(),
-           std::max(first.operand_scale(), second.operand_scale()));
   optimizer()->Write(&third);
   CHECK_EQ(write_count(), 2);
   CHECK_EQ(last_written().bytecode(), Bytecode::kLdar);
   CHECK_EQ(last_written().operand(0), operands[expected_operand_count - 1]);
   Flush();
   CHECK_EQ(last_written().bytecode(), third.bytecode());
 }
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8