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

[compiler] Fix RestParameter performance regression

Browse Source 
This regression is due to miscalculating the mapped_count in escape-analysis-reducer.

Since NewArguemntsElements contains the entire arguments count instead of the rest argument size, we need to subtract (or add in the case of the reversed arguments stack) the formal parameter count to the index.

Change-Id: I865018573fc3b0f0d20f7286653b7f6803cbe665
Bug: chromium:1106667
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2304576
Auto-Submit: Victor Gomes <victorgomes@chromium.org>
Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
Reviewed-by: Tobias Tebbi <tebbi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#68963}
This commit is contained in:
Victor Gomes 2020-07-17 11:52:29 +02:00 committed by Commit Bot
parent b8a46d3dda
commit 9726c8a3be
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/compiler/escape-analysis-reducer.cc
View File

@ -232,7 +232,9 @@ void EscapeAnalysisReducer::Finalize() {
const NewArgumentsElementsParameters& params =
NewArgumentsElementsParametersOf(node->op());
ArgumentsStateType type = params.arguments_type();
int mapped_count = params.formal_parameter_count();
int mapped_count = type == CreateArgumentsType::kMappedArguments
? params.formal_parameter_count()
: 0;
Node* arguments_frame = NodeProperties::GetValueInput(node, 0);
if (arguments_frame->opcode() != IrOpcode::kArgumentsFrame) continue;
@ -315,6 +317,10 @@ void EscapeAnalysisReducer::Finalize() {
switch (load->opcode()) {
case IrOpcode::kLoadElement: {
Node* index = NodeProperties::GetValueInput(load, 1);
Node* formal_parameter_count =
jsgraph()->Constant(params.formal_parameter_count());
NodeProperties::SetType(formal_parameter_count,
TypeCache::Get()->kArgumentsLengthType);
#ifdef V8_REVERSE_JSARGS
Node* offset_to_first_elem = jsgraph()->Constant(
CommonFrameConstants::kFixedSlotCountAboveFp);
@ -323,12 +329,30 @@ void EscapeAnalysisReducer::Finalize() {
Node* offset = jsgraph()->graph()->NewNode(
jsgraph()->simplified()->NumberAdd(), index,
offset_to_first_elem);
if (type == CreateArgumentsType::kRestParameter) {
// In the case of rest parameters we should skip the formal
// parameters.
NodeProperties::SetType(offset,
TypeCache::Get()->kArgumentsLengthType);
offset = jsgraph()->graph()->NewNode(
jsgraph()->simplified()->NumberAdd(), offset,
formal_parameter_count);
}
#else
// {offset} is a reverted index starting from 1. The base address is
// adapted to allow offsets starting from 1.
Node* offset = jsgraph()->graph()->NewNode(
jsgraph()->simplified()->NumberSubtract(), arguments_length,
index);
if (type == CreateArgumentsType::kRestParameter) {
// In the case of rest parameters we should skip the formal
// parameters.
NodeProperties::SetType(offset,
TypeCache::Get()->kArgumentsLengthType);
offset = jsgraph()->graph()->NewNode(
jsgraph()->simplified()->NumberSubtract(), offset,
formal_parameter_count);
}
#endif
NodeProperties::SetType(offset,
TypeCache::Get()->kArgumentsLengthType);