[mips64][turbofan] Implement on-stack returns.
This is the implementation of crrev.com/c/766371 for mips64. Original description: Add the ability to return (multiple) return values on the stack: - Extend stack frames with a new buffer region for return slots. This region is located at the end of a caller's frame such that its slots can be indexed as caller frame slots in a callee (located beyond its parameters) and assigned return values. - Adjust stack frame constructon and deconstruction accordingly. - Extend linkage computation to support register plus stack returns. - Reserve return slots in caller frame when respective calls occur. - Introduce and generate architecture instructions ('peek') for reading back results from return slots in the caller. - Aggressive tests. - Some minor clean-up. R=v8-mips-ports@googlegroups.com Change-Id: Ia924f94367320b9062e33d35b58ccd38c8fc3ca3 Reviewed-on: https://chromium-review.googlesource.com/842483 Reviewed-by: Ivica Bogosavljevic <ivica.bogosavljevic@mips.com> Commit-Queue: Andreas Haas <ahaas@chromium.org> Cr-Commit-Position: refs/heads/master@{#50299}
This commit is contained in:
parent
c0234008fa
commit
461274fb63
@ -1997,6 +1997,24 @@ CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction(
|
||||
frame_access_state()->IncreaseSPDelta(1);
|
||||
}
|
||||
break;
|
||||
case kMips64Peek: {
|
||||
// The incoming value is 0-based, but we need a 1-based value.
|
||||
int reverse_slot = MiscField::decode(instr->opcode()) + 1;
|
||||
int offset =
|
||||
FrameSlotToFPOffset(frame()->GetTotalFrameSlotCount() - reverse_slot);
|
||||
if (instr->OutputAt(0)->IsFPRegister()) {
|
||||
LocationOperand* op = LocationOperand::cast(instr->OutputAt(0));
|
||||
if (op->representation() == MachineRepresentation::kFloat64) {
|
||||
__ Ldc1(i.OutputDoubleRegister(), MemOperand(fp, offset));
|
||||
} else {
|
||||
DCHECK_EQ(op->representation(), MachineRepresentation::kFloat32);
|
||||
__ lwc1(i.OutputSingleRegister(0), MemOperand(fp, offset));
|
||||
}
|
||||
} else {
|
||||
__ Ld(i.OutputRegister(0), MemOperand(fp, offset));
|
||||
}
|
||||
break;
|
||||
}
|
||||
case kMips64StackClaim: {
|
||||
__ Dsubu(sp, sp, Operand(i.InputInt32(0)));
|
||||
frame_access_state()->IncreaseSPDelta(i.InputInt32(0) / kPointerSize);
|
||||
@ -3698,10 +3716,12 @@ void CodeGenerator::AssembleConstructFrame() {
|
||||
|
||||
const RegList saves = descriptor->CalleeSavedRegisters();
|
||||
const RegList saves_fpu = descriptor->CalleeSavedFPRegisters();
|
||||
const int returns = frame()->GetReturnSlotCount();
|
||||
|
||||
// Skip callee-saved slots, which are pushed below.
|
||||
// Skip callee-saved and return slots, which are pushed below.
|
||||
shrink_slots -= base::bits::CountPopulation(saves);
|
||||
shrink_slots -= base::bits::CountPopulation(saves_fpu);
|
||||
shrink_slots -= returns;
|
||||
if (shrink_slots > 0) {
|
||||
__ Dsubu(sp, sp, Operand(shrink_slots * kPointerSize));
|
||||
}
|
||||
@ -3717,11 +3737,21 @@ void CodeGenerator::AssembleConstructFrame() {
|
||||
__ MultiPush(saves);
|
||||
DCHECK_EQ(kNumCalleeSaved, base::bits::CountPopulation(saves) + 1);
|
||||
}
|
||||
|
||||
if (returns != 0) {
|
||||
// Create space for returns.
|
||||
__ Dsubu(sp, sp, Operand(returns * kPointerSize));
|
||||
}
|
||||
}
|
||||
|
||||
void CodeGenerator::AssembleReturn(InstructionOperand* pop) {
|
||||
CallDescriptor* descriptor = linkage()->GetIncomingDescriptor();
|
||||
|
||||
const int returns = frame()->GetReturnSlotCount();
|
||||
if (returns != 0) {
|
||||
__ Daddu(sp, sp, Operand(returns * kPointerSize));
|
||||
}
|
||||
|
||||
// Restore GP registers.
|
||||
const RegList saves = descriptor->CalleeSavedRegisters();
|
||||
if (saves != 0) {
|
||||
|
@ -156,6 +156,7 @@ namespace compiler {
|
||||
V(Mips64Float64Min) \
|
||||
V(Mips64Float64SilenceNaN) \
|
||||
V(Mips64Push) \
|
||||
V(Mips64Peek) \
|
||||
V(Mips64StoreToStackSlot) \
|
||||
V(Mips64ByteSwap64) \
|
||||
V(Mips64ByteSwap32) \
|
||||
|
@ -1694,7 +1694,24 @@ void InstructionSelector::EmitPrepareArguments(
|
||||
void InstructionSelector::EmitPrepareResults(ZoneVector<PushParameter>* results,
|
||||
const CallDescriptor* descriptor,
|
||||
Node* node) {
|
||||
// TODO(ahaas): Port.
|
||||
Mips64OperandGenerator g(this);
|
||||
|
||||
int reverse_slot = 0;
|
||||
for (PushParameter output : *results) {
|
||||
if (!output.location.IsCallerFrameSlot()) continue;
|
||||
// Skip any alignment holes in nodes.
|
||||
if (output.node != nullptr) {
|
||||
DCHECK(!descriptor->IsCFunctionCall());
|
||||
if (output.location.GetType() == MachineType::Float32()) {
|
||||
MarkAsFloat32(output.node);
|
||||
} else if (output.location.GetType() == MachineType::Float64()) {
|
||||
MarkAsFloat64(output.node);
|
||||
}
|
||||
InstructionOperand result = g.DefineAsRegister(output.node);
|
||||
Emit(kMips64Peek | MiscField::encode(reverse_slot), result);
|
||||
}
|
||||
reverse_slot += output.location.GetSizeInPointers();
|
||||
}
|
||||
}
|
||||
|
||||
bool InstructionSelector::IsTailCallAddressImmediate() { return false; }
|
||||
|
@ -171,7 +171,7 @@
|
||||
|
||||
##############################################################################
|
||||
# TODO(ahaas): Port multiple return values to ARM, MIPS, S390 and PPC
|
||||
['arch == arm64 or arch == mips64 or arch == mips64el or arch == s390 or arch == s390x or arch == ppc or arch == ppc64', {
|
||||
['arch == arm64 or arch == s390 or arch == s390x or arch == ppc or arch == ppc64', {
|
||||
'test-multiple-return/*': [SKIP],
|
||||
}],
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user