Commit 38f7ccba authored by mbrandy's avatar mbrandy Committed by Commit bot

PPC: [turbofan] Fix tail call optimization.

Port d21de2a4

Original commit message:
Tail calls are matched on the graph, with a dedicated tail call
optimization that is actually testable. The instruction selection can
still fall back to a regular if the platform constraints don't allow to
emit a tail call (i.e. the return locations of caller and callee differ
or the callee takes non-register parameters, which is a restriction that
will be removed in the future).

Also explicitly limit tail call optimization to stubs for now and drop
the global flag.

R=dstence@us.ibm.com, michael_dawson@ca.ibm.com
BUG=

Review URL: https://codereview.chromium.org/1114193003

Cr-Commit-Position: refs/heads/master@{#28239}
parent 1e4173d9
...@@ -1434,12 +1434,11 @@ void InstructionSelector::VisitFloat64LessThanOrEqual(Node* node) { ...@@ -1434,12 +1434,11 @@ void InstructionSelector::VisitFloat64LessThanOrEqual(Node* node) {
} }
void InstructionSelector::VisitCall(Node* node, BasicBlock* handler, void InstructionSelector::VisitCall(Node* node, BasicBlock* handler) {
CallMode call_mode) {
PPCOperandGenerator g(this); PPCOperandGenerator g(this);
const CallDescriptor* descriptor = OpParameter<const CallDescriptor*>(node); const CallDescriptor* descriptor = OpParameter<const CallDescriptor*>(node);
FrameStateDescriptor* frame_state_descriptor = NULL; FrameStateDescriptor* frame_state_descriptor = nullptr;
if (descriptor->NeedsFrameState()) { if (descriptor->NeedsFrameState()) {
frame_state_descriptor = frame_state_descriptor =
GetFrameStateDescriptor(node->InputAt(descriptor->InputCount())); GetFrameStateDescriptor(node->InputAt(descriptor->InputCount()));
...@@ -1461,21 +1460,20 @@ void InstructionSelector::VisitCall(Node* node, BasicBlock* handler, ...@@ -1461,21 +1460,20 @@ void InstructionSelector::VisitCall(Node* node, BasicBlock* handler,
// Pass label of exception handler block. // Pass label of exception handler block.
CallDescriptor::Flags flags = descriptor->flags(); CallDescriptor::Flags flags = descriptor->flags();
if (handler != nullptr) { if (handler) {
flags |= CallDescriptor::kHasExceptionHandler; flags |= CallDescriptor::kHasExceptionHandler;
buffer.instruction_args.push_back(g.Label(handler)); buffer.instruction_args.push_back(g.Label(handler));
} }
// Select the appropriate opcode based on the call type. // Select the appropriate opcode based on the call type.
bool is_tail_call = call_mode == TAIL_CALL;
InstructionCode opcode; InstructionCode opcode;
switch (descriptor->kind()) { switch (descriptor->kind()) {
case CallDescriptor::kCallCodeObject: { case CallDescriptor::kCallCodeObject: {
opcode = is_tail_call ? kArchTailCallCodeObject : kArchCallCodeObject; opcode = kArchCallCodeObject;
break; break;
} }
case CallDescriptor::kCallJSFunction: case CallDescriptor::kCallJSFunction:
opcode = is_tail_call ? kArchTailCallJSFunction : kArchCallJSFunction; opcode = kArchCallJSFunction;
break; break;
default: default:
UNREACHABLE(); UNREACHABLE();
...@@ -1484,13 +1482,95 @@ void InstructionSelector::VisitCall(Node* node, BasicBlock* handler, ...@@ -1484,13 +1482,95 @@ void InstructionSelector::VisitCall(Node* node, BasicBlock* handler,
opcode |= MiscField::encode(flags); opcode |= MiscField::encode(flags);
// Emit the call instruction. // Emit the call instruction.
size_t size = is_tail_call ? 0 : buffer.outputs.size(); size_t const output_count = buffer.outputs.size();
InstructionOperand* first_output = auto* outputs = output_count ? &buffer.outputs.front() : nullptr;
size > 0 ? &buffer.outputs.front() : nullptr; Emit(opcode, output_count, outputs, buffer.instruction_args.size(),
Instruction* call_instr = &buffer.instruction_args.front())->MarkAsCall();
Emit(opcode, size, first_output, buffer.instruction_args.size(), }
&buffer.instruction_args.front());
call_instr->MarkAsCall();
void InstructionSelector::VisitTailCall(Node* node) {
PPCOperandGenerator g(this);
CallDescriptor const* descriptor = OpParameter<CallDescriptor const*>(node);
DCHECK_NE(0, descriptor->flags() & CallDescriptor::kSupportsTailCalls);
DCHECK_EQ(0, descriptor->flags() & CallDescriptor::kPatchableCallSite);
DCHECK_EQ(0, descriptor->flags() & CallDescriptor::kNeedsNopAfterCall);
// TODO(turbofan): Relax restriction for stack parameters.
if (descriptor->UsesOnlyRegisters() &&
descriptor->HasSameReturnLocationsAs(
linkage()->GetIncomingDescriptor())) {
CallBuffer buffer(zone(), descriptor, nullptr);
// Compute InstructionOperands for inputs and outputs.
// TODO(turbofan): on PPC it's probably better to use the code object in a
// register if there are multiple uses of it. Improve constant pool and the
// heuristics in the register allocator for where to emit constants.
InitializeCallBuffer(node, &buffer, true, false);
DCHECK_EQ(0u, buffer.pushed_nodes.size());
// Select the appropriate opcode based on the call type.
InstructionCode opcode;
switch (descriptor->kind()) {
case CallDescriptor::kCallCodeObject:
opcode = kArchTailCallCodeObject;
break;
case CallDescriptor::kCallJSFunction:
opcode = kArchTailCallJSFunction;
break;
default:
UNREACHABLE();
return;
}
opcode |= MiscField::encode(descriptor->flags());
// Emit the tailcall instruction.
Emit(opcode, 0, nullptr, buffer.instruction_args.size(),
&buffer.instruction_args.front());
} else {
FrameStateDescriptor* frame_state_descriptor = nullptr;
if (descriptor->NeedsFrameState()) {
frame_state_descriptor =
GetFrameStateDescriptor(node->InputAt(descriptor->InputCount()));
}
CallBuffer buffer(zone(), descriptor, frame_state_descriptor);
// Compute InstructionOperands for inputs and outputs.
// TODO(turbofan): on PPC it's probably better to use the code object in a
// register if there are multiple uses of it. Improve constant pool and the
// heuristics in the register allocator for where to emit constants.
InitializeCallBuffer(node, &buffer, true, false);
// Push any stack arguments.
for (Node* node : base::Reversed(buffer.pushed_nodes)) {
Emit(kPPC_Push, g.NoOutput(), g.UseRegister(node));
}
// Select the appropriate opcode based on the call type.
InstructionCode opcode;
switch (descriptor->kind()) {
case CallDescriptor::kCallCodeObject: {
opcode = kArchCallCodeObject;
break;
}
case CallDescriptor::kCallJSFunction:
opcode = kArchCallJSFunction;
break;
default:
UNREACHABLE();
return;
}
opcode |= MiscField::encode(descriptor->flags());
// Emit the call instruction.
size_t const output_count = buffer.outputs.size();
auto* outputs = output_count ? &buffer.outputs.front() : nullptr;
Emit(opcode, output_count, outputs, buffer.instruction_args.size(),
&buffer.instruction_args.front())->MarkAsCall();
Emit(kArchRet, 0, nullptr, output_count, outputs);
}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment