Index: test/unittests/compiler/regalloc/register-allocator-unittest.cc |
diff --git a/test/unittests/compiler/register-allocator-unittest.cc b/test/unittests/compiler/regalloc/register-allocator-unittest.cc |
similarity index 99% |
rename from test/unittests/compiler/register-allocator-unittest.cc |
rename to test/unittests/compiler/regalloc/register-allocator-unittest.cc |
index ed3558dc609606daaf366e83e02cbb704147a6ec..4ae2ee9acddf08b9cd41a4c2a370fc6bf971d147 100644 |
--- a/test/unittests/compiler/register-allocator-unittest.cc |
+++ b/test/unittests/compiler/regalloc/register-allocator-unittest.cc |
@@ -9,7 +9,6 @@ namespace v8 { |
namespace internal { |
namespace compiler { |
- |
namespace { |
// We can't just use the size of the moves collection, because of |
@@ -23,7 +22,6 @@ int GetMoveCount(const ParallelMove& moves) { |
return move_count; |
} |
- |
bool AreOperandsOfSameType( |
const AllocatedOperand& op, |
const InstructionSequenceTest::TestOperand& test_op) { |
@@ -36,7 +34,6 @@ bool AreOperandsOfSameType( |
(op.IsStackSlot() && !test_op_is_reg); |
} |
- |
bool AllocatedOperandMatches( |
const AllocatedOperand& op, |
const InstructionSequenceTest::TestOperand& test_op) { |
@@ -46,7 +43,6 @@ bool AllocatedOperandMatches( |
test_op.value_ == InstructionSequenceTest::kNoValue); |
} |
- |
int GetParallelMoveCount(int instr_index, Instruction::GapPosition gap_pos, |
const InstructionSequence* sequence) { |
const ParallelMove* moves = |
@@ -55,7 +51,6 @@ int GetParallelMoveCount(int instr_index, Instruction::GapPosition gap_pos, |
return GetMoveCount(*moves); |
} |
- |
bool IsParallelMovePresent(int instr_index, Instruction::GapPosition gap_pos, |
const InstructionSequence* sequence, |
const InstructionSequenceTest::TestOperand& src, |
@@ -79,7 +74,6 @@ bool IsParallelMovePresent(int instr_index, Instruction::GapPosition gap_pos, |
} // namespace |
- |
class RegisterAllocatorTest : public InstructionSequenceTest { |
public: |
void Allocate() { |
@@ -88,7 +82,6 @@ class RegisterAllocatorTest : public InstructionSequenceTest { |
} |
}; |
- |
TEST_F(RegisterAllocatorTest, CanAllocateThreeRegisters) { |
// return p0 + p1; |
StartBlock(); |
@@ -136,7 +129,6 @@ TEST_F(RegisterAllocatorTest, SimpleLoop) { |
Allocate(); |
} |
- |
TEST_F(RegisterAllocatorTest, SimpleBranch) { |
// return i ? K1 : K2 |
StartBlock(); |
@@ -154,7 +146,6 @@ TEST_F(RegisterAllocatorTest, SimpleBranch) { |
Allocate(); |
} |
- |
TEST_F(RegisterAllocatorTest, SimpleDiamond) { |
// return p0 ? p0 : p0 |
StartBlock(); |
@@ -174,7 +165,6 @@ TEST_F(RegisterAllocatorTest, SimpleDiamond) { |
Allocate(); |
} |
- |
TEST_F(RegisterAllocatorTest, SimpleDiamondPhi) { |
// return i ? K1 : K2 |
StartBlock(); |
@@ -195,7 +185,6 @@ TEST_F(RegisterAllocatorTest, SimpleDiamondPhi) { |
Allocate(); |
} |
- |
TEST_F(RegisterAllocatorTest, DiamondManyPhis) { |
const int kPhis = kDefaultNRegs * 2; |
@@ -227,7 +216,6 @@ TEST_F(RegisterAllocatorTest, DiamondManyPhis) { |
Allocate(); |
} |
- |
TEST_F(RegisterAllocatorTest, DoubleDiamondManyRedundantPhis) { |
const int kPhis = kDefaultNRegs * 2; |
@@ -266,7 +254,6 @@ TEST_F(RegisterAllocatorTest, DoubleDiamondManyRedundantPhis) { |
Allocate(); |
} |
- |
TEST_F(RegisterAllocatorTest, RegressionPhisNeedTooManyRegisters) { |
const size_t kNumRegs = 3; |
const size_t kParams = kNumRegs + 1; |
@@ -315,7 +302,6 @@ TEST_F(RegisterAllocatorTest, RegressionPhisNeedTooManyRegisters) { |
Allocate(); |
} |
- |
TEST_F(RegisterAllocatorTest, SpillPhi) { |
StartBlock(); |
EndBlock(Branch(Imm(), 1, 2)); |
@@ -337,7 +323,6 @@ TEST_F(RegisterAllocatorTest, SpillPhi) { |
Allocate(); |
} |
- |
TEST_F(RegisterAllocatorTest, MoveLotsOfConstants) { |
StartBlock(); |
VReg constants[kDefaultNRegs]; |
@@ -357,7 +342,6 @@ TEST_F(RegisterAllocatorTest, MoveLotsOfConstants) { |
Allocate(); |
} |
- |
TEST_F(RegisterAllocatorTest, SplitBeforeInstruction) { |
const int kNumRegs = 6; |
SetNumRegs(kNumRegs, kNumRegs); |
@@ -383,7 +367,6 @@ TEST_F(RegisterAllocatorTest, SplitBeforeInstruction) { |
Allocate(); |
} |
- |
TEST_F(RegisterAllocatorTest, SplitBeforeInstruction2) { |
const int kNumRegs = 6; |
SetNumRegs(kNumRegs, kNumRegs); |
@@ -408,7 +391,6 @@ TEST_F(RegisterAllocatorTest, SplitBeforeInstruction2) { |
Allocate(); |
} |
- |
TEST_F(RegisterAllocatorTest, NestedDiamondPhiMerge) { |
// Outer diamond. |
StartBlock(); |
@@ -455,7 +437,6 @@ TEST_F(RegisterAllocatorTest, NestedDiamondPhiMerge) { |
Allocate(); |
} |
- |
TEST_F(RegisterAllocatorTest, NestedDiamondPhiMergeDifferent) { |
// Outer diamond. |
StartBlock(); |
@@ -502,7 +483,6 @@ TEST_F(RegisterAllocatorTest, NestedDiamondPhiMergeDifferent) { |
Allocate(); |
} |
- |
TEST_F(RegisterAllocatorTest, RegressionSplitBeforeAndMove) { |
StartBlock(); |
@@ -529,7 +509,6 @@ TEST_F(RegisterAllocatorTest, RegressionSplitBeforeAndMove) { |
Allocate(); |
} |
- |
TEST_F(RegisterAllocatorTest, RegressionSpillTwice) { |
StartBlock(); |
auto p_0 = Parameter(Reg(1)); |
@@ -539,7 +518,6 @@ TEST_F(RegisterAllocatorTest, RegressionSpillTwice) { |
Allocate(); |
} |
- |
TEST_F(RegisterAllocatorTest, RegressionLoadConstantBeforeSpill) { |
StartBlock(); |
// Fill registers. |
@@ -574,7 +552,6 @@ TEST_F(RegisterAllocatorTest, RegressionLoadConstantBeforeSpill) { |
Allocate(); |
} |
- |
TEST_F(RegisterAllocatorTest, DiamondWithCallFirstBlock) { |
StartBlock(); |
auto x = EmitOI(Reg(0)); |
@@ -595,7 +572,6 @@ TEST_F(RegisterAllocatorTest, DiamondWithCallFirstBlock) { |
Allocate(); |
} |
- |
TEST_F(RegisterAllocatorTest, DiamondWithCallSecondBlock) { |
StartBlock(); |
auto x = EmitOI(Reg(0)); |
@@ -616,7 +592,6 @@ TEST_F(RegisterAllocatorTest, DiamondWithCallSecondBlock) { |
Allocate(); |
} |
- |
TEST_F(RegisterAllocatorTest, SingleDeferredBlockSpill) { |
StartBlock(); // B0 |
auto var = EmitOI(Reg(0)); |
@@ -655,7 +630,6 @@ TEST_F(RegisterAllocatorTest, SingleDeferredBlockSpill) { |
sequence(), Reg(0), Slot(0))); |
} |
- |
TEST_F(RegisterAllocatorTest, MultipleDeferredBlockSpills) { |
if (!FLAG_turbo_preprocess_ranges) return; |
@@ -706,12 +680,10 @@ TEST_F(RegisterAllocatorTest, MultipleDeferredBlockSpills) { |
EXPECT_TRUE(IsParallelMovePresent(end_of_b2, Instruction::START, sequence(), |
Slot(var3_slot), Reg())); |
- |
EXPECT_EQ(0, |
GetParallelMoveCount(start_of_b3, Instruction::START, sequence())); |
} |
- |
namespace { |
enum class ParameterType { kFixedSlot, kSlot, kRegister, kFixedRegister }; |
@@ -738,7 +710,6 @@ class SlotConstraintTest : public RegisterAllocatorTest, |
} // namespace |
- |
#if GTEST_HAS_COMBINE |
TEST_P(SlotConstraintTest, SlotConstraint) { |
@@ -785,7 +756,6 @@ TEST_P(SlotConstraintTest, SlotConstraint) { |
Allocate(); |
} |
- |
INSTANTIATE_TEST_CASE_P( |
RegisterAllocatorTest, SlotConstraintTest, |
::testing::Combine(::testing::ValuesIn(kParameterTypes), |