Commit 2585ee06 authored by jkummerow's avatar jkummerow Committed by Commit bot

[LoadIC] Use LoadIC_Uninitialized for 0->PRE transitions

Avoiding runtime call overhead.
There's a fast path for Function.prototype loads, which are very common.

BUG=v8:5269

Review-Url: https://codereview.chromium.org/2711353002
Cr-Commit-Position: refs/heads/master@{#43474}
parent f6e7bc4d
...@@ -23,6 +23,7 @@ namespace internal { ...@@ -23,6 +23,7 @@ namespace internal {
} }
IC_BUILTIN(LoadIC) IC_BUILTIN(LoadIC)
IC_BUILTIN(LoadIC_Uninitialized)
IC_BUILTIN(KeyedLoadIC) IC_BUILTIN(KeyedLoadIC)
IC_BUILTIN(LoadICTrampoline) IC_BUILTIN(LoadICTrampoline)
IC_BUILTIN(LoadField) IC_BUILTIN(LoadField)
......
...@@ -248,6 +248,7 @@ class Isolate; ...@@ -248,6 +248,7 @@ class Isolate;
TFS(LoadIC_Miss, BUILTIN, kNoExtraICState, LoadWithVector, 1) \ TFS(LoadIC_Miss, BUILTIN, kNoExtraICState, LoadWithVector, 1) \
TFS(LoadIC_Normal, HANDLER, Code::LOAD_IC, LoadWithVector, 1) \ TFS(LoadIC_Normal, HANDLER, Code::LOAD_IC, LoadWithVector, 1) \
TFS(LoadIC_Slow, HANDLER, Code::LOAD_IC, LoadWithVector, 1) \ TFS(LoadIC_Slow, HANDLER, Code::LOAD_IC, LoadWithVector, 1) \
TFS(LoadIC_Uninitialized, BUILTIN, kNoExtraICState, LoadWithVector, 1) \
TFS(StoreIC_Miss, BUILTIN, kNoExtraICState, StoreWithVector, 1) \ TFS(StoreIC_Miss, BUILTIN, kNoExtraICState, StoreWithVector, 1) \
TFS(StoreIC_Normal, HANDLER, Code::STORE_IC, StoreWithVector, 1) \ TFS(StoreIC_Normal, HANDLER, Code::STORE_IC, StoreWithVector, 1) \
ASH(StoreIC_Setter_ForDeopt, BUILTIN, kNoExtraICState) \ ASH(StoreIC_Setter_ForDeopt, BUILTIN, kNoExtraICState) \
......
...@@ -264,6 +264,7 @@ TFS_BUILTIN(FastNewClosure) ...@@ -264,6 +264,7 @@ TFS_BUILTIN(FastNewClosure)
TFS_BUILTIN(FastNewObject) TFS_BUILTIN(FastNewObject)
TFS_BUILTIN(ForInFilter) TFS_BUILTIN(ForInFilter)
TFS_BUILTIN(GetSuperConstructor) TFS_BUILTIN(GetSuperConstructor)
TFS_BUILTIN(LoadIC_Uninitialized)
TFS_BUILTIN(KeyedLoadIC_Megamorphic) TFS_BUILTIN(KeyedLoadIC_Megamorphic)
TFS_BUILTIN(PromiseHandleReject) TFS_BUILTIN(PromiseHandleReject)
TFS_BUILTIN(RegExpReplace) TFS_BUILTIN(RegExpReplace)
......
...@@ -38,6 +38,7 @@ class V8_EXPORT_PRIVATE CodeFactory final { ...@@ -38,6 +38,7 @@ class V8_EXPORT_PRIVATE CodeFactory final {
// Initial states for ICs. // Initial states for ICs.
static Callable LoadIC(Isolate* isolate); static Callable LoadIC(Isolate* isolate);
static Callable LoadIC_Uninitialized(Isolate* isolate);
static Callable LoadICInOptimizedCode(Isolate* isolate); static Callable LoadICInOptimizedCode(Isolate* isolate);
static Callable LoadICProtoArray(Isolate* isolate, bool throw_if_nonexistent); static Callable LoadICProtoArray(Isolate* isolate, bool throw_if_nonexistent);
static Callable LoadGlobalIC(Isolate* isolate, TypeofMode typeof_mode); static Callable LoadGlobalIC(Isolate* isolate, TypeofMode typeof_mode);
......
...@@ -1194,7 +1194,8 @@ void AccessorAssembler::GenericElementLoad(Node* receiver, Node* receiver_map, ...@@ -1194,7 +1194,8 @@ void AccessorAssembler::GenericElementLoad(Node* receiver, Node* receiver_map,
void AccessorAssembler::GenericPropertyLoad(Node* receiver, Node* receiver_map, void AccessorAssembler::GenericPropertyLoad(Node* receiver, Node* receiver_map,
Node* instance_type, Node* key, Node* instance_type, Node* key,
const LoadICParameters* p, const LoadICParameters* p,
Label* slow) { Label* slow,
UseStubCache use_stub_cache) {
Comment("key is unique name"); Comment("key is unique name");
Label if_found_on_receiver(this), if_property_dictionary(this), Label if_found_on_receiver(this), if_property_dictionary(this),
lookup_prototype_chain(this); lookup_prototype_chain(this);
...@@ -1220,8 +1221,10 @@ void AccessorAssembler::GenericPropertyLoad(Node* receiver, Node* receiver_map, ...@@ -1220,8 +1221,10 @@ void AccessorAssembler::GenericPropertyLoad(Node* receiver, Node* receiver_map,
Label if_descriptor_found(this), stub_cache(this); Label if_descriptor_found(this), stub_cache(this);
Variable var_name_index(this, MachineType::PointerRepresentation()); Variable var_name_index(this, MachineType::PointerRepresentation());
Label* notfound =
use_stub_cache == kUseStubCache ? &stub_cache : &lookup_prototype_chain;
DescriptorLookup(key, descriptors, bitfield3, &if_descriptor_found, DescriptorLookup(key, descriptors, bitfield3, &if_descriptor_found,
&var_name_index, &stub_cache); &var_name_index, notfound);
Bind(&if_descriptor_found); Bind(&if_descriptor_found);
{ {
...@@ -1231,8 +1234,8 @@ void AccessorAssembler::GenericPropertyLoad(Node* receiver, Node* receiver_map, ...@@ -1231,8 +1234,8 @@ void AccessorAssembler::GenericPropertyLoad(Node* receiver, Node* receiver_map,
Goto(&if_found_on_receiver); Goto(&if_found_on_receiver);
} }
Bind(&stub_cache); if (use_stub_cache == kUseStubCache) {
{ Bind(&stub_cache);
Comment("stub cache probe for fast property load"); Comment("stub cache probe for fast property load");
Variable var_handler(this, MachineRepresentation::kTagged); Variable var_handler(this, MachineRepresentation::kTagged);
Label found_handler(this, &var_handler), stub_cache_miss(this); Label found_handler(this, &var_handler), stub_cache_miss(this);
...@@ -1452,6 +1455,7 @@ void AccessorAssembler::LoadIC(const LoadICParameters* p) { ...@@ -1452,6 +1455,7 @@ void AccessorAssembler::LoadIC(const LoadICParameters* p) {
// TODO(ishell): defer blocks when it works. // TODO(ishell): defer blocks when it works.
Label if_handler(this, &var_handler), try_polymorphic(this), Label if_handler(this, &var_handler), try_polymorphic(this),
try_megamorphic(this /*, Label::kDeferred*/), try_megamorphic(this /*, Label::kDeferred*/),
try_uninitialized(this /*, Label::kDeferred*/),
miss(this /*, Label::kDeferred*/); miss(this /*, Label::kDeferred*/);
Node* receiver_map = LoadReceiverMap(p->receiver); Node* receiver_map = LoadReceiverMap(p->receiver);
...@@ -1478,13 +1482,77 @@ void AccessorAssembler::LoadIC(const LoadICParameters* p) { ...@@ -1478,13 +1482,77 @@ void AccessorAssembler::LoadIC(const LoadICParameters* p) {
{ {
// Check megamorphic case. // Check megamorphic case.
GotoIfNot(WordEqual(feedback, LoadRoot(Heap::kmegamorphic_symbolRootIndex)), GotoIfNot(WordEqual(feedback, LoadRoot(Heap::kmegamorphic_symbolRootIndex)),
&miss); &try_uninitialized);
TryProbeStubCache(isolate()->load_stub_cache(), p->receiver, p->name, TryProbeStubCache(isolate()->load_stub_cache(), p->receiver, p->name,
&if_handler, &var_handler, &miss); &if_handler, &var_handler, &miss);
} }
Bind(&try_uninitialized);
{
// Check uninitialized case.
GotoIfNot(
WordEqual(feedback, LoadRoot(Heap::kuninitialized_symbolRootIndex)),
&miss);
TailCallStub(CodeFactory::LoadIC_Uninitialized(isolate()), p->context,
p->receiver, p->name, p->slot, p->vector);
}
Bind(&miss);
{
TailCallRuntime(Runtime::kLoadIC_Miss, p->context, p->receiver, p->name,
p->slot, p->vector);
}
}
void AccessorAssembler::LoadIC_Uninitialized(const LoadICParameters* p) {
Label miss(this);
Node* receiver = p->receiver;
GotoIf(TaggedIsSmi(receiver), &miss);
Node* receiver_map = LoadMap(receiver);
Node* instance_type = LoadMapInstanceType(receiver_map);
// Optimistically write the state transition to the vector.
StoreFixedArrayElement(p->vector, p->slot,
LoadRoot(Heap::kpremonomorphic_symbolRootIndex),
SKIP_WRITE_BARRIER, 0, SMI_PARAMETERS);
Label not_function_prototype(this);
GotoIf(Word32NotEqual(instance_type, Int32Constant(JS_FUNCTION_TYPE)),
&not_function_prototype);
GotoIfNot(WordEqual(p->name, LoadRoot(Heap::kprototype_stringRootIndex)),
&not_function_prototype);
Node* bit_field = LoadMapBitField(receiver_map);
GotoIf(IsSetWord32(bit_field, 1 << Map::kHasNonInstancePrototype),
&not_function_prototype);
// Function.prototype load.
{
// TODO(jkummerow): Unify with LoadIC_FunctionPrototype builtin
// (when we have a shared CSA base class for all builtins).
Node* proto_or_map =
LoadObjectField(receiver, JSFunction::kPrototypeOrInitialMapOffset);
GotoIf(IsTheHole(proto_or_map), &miss);
Variable var_result(this, MachineRepresentation::kTagged, proto_or_map);
Label done(this, &var_result);
GotoIfNot(IsMap(proto_or_map), &done);
var_result.Bind(LoadMapPrototype(proto_or_map));
Goto(&done);
Bind(&done);
Return(var_result.value());
}
Bind(&not_function_prototype);
GenericPropertyLoad(receiver, receiver_map, instance_type, p->name, p, &miss,
kDontUseStubCache);
Bind(&miss); Bind(&miss);
{ {
// Undo the optimistic state transition.
StoreFixedArrayElement(p->vector, p->slot,
LoadRoot(Heap::kuninitialized_symbolRootIndex),
SKIP_WRITE_BARRIER, 0, SMI_PARAMETERS);
TailCallRuntime(Runtime::kLoadIC_Miss, p->context, p->receiver, p->name, TailCallRuntime(Runtime::kLoadIC_Miss, p->context, p->receiver, p->name,
p->slot, p->vector); p->slot, p->vector);
} }
...@@ -1856,6 +1924,19 @@ void AccessorAssembler::GenerateLoadIC() { ...@@ -1856,6 +1924,19 @@ void AccessorAssembler::GenerateLoadIC() {
LoadIC(&p); LoadIC(&p);
} }
void AccessorAssembler::GenerateLoadIC_Uninitialized() {
typedef LoadWithVectorDescriptor Descriptor;
Node* receiver = Parameter(Descriptor::kReceiver);
Node* name = Parameter(Descriptor::kName);
Node* slot = Parameter(Descriptor::kSlot);
Node* vector = Parameter(Descriptor::kVector);
Node* context = Parameter(Descriptor::kContext);
LoadICParameters p(context, receiver, name, slot, vector);
LoadIC_Uninitialized(&p);
}
void AccessorAssembler::GenerateLoadICTrampoline() { void AccessorAssembler::GenerateLoadICTrampoline() {
typedef LoadDescriptor Descriptor; typedef LoadDescriptor Descriptor;
......
...@@ -24,6 +24,7 @@ class AccessorAssembler : public CodeStubAssembler { ...@@ -24,6 +24,7 @@ class AccessorAssembler : public CodeStubAssembler {
: CodeStubAssembler(state) {} : CodeStubAssembler(state) {}
void GenerateLoadIC(); void GenerateLoadIC();
void GenerateLoadIC_Uninitialized();
void GenerateLoadField(); void GenerateLoadField();
void GenerateLoadICTrampoline(); void GenerateLoadICTrampoline();
void GenerateKeyedLoadIC(); void GenerateKeyedLoadIC();
...@@ -93,6 +94,7 @@ class AccessorAssembler : public CodeStubAssembler { ...@@ -93,6 +94,7 @@ class AccessorAssembler : public CodeStubAssembler {
// Stub generation entry points. // Stub generation entry points.
void LoadIC(const LoadICParameters* p); void LoadIC(const LoadICParameters* p);
void LoadIC_Uninitialized(const LoadICParameters* p);
void LoadICProtoArray(const LoadICParameters* p, Node* handler, void LoadICProtoArray(const LoadICParameters* p, Node* handler,
bool throw_reference_error_if_nonexistent); bool throw_reference_error_if_nonexistent);
void LoadGlobalIC(const LoadICParameters* p, TypeofMode typeof_mode); void LoadGlobalIC(const LoadICParameters* p, TypeofMode typeof_mode);
...@@ -167,9 +169,11 @@ class AccessorAssembler : public CodeStubAssembler { ...@@ -167,9 +169,11 @@ class AccessorAssembler : public CodeStubAssembler {
void GenericElementLoad(Node* receiver, Node* receiver_map, void GenericElementLoad(Node* receiver, Node* receiver_map,
Node* instance_type, Node* index, Label* slow); Node* instance_type, Node* index, Label* slow);
enum UseStubCache { kUseStubCache, kDontUseStubCache };
void GenericPropertyLoad(Node* receiver, Node* receiver_map, void GenericPropertyLoad(Node* receiver, Node* receiver_map,
Node* instance_type, Node* key, Node* instance_type, Node* key,
const LoadICParameters* p, Label* slow); const LoadICParameters* p, Label* slow,
UseStubCache use_stub_cache = kUseStubCache);
// Low-level helpers. // Low-level helpers.
......
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