f1aa556278
Up until now, if one wanted to specify an explicit stack location or register as an operand for an instruction, it had to also be explicitly associated with a virtual register as a so-called FixedRegister or FixedStackSlot. For the implementation of tail calls, the plan is to use the gap resolver needs to shuffle stack locations from the caller to the tail-called callee. In order to do this, it must be possible to explicitly address operand locations on the stack that are not associated with virtual registers. This CL introduces ExplictOperands, which can specify a specific register or stack location that is not associated with virtual register. This will allow tail calls to specify the target locations for the necessary stack moves in the gap for the tail call without the core register allocation having to know about the target of the stack moves at all. In the process this CL: * creates a new Operand kind, ExplicitOperand, with which instructions can specify register and stack slots without an associated virtual register. * creates a LocationOperand class from which AllocatedOperand and ExplicitOperand are derived and provides a common interface to get Register, DoubleRegister and spill slot information. * removes RegisterOperand, DoubleRegisterOperand, StackSlotOperand and DoubleStackSlotOperand, they are subsumed by LocationOperand. * addresses a cleanup TODO in AllocatedOperand to reduce the redundancy of AllocatedOperand::Kind by using machine_type() to determine if an operand corresponds to a general purpose or double register. BUG=v8:4076 LOG=n Review URL: https://codereview.chromium.org/1389373002 Cr-Commit-Position: refs/heads/master@{#31603}
206 lines
5.4 KiB
C++
206 lines
5.4 KiB
C++
// 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/move-optimizer.h"
|
|
#include "test/unittests/compiler/instruction-sequence-unittest.h"
|
|
|
|
namespace v8 {
|
|
namespace internal {
|
|
namespace compiler {
|
|
|
|
class MoveOptimizerTest : public InstructionSequenceTest {
|
|
public:
|
|
Instruction* LastInstruction() { return sequence()->instructions().back(); }
|
|
|
|
void AddMove(Instruction* instr, TestOperand from, TestOperand to,
|
|
Instruction::GapPosition pos = Instruction::START) {
|
|
auto parallel_move = instr->GetOrCreateParallelMove(pos, zone());
|
|
parallel_move->AddMove(ConvertMoveArg(from), ConvertMoveArg(to));
|
|
}
|
|
|
|
int NonRedundantSize(ParallelMove* moves) {
|
|
int i = 0;
|
|
for (auto move : *moves) {
|
|
if (move->IsRedundant()) continue;
|
|
i++;
|
|
}
|
|
return i;
|
|
}
|
|
|
|
bool Contains(ParallelMove* moves, TestOperand from_op, TestOperand to_op) {
|
|
auto from = ConvertMoveArg(from_op);
|
|
auto to = ConvertMoveArg(to_op);
|
|
for (auto move : *moves) {
|
|
if (move->IsRedundant()) continue;
|
|
if (move->source().Equals(from) && move->destination().Equals(to)) {
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
// TODO(dcarney): add a verifier.
|
|
void Optimize() {
|
|
WireBlocks();
|
|
if (FLAG_trace_turbo) {
|
|
OFStream os(stdout);
|
|
PrintableInstructionSequence printable = {config(), sequence()};
|
|
os << "----- Instruction sequence before move optimization -----\n"
|
|
<< printable;
|
|
}
|
|
MoveOptimizer move_optimizer(zone(), sequence());
|
|
move_optimizer.Run();
|
|
if (FLAG_trace_turbo) {
|
|
OFStream os(stdout);
|
|
PrintableInstructionSequence printable = {config(), sequence()};
|
|
os << "----- Instruction sequence after move optimization -----\n"
|
|
<< printable;
|
|
}
|
|
}
|
|
|
|
private:
|
|
InstructionOperand ConvertMoveArg(TestOperand op) {
|
|
CHECK_EQ(kNoValue, op.vreg_.value_);
|
|
CHECK_NE(kNoValue, op.value_);
|
|
switch (op.type_) {
|
|
case kConstant:
|
|
return ConstantOperand(op.value_);
|
|
case kFixedSlot:
|
|
return AllocatedOperand(LocationOperand::STACK_SLOT, kRepWord32,
|
|
op.value_);
|
|
case kFixedRegister:
|
|
CHECK(0 <= op.value_ && op.value_ < num_general_registers());
|
|
return AllocatedOperand(LocationOperand::REGISTER, kRepWord32,
|
|
op.value_);
|
|
case kExplicit:
|
|
CHECK(0 <= op.value_ && op.value_ < num_general_registers());
|
|
return ExplicitOperand(LocationOperand::REGISTER, kRepWord32,
|
|
op.value_);
|
|
default:
|
|
break;
|
|
}
|
|
CHECK(false);
|
|
return InstructionOperand();
|
|
}
|
|
};
|
|
|
|
|
|
TEST_F(MoveOptimizerTest, RemovesRedundant) {
|
|
StartBlock();
|
|
auto first_instr = EmitNop();
|
|
AddMove(first_instr, Reg(0), Reg(1));
|
|
auto last_instr = EmitNop();
|
|
AddMove(last_instr, Reg(1), Reg(0));
|
|
EndBlock(Last());
|
|
|
|
Optimize();
|
|
|
|
CHECK_EQ(0, NonRedundantSize(first_instr->parallel_moves()[0]));
|
|
auto move = last_instr->parallel_moves()[0];
|
|
CHECK_EQ(1, NonRedundantSize(move));
|
|
CHECK(Contains(move, Reg(0), Reg(1)));
|
|
}
|
|
|
|
|
|
TEST_F(MoveOptimizerTest, RemovesRedundantExplicit) {
|
|
StartBlock();
|
|
auto first_instr = EmitNop();
|
|
AddMove(first_instr, Reg(0), ExplicitReg(1));
|
|
auto last_instr = EmitNop();
|
|
AddMove(last_instr, Reg(1), Reg(0));
|
|
EndBlock(Last());
|
|
|
|
Optimize();
|
|
|
|
CHECK_EQ(0, NonRedundantSize(first_instr->parallel_moves()[0]));
|
|
auto move = last_instr->parallel_moves()[0];
|
|
CHECK_EQ(1, NonRedundantSize(move));
|
|
CHECK(Contains(move, Reg(0), ExplicitReg(1)));
|
|
}
|
|
|
|
|
|
TEST_F(MoveOptimizerTest, SplitsConstants) {
|
|
StartBlock();
|
|
EndBlock(Last());
|
|
|
|
auto gap = LastInstruction();
|
|
AddMove(gap, Const(1), Slot(0));
|
|
AddMove(gap, Const(1), Slot(1));
|
|
AddMove(gap, Const(1), Reg(0));
|
|
AddMove(gap, Const(1), Slot(2));
|
|
|
|
Optimize();
|
|
|
|
auto move = gap->parallel_moves()[0];
|
|
CHECK_EQ(1, NonRedundantSize(move));
|
|
CHECK(Contains(move, Const(1), Reg(0)));
|
|
|
|
move = gap->parallel_moves()[1];
|
|
CHECK_EQ(3, NonRedundantSize(move));
|
|
CHECK(Contains(move, Reg(0), Slot(0)));
|
|
CHECK(Contains(move, Reg(0), Slot(1)));
|
|
CHECK(Contains(move, Reg(0), Slot(2)));
|
|
}
|
|
|
|
|
|
TEST_F(MoveOptimizerTest, SimpleMerge) {
|
|
StartBlock();
|
|
EndBlock(Branch(Imm(), 1, 2));
|
|
|
|
StartBlock();
|
|
EndBlock(Jump(2));
|
|
AddMove(LastInstruction(), Reg(0), Reg(1));
|
|
|
|
StartBlock();
|
|
EndBlock(Jump(1));
|
|
AddMove(LastInstruction(), Reg(0), Reg(1));
|
|
|
|
StartBlock();
|
|
EndBlock(Last());
|
|
|
|
auto last = LastInstruction();
|
|
|
|
Optimize();
|
|
|
|
auto move = last->parallel_moves()[0];
|
|
CHECK_EQ(1, NonRedundantSize(move));
|
|
CHECK(Contains(move, Reg(0), Reg(1)));
|
|
}
|
|
|
|
|
|
TEST_F(MoveOptimizerTest, SimpleMergeCycle) {
|
|
StartBlock();
|
|
EndBlock(Branch(Imm(), 1, 2));
|
|
|
|
StartBlock();
|
|
EndBlock(Jump(2));
|
|
auto gap_0 = LastInstruction();
|
|
AddMove(gap_0, Reg(0), Reg(1));
|
|
AddMove(LastInstruction(), Reg(1), Reg(0));
|
|
|
|
StartBlock();
|
|
EndBlock(Jump(1));
|
|
auto gap_1 = LastInstruction();
|
|
AddMove(gap_1, Reg(0), Reg(1));
|
|
AddMove(gap_1, Reg(1), Reg(0));
|
|
|
|
StartBlock();
|
|
EndBlock(Last());
|
|
|
|
auto last = LastInstruction();
|
|
|
|
Optimize();
|
|
|
|
CHECK(gap_0->AreMovesRedundant());
|
|
CHECK(gap_1->AreMovesRedundant());
|
|
auto move = last->parallel_moves()[0];
|
|
CHECK_EQ(2, NonRedundantSize(move));
|
|
CHECK(Contains(move, Reg(0), Reg(1)));
|
|
CHECK(Contains(move, Reg(1), Reg(0)));
|
|
}
|
|
|
|
} // namespace compiler
|
|
} // namespace internal
|
|
} // namespace v8
|