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

[turbofan] Handle StoreMessage in load elimination

Browse Source 
This CL adds handling for Load/StoreMessage to LoadElimination. It is
handled like a Load/StoreField to an external location.

Change-Id: I50f27fba9cb7ffabf1474aa409083676cef65442
Bug: v8:8183, chromium:927746
Reviewed-on: https://chromium-review.googlesource.com/c/1451879
Commit-Queue: Sigurd Schneider <sigurds@chromium.org>
Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#59344}
This commit is contained in:
Sigurd Schneider 2019-02-04 15:11:05 +01:00 committed by Commit Bot
parent 08c65e8838
commit ac42dc4ff7
2 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/compiler/load-elimination.cc
View File

@ -4,6 +4,7 @@
#include "src/compiler/load-elimination.h"
#include "src/compiler/access-builder.h"
#include "src/compiler/common-operator.h"
#include "src/compiler/js-graph.h"
#include "src/compiler/node-properties.h"
@ -112,9 +113,13 @@ Reduction LoadElimination::Reduce(Node* node) {
case IrOpcode::kTransitionElementsKind:
return ReduceTransitionElementsKind(node);
case IrOpcode::kLoadField:
return ReduceLoadField(node);
return ReduceLoadField(node, FieldAccessOf(node->op()));
case IrOpcode::kStoreField:
return ReduceStoreField(node);
return ReduceStoreField(node, FieldAccessOf(node->op()));
case IrOpcode::kStoreMessage:
return ReduceStoreField(node, AccessBuilder::ForExternalIntPtr());
case IrOpcode::kLoadMessage:
return ReduceLoadField(node, AccessBuilder::ForExternalIntPtr());
case IrOpcode::kLoadElement:
return ReduceLoadElement(node);
case IrOpcode::kStoreElement:
@ -675,7 +680,7 @@ Reduction LoadElimination::ReduceEnsureWritableFastElements(Node* node) {
Node* const effect = NodeProperties::GetEffectInput(node);
AbstractState const* state = node_states_.Get(effect);
if (state == nullptr) return NoChange();
// Check if the {elements} already have the fixed array map.
// Check if the {elements} already have the fixed array map.
ZoneHandleSet<Map> elements_maps;
ZoneHandleSet<Map> fixed_array_maps(factory()->fixed_array_map());
if (state->LookupMaps(elements, &elements_maps) &&
@ -784,8 +789,8 @@ Reduction LoadElimination::ReduceTransitionAndStoreElement(Node* node) {
return UpdateState(node, state);
}
Reduction LoadElimination::ReduceLoadField(Node* node) {
FieldAccess const& access = FieldAccessOf(node->op());
Reduction LoadElimination::ReduceLoadField(Node* node,
FieldAccess const& access) {
Node* object = NodeProperties::GetValueInput(node, 0);
Node* effect = NodeProperties::GetEffectInput(node);
Node* control = NodeProperties::GetControlInput(node);
@ -833,8 +838,8 @@ Reduction LoadElimination::ReduceLoadField(Node* node) {
return UpdateState(node, state);
}
Reduction LoadElimination::ReduceStoreField(Node* node) {
FieldAccess const& access = FieldAccessOf(node->op());
Reduction LoadElimination::ReduceStoreField(Node* node,
FieldAccess const& access) {
Node* const object = NodeProperties::GetValueInput(node, 0);
Node* const new_value = NodeProperties::GetValueInput(node, 1);
Node* const effect = NodeProperties::GetEffectInput(node);
@ -1070,6 +1075,25 @@ Reduction LoadElimination::UpdateState(Node* node, AbstractState const* state) {
return NoChange();
}
LoadElimination::AbstractState const*
LoadElimination::ComputeLoopStateForStoreField(
Node* current, LoadElimination::AbstractState const* state,
FieldAccess const& access) const {
Node* const object = NodeProperties::GetValueInput(current, 0);
if (access.offset == HeapObject::kMapOffset) {
// Invalidate what we know about the {object}s map.
state = state->KillMaps(object, zone());
} else {
int field_index = FieldIndexOf(access);
if (field_index < 0) {
state = state->KillFields(object, access.name, zone());
} else {
state = state->KillField(object, field_index, access.name, zone());
}
}
return state;
}
LoadElimination::AbstractState const* LoadElimination::ComputeLoopState(
Node* node, AbstractState const* state) const {
Node* const control = NodeProperties::GetControlInput(node);
@ -1126,23 +1150,14 @@ LoadElimination::AbstractState const* LoadElimination::ComputeLoopState(
MaybeHandle<Name>(), zone());
break;
}
case IrOpcode::kStoreField: {
FieldAccess const& access = FieldAccessOf(current->op());
Node* const object = NodeProperties::GetValueInput(current, 0);
if (access.offset == HeapObject::kMapOffset) {
// Invalidate what we know about the {object}s map.
state = state->KillMaps(object, zone());
} else {
int field_index = FieldIndexOf(access);
if (field_index < 0) {
state = state->KillFields(object, access.name, zone());
} else {
state =
state->KillField(object, field_index, access.name, zone());
}
}
case IrOpcode::kStoreField:
state = ComputeLoopStateForStoreField(current, state,
FieldAccessOf(current->op()));
break;
case IrOpcode::kStoreMessage:
state = ComputeLoopStateForStoreField(
current, state, AccessBuilder::ForExternalIntPtr());
break;
}
case IrOpcode::kStoreElement: {
Node* const object = NodeProperties::GetValueInput(current, 0);
Node* const index = NodeProperties::GetValueInput(current, 1);

9
src/compiler/load-elimination.h
View File

@ -243,20 +243,25 @@ class V8_EXPORT_PRIVATE LoadElimination final
Reduction ReduceEnsureWritableFastElements(Node* node);
Reduction ReduceMaybeGrowFastElements(Node* node);
Reduction ReduceTransitionElementsKind(Node* node);
Reduction ReduceLoadField(Node* node);
Reduction ReduceStoreField(Node* node);
Reduction ReduceLoadField(Node* node, FieldAccess const& access);
Reduction ReduceStoreField(Node* node, FieldAccess const& access);
Reduction ReduceLoadElement(Node* node);
Reduction ReduceStoreElement(Node* node);
Reduction ReduceTransitionAndStoreElement(Node* node);
Reduction ReduceStoreTypedElement(Node* node);
Reduction ReduceEffectPhi(Node* node);
Reduction ReduceStart(Node* node);
Reduction ReduceStoreMessage(Node* node);
Reduction ReduceLoadMessage(Node* node);
Reduction ReduceOtherNode(Node* node);
Reduction UpdateState(Node* node, AbstractState const* state);
AbstractState const* ComputeLoopState(Node* node,
AbstractState const* state) const;
AbstractState const* ComputeLoopStateForStoreField(
Node* current, LoadElimination::AbstractState const* state,
FieldAccess const& access) const;
AbstractState const* UpdateStateForPhi(AbstractState const* state,
Node* effect_phi, Node* phi);