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

[maglev] Use virtual accumulator slot in frame array

Browse Source 
During a frame merge we call ForEachValue that "get"s every
live register, including the virtual accumulator. That currently
fails since we need to check if the register is the virtual
accumulator and set/get the accumulator field in InterpreterFrameState.

The virtual accumulator slot in RegisterFrameArray (the same as the
return address in a live frame) is actually unused.
So we can use this slot for the InterpreterFrameState's accumulator,
instead of a separate field.

Bug: v8:7700
Change-Id: Ife33946a4f9c58ca1f4eadeb587f9880f6fb2afc
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3536648
Auto-Submit: Victor Gomes <victorgomes@chromium.org>
Reviewed-by: Leszek Swirski <leszeks@chromium.org>
Commit-Queue: Leszek Swirski <leszeks@chromium.org>
Cr-Commit-Position: refs/heads/main@{#79553}
This commit is contained in:
Victor Gomes 2022-03-18 16:35:07 +01:00 committed by V8 LUCI CQ
parent b3a91634d5
commit 857b33f537
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/maglev/maglev-interpreter-frame-state.h
View File

@ -29,26 +29,30 @@ class InterpreterFrameState {
InterpreterFrameState(const MaglevCompilationUnit& info,
const InterpreterFrameState& state)
: accumulator_(state.accumulator_), frame_(info) {
: frame_(info) {
frame_.CopyFrom(info, state.frame_, nullptr);
}
void CopyFrom(const MaglevCompilationUnit& info,
const InterpreterFrameState& state) {
accumulator_ = state.accumulator_;
frame_.CopyFrom(info, state.frame_, nullptr);
}
inline void CopyFrom(const MaglevCompilationUnit& info,
const MergePointInterpreterFrameState& state);
void set_accumulator(ValueNode* value) { accumulator_ = value; }
ValueNode* accumulator() const { return accumulator_; }
void set_accumulator(ValueNode* value) {
frame_[interpreter::Register::virtual_accumulator()] = value;
}
ValueNode* accumulator() const {
return frame_[interpreter::Register::virtual_accumulator()];
}
void set(interpreter::Register reg, ValueNode* value) {
DCHECK_IMPLIES(reg.is_parameter(),
reg == interpreter::Register::current_context() ||
reg == interpreter::Register::function_closure() ||
reg == interpreter::Register::virtual_accumulator() ||
reg.ToParameterIndex() >= 0);
frame_[reg] = value;
}
@ -56,6 +60,7 @@ class InterpreterFrameState {
DCHECK_IMPLIES(reg.is_parameter(),
reg == interpreter::Register::current_context() ||
reg == interpreter::Register::function_closure() ||
reg == interpreter::Register::virtual_accumulator() ||
reg.ToParameterIndex() >= 0);
return frame_[reg];
}
@ -63,7 +68,6 @@ class InterpreterFrameState {
const RegisterFrameArray<ValueNode*>& frame() const { return frame_; }
private:
ValueNode* accumulator_ = nullptr;
RegisterFrameArray<ValueNode*> frame_;
};
@ -366,7 +370,6 @@ class MergePointInterpreterFrameState {
if (liveness_->AccumulatorIsLive()) {
f(interpreter::Register::virtual_accumulator(),
live_registers_and_accumulator_[live_index++]);
live_index++;
}
DCHECK_EQ(live_index, SizeFor(info, liveness_));
}
@ -389,7 +392,7 @@ void InterpreterFrameState::CopyFrom(
frame_[reg] = state.live_registers_and_accumulator_[live_index++];
});
if (state.liveness_->AccumulatorIsLive()) {
accumulator_ = state.live_registers_and_accumulator_[live_index++];
set_accumulator(state.live_registers_and_accumulator_[live_index++]);
}
}