AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[wasm] Avoid respill and reload for WASM instance parameter

Browse Source 
This CL adds support for "secondary parameter locations" for
the WASM instance parameter. Since this parameter is spilled onto
the stack by the function prologue, it is not necessary to allocate
additional spill slots for it. This saves both code space and
runtime.

R=mstarzinger@chromium.org

Change-Id: I440e2c58cd2a227be8a7f386df5193d8fb729fd1
Reviewed-on: https://chromium-review.googlesource.com/1075056
Commit-Queue: Ben Titzer <titzer@chromium.org>
Reviewed-by: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#53387}
This commit is contained in:
Ben L. Titzer 2018-05-28 15:35:18 +02:00 committed by Commit Bot
parent da2be4d030
commit 246fd44c98
2 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/frame.h
View File

@ -153,9 +153,6 @@ class Frame : public ZoneObject {
return frame_slot_count_ - 1;
}
static const int kContextSlot = 2 + StandardFrameConstants::kCPSlotCount;
static const int kJSFunctionSlot = 3 + StandardFrameConstants::kCPSlotCount;
private:
void AllocateAlignedFrameSlots(int width) {
DCHECK_LT(0, width);

57
src/compiler/linkage.cc
View File

@ -19,7 +19,7 @@ namespace compiler {
namespace {
LinkageLocation regloc(Register reg, MachineType type) {
inline LinkageLocation regloc(Register reg, MachineType type) {
return LinkageLocation::ForRegister(reg.code(), type);
}
@ -499,26 +499,61 @@ LinkageLocation Linkage::GetOsrValueLocation(int index) const {
}
}
namespace {
inline bool MatchesRegisterAndType(const LinkageLocation& loc, Register reg,
MachineType machine_type) {
return loc.IsRegister() && loc.AsRegister() == reg.code() &&
loc.GetType() == machine_type;
}
} // namespace
bool Linkage::ParameterHasSecondaryLocation(int index) const {
if (!incoming_->IsJSFunctionCall()) return false;
LinkageLocation loc = GetParameterLocation(index);
return (loc == regloc(kJSFunctionRegister, MachineType::AnyTagged()) ||
loc == regloc(kContextRegister, MachineType::AnyTagged()));
// TODO(titzer): this should be configurable, not call-type specific.
if (incoming_->IsJSFunctionCall()) {
LinkageLocation loc = GetParameterLocation(index);
return MatchesRegisterAndType(loc, kJSFunctionRegister,
MachineType::AnyTagged()) ||
MatchesRegisterAndType(loc, kContextRegister,
MachineType::AnyTagged());
}
if (incoming_->IsWasmFunctionCall()) {
LinkageLocation loc = GetParameterLocation(index);
return MatchesRegisterAndType(loc, kWasmInstanceRegister,
MachineType::AnyTagged());
}
return false;
}
LinkageLocation Linkage::GetParameterSecondaryLocation(int index) const {
// TODO(titzer): these constants are necessary due to offset/slot# mismatch
static const int kJSContextSlot = 2 + StandardFrameConstants::kCPSlotCount;
static const int kJSFunctionSlot = 3 + StandardFrameConstants::kCPSlotCount;
static const int kWasmInstanceSlot = 3 + StandardFrameConstants::kCPSlotCount;
DCHECK(ParameterHasSecondaryLocation(index));
LinkageLocation loc = GetParameterLocation(index);
if (loc == regloc(kJSFunctionRegister, MachineType::AnyTagged())) {
return LinkageLocation::ForCalleeFrameSlot(Frame::kJSFunctionSlot,
MachineType::AnyTagged());
} else {
DCHECK(loc == regloc(kContextRegister, MachineType::AnyTagged()));
return LinkageLocation::ForCalleeFrameSlot(Frame::kContextSlot,
// TODO(titzer): this should be configurable, not call-type specific.
if (incoming_->IsJSFunctionCall()) {
if (MatchesRegisterAndType(loc, kJSFunctionRegister,
MachineType::AnyTagged())) {
return LinkageLocation::ForCalleeFrameSlot(kJSFunctionSlot,
MachineType::AnyTagged());
} else {
DCHECK(MatchesRegisterAndType(loc, kContextRegister,
MachineType::AnyTagged()));
return LinkageLocation::ForCalleeFrameSlot(kJSContextSlot,
MachineType::AnyTagged());
}
}
if (incoming_->IsWasmFunctionCall()) {
DCHECK(MatchesRegisterAndType(loc, kWasmInstanceRegister,
MachineType::AnyTagged()));
return LinkageLocation::ForCalleeFrameSlot(kWasmInstanceSlot,
MachineType::AnyTagged());
}
UNREACHABLE();
return LinkageLocation::ForCalleeFrameSlot(0, MachineType::AnyTagged());
}