Revision: 24941
Author: [email protected]
Date: Tue Oct 28 13:53:53 2014 UTC
Log: Use a simpler KeyedStoreGeneric stub
[email protected]
Review URL: https://codereview.chromium.org/674913002
https://code.google.com/p/v8/source/detail?r=24941
Modified:
/branches/bleeding_edge/src/builtins.cc
/branches/bleeding_edge/src/ic/arm/ic-arm.cc
/branches/bleeding_edge/src/ic/arm64/ic-arm64.cc
/branches/bleeding_edge/src/ic/ia32/ic-ia32.cc
/branches/bleeding_edge/src/ic/ic.cc
/branches/bleeding_edge/src/ic/ic.h
/branches/bleeding_edge/src/ic/mips/ic-mips.cc
/branches/bleeding_edge/src/ic/mips64/ic-mips64.cc
/branches/bleeding_edge/src/ic/x64/ic-x64.cc
/branches/bleeding_edge/src/ic/x87/ic-x87.cc
=======================================
--- /branches/bleeding_edge/src/builtins.cc Mon Oct 20 08:46:11 2014 UTC
+++ /branches/bleeding_edge/src/builtins.cc Tue Oct 28 13:53:53 2014 UTC
@@ -1310,22 +1310,22 @@
static void Generate_KeyedStoreIC_Megamorphic(MacroAssembler* masm) {
- KeyedStoreIC::GenerateGeneric(masm, SLOPPY, kMissOnMissingHandler);
+ KeyedStoreIC::GenerateMegamorphic(masm, SLOPPY);
}
static void Generate_KeyedStoreIC_Megamorphic_Strict(MacroAssembler* masm)
{
- KeyedStoreIC::GenerateGeneric(masm, STRICT, kMissOnMissingHandler);
+ KeyedStoreIC::GenerateMegamorphic(masm, STRICT);
}
static void Generate_KeyedStoreIC_Generic(MacroAssembler* masm) {
- KeyedStoreIC::GenerateGeneric(masm, SLOPPY,
kCallRuntimeOnMissingHandler);
+ KeyedStoreIC::GenerateGeneric(masm, SLOPPY);
}
static void Generate_KeyedStoreIC_Generic_Strict(MacroAssembler* masm) {
- KeyedStoreIC::GenerateGeneric(masm, STRICT,
kCallRuntimeOnMissingHandler);
+ KeyedStoreIC::GenerateGeneric(masm, STRICT);
}
=======================================
--- /branches/bleeding_edge/src/ic/arm/ic-arm.cc Thu Oct 16 11:42:47 2014
UTC
+++ /branches/bleeding_edge/src/ic/arm/ic-arm.cc Tue Oct 28 13:53:53 2014
UTC
@@ -598,7 +598,7 @@
}
-static void KeyedStoreGenerateGenericHelper(
+static void KeyedStoreGenerateMegamorphicHelper(
MacroAssembler* masm, Label* fast_object, Label* fast_double, Label*
slow,
KeyedStoreCheckMap check_map, KeyedStoreIncrementLength
increment_length,
Register value, Register key, Register receiver, Register receiver_map,
@@ -739,9 +739,8 @@
}
-void KeyedStoreIC::GenerateGeneric(
- MacroAssembler* masm, StrictMode strict_mode,
- KeyedStoreStubCacheRequirement handler_requirement) {
+void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm,
+ StrictMode strict_mode) {
// ---------- S t a t e --------------
// -- r0 : value
// -- r1 : key
@@ -808,12 +807,7 @@
masm->isolate()->stub_cache()->GenerateProbe(masm, flags, false,
receiver,
key, r3, r4, r5, r6);
// Cache miss.
- if (handler_requirement == kCallRuntimeOnMissingHandler) {
- __ b(&slow);
- } else {
- DCHECK(handler_requirement == kMissOnMissingHandler);
- __ b(&miss);
- }
+ __ b(&miss);
// Extra capacity case: Check if there is extra capacity to
// perform the store and update the length. Used for adding one
@@ -848,13 +842,13 @@
__ cmp(key, Operand(ip));
__ b(hs, &extra);
- KeyedStoreGenerateGenericHelper(
+ KeyedStoreGenerateMegamorphicHelper(
masm, &fast_object, &fast_double, &slow, kCheckMap,
kDontIncrementLength,
value, key, receiver, receiver_map, elements_map, elements);
- KeyedStoreGenerateGenericHelper(masm, &fast_object_grow,
&fast_double_grow,
- &slow, kDontCheckMap, kIncrementLength,
value,
- key, receiver, receiver_map,
elements_map,
- elements);
+ KeyedStoreGenerateMegamorphicHelper(masm, &fast_object_grow,
+ &fast_double_grow, &slow,
kDontCheckMap,
+ kIncrementLength, value, key,
receiver,
+ receiver_map, elements_map,
elements);
__ bind(&miss);
GenerateMiss(masm);
=======================================
--- /branches/bleeding_edge/src/ic/arm64/ic-arm64.cc Thu Oct 16 11:42:47
2014 UTC
+++ /branches/bleeding_edge/src/ic/arm64/ic-arm64.cc Tue Oct 28 13:53:53
2014 UTC
@@ -640,7 +640,7 @@
}
-static void KeyedStoreGenerateGenericHelper(
+static void KeyedStoreGenerateMegamorphicHelper(
MacroAssembler* masm, Label* fast_object, Label* fast_double, Label*
slow,
KeyedStoreCheckMap check_map, KeyedStoreIncrementLength
increment_length,
Register value, Register key, Register receiver, Register receiver_map,
@@ -772,10 +772,9 @@
}
-void KeyedStoreIC::GenerateGeneric(
- MacroAssembler* masm, StrictMode strict_mode,
- KeyedStoreStubCacheRequirement handler_requirement) {
- ASM_LOCATION("KeyedStoreIC::GenerateGeneric");
+void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm,
+ StrictMode strict_mode) {
+ ASM_LOCATION("KeyedStoreIC::GenerateMegamorphic");
Label slow;
Label array;
Label fast_object;
@@ -841,12 +840,7 @@
masm->isolate()->stub_cache()->GenerateProbe(masm, flags, false,
receiver,
key, x3, x4, x5, x6);
// Cache miss.
- if (handler_requirement == kCallRuntimeOnMissingHandler) {
- __ B(&slow);
- } else {
- DCHECK(handler_requirement == kMissOnMissingHandler);
- __ B(&miss);
- }
+ __ B(&miss);
__ Bind(&extra);
// Extra capacity case: Check if there is extra capacity to
@@ -881,18 +875,16 @@
__ B(eq, &extra); // We can handle the case where we are appending 1
element.
__ B(lo, &slow);
- KeyedStoreGenerateGenericHelper(
+ KeyedStoreGenerateMegamorphicHelper(
masm, &fast_object, &fast_double, &slow, kCheckMap,
kDontIncrementLength,
value, key, receiver, receiver_map, elements_map, elements);
- KeyedStoreGenerateGenericHelper(masm, &fast_object_grow,
&fast_double_grow,
- &slow, kDontCheckMap, kIncrementLength,
value,
- key, receiver, receiver_map,
elements_map,
- elements);
+ KeyedStoreGenerateMegamorphicHelper(masm, &fast_object_grow,
+ &fast_double_grow, &slow,
kDontCheckMap,
+ kIncrementLength, value, key,
receiver,
+ receiver_map, elements_map,
elements);
- if (handler_requirement == kMissOnMissingHandler) {
- __ bind(&miss);
- GenerateMiss(masm);
- }
+ __ bind(&miss);
+ GenerateMiss(masm);
}
=======================================
--- /branches/bleeding_edge/src/ic/ia32/ic-ia32.cc Thu Oct 16 11:42:47 2014
UTC
+++ /branches/bleeding_edge/src/ic/ia32/ic-ia32.cc Tue Oct 28 13:53:53 2014
UTC
@@ -507,7 +507,7 @@
}
-static void KeyedStoreGenerateGenericHelper(
+static void KeyedStoreGenerateMegamorphicHelper(
MacroAssembler* masm, Label* fast_object, Label* fast_double, Label*
slow,
KeyedStoreCheckMap check_map, KeyedStoreIncrementLength
increment_length) {
Label transition_smi_elements;
@@ -645,9 +645,8 @@
}
-void KeyedStoreIC::GenerateGeneric(
- MacroAssembler* masm, StrictMode strict_mode,
- KeyedStoreStubCacheRequirement handler_requirement) {
+void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm,
+ StrictMode strict_mode) {
// Return address is on the stack.
Label slow, fast_object, fast_object_grow;
Label fast_double, fast_double_grow;
@@ -696,12 +695,7 @@
masm->isolate()->stub_cache()->GenerateProbe(masm, flags, false,
receiver,
key, ebx, no_reg);
// Cache miss.
- if (handler_requirement == kCallRuntimeOnMissingHandler) {
- __ jmp(&slow);
- } else {
- DCHECK(handler_requirement == kMissOnMissingHandler);
- __ jmp(&miss);
- }
+ __ jmp(&miss);
// Extra capacity case: Check if there is extra capacity to
// perform the store and update the length. Used for adding one
@@ -740,15 +734,14 @@
__ cmp(key, FieldOperand(receiver, JSArray::kLengthOffset)); // Compare
smis.
__ j(above_equal, &extra);
- KeyedStoreGenerateGenericHelper(masm, &fast_object, &fast_double, &slow,
- kCheckMap, kDontIncrementLength);
- KeyedStoreGenerateGenericHelper(masm, &fast_object_grow,
&fast_double_grow,
- &slow, kDontCheckMap, kIncrementLength);
+ KeyedStoreGenerateMegamorphicHelper(masm, &fast_object, &fast_double,
&slow,
+ kCheckMap, kDontIncrementLength);
+ KeyedStoreGenerateMegamorphicHelper(masm, &fast_object_grow,
+ &fast_double_grow, &slow,
kDontCheckMap,
+ kIncrementLength);
- if (handler_requirement == kMissOnMissingHandler) {
- __ bind(&miss);
- GenerateMiss(masm);
- }
+ __ bind(&miss);
+ GenerateMiss(masm);
}
=======================================
--- /branches/bleeding_edge/src/ic/ic.cc Mon Oct 20 11:42:56 2014 UTC
+++ /branches/bleeding_edge/src/ic/ic.cc Tue Oct 28 13:53:53 2014 UTC
@@ -1672,11 +1672,10 @@
return generic_stub();
}
- // If the maximum number of receiver maps has been exceeded, use the
generic
- // version of the IC.
+ // If the maximum number of receiver maps has been exceeded, use the
+ // megamorphic version of the IC.
if (target_receiver_maps.length() > kMaxKeyedPolymorphism) {
- TRACE_GENERIC_IC(isolate(), "KeyedStoreIC", "max polymorph exceeded");
- return generic_stub();
+ return megamorphic_stub();
}
// Make sure all polymorphic handlers have the same store mode,
otherwise the
@@ -1938,6 +1937,13 @@
return store_handle;
}
+
+
+// static
+void KeyedStoreIC::GenerateGeneric(MacroAssembler* masm,
+ StrictMode strict_mode) {
+ PropertyICCompiler::GenerateRuntimeSetProperty(masm, strict_mode);
+}
// static
=======================================
--- /branches/bleeding_edge/src/ic/ic.h Mon Oct 20 11:42:56 2014 UTC
+++ /branches/bleeding_edge/src/ic/ic.h Tue Oct 28 13:53:53 2014 UTC
@@ -539,12 +539,6 @@
enum KeyedStoreIncrementLength { kDontIncrementLength, kIncrementLength };
-enum KeyedStoreStubCacheRequirement {
- kCallRuntimeOnMissingHandler,
- kMissOnMissingHandler
-};
-
-
class KeyedStoreIC : public StoreIC {
public:
// ExtraICState bits (building on IC)
@@ -585,9 +579,8 @@
}
static void GenerateMiss(MacroAssembler* masm);
static void GenerateSlow(MacroAssembler* masm);
- static void GenerateGeneric(
- MacroAssembler* masm, StrictMode strict_mode,
- KeyedStoreStubCacheRequirement handler_requirement);
+ static void GenerateMegamorphic(MacroAssembler* masm, StrictMode
strict_mode);
+ static void GenerateGeneric(MacroAssembler* masm, StrictMode
strict_mode);
static void GenerateSloppyArguments(MacroAssembler* masm);
protected:
=======================================
--- /branches/bleeding_edge/src/ic/mips/ic-mips.cc Thu Oct 16 11:42:47 2014
UTC
+++ /branches/bleeding_edge/src/ic/mips/ic-mips.cc Tue Oct 28 13:53:53 2014
UTC
@@ -594,7 +594,7 @@
}
-static void KeyedStoreGenerateGenericHelper(
+static void KeyedStoreGenerateMegamorphicHelper(
MacroAssembler* masm, Label* fast_object, Label* fast_double, Label*
slow,
KeyedStoreCheckMap check_map, KeyedStoreIncrementLength
increment_length,
Register value, Register key, Register receiver, Register receiver_map,
@@ -740,9 +740,8 @@
}
-void KeyedStoreIC::GenerateGeneric(
- MacroAssembler* masm, StrictMode strict_mode,
- KeyedStoreStubCacheRequirement handler_requirement) {
+void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm,
+ StrictMode strict_mode) {
// ---------- S t a t e --------------
// -- a0 : value
// -- a1 : key
@@ -805,12 +804,7 @@
masm->isolate()->stub_cache()->GenerateProbe(masm, flags, false,
receiver,
key, a3, t0, t1, t2);
// Cache miss.
- if (handler_requirement == kCallRuntimeOnMissingHandler) {
- __ Branch(&slow);
- } else {
- DCHECK(handler_requirement == kMissOnMissingHandler);
- __ Branch(&miss);
- }
+ __ Branch(&miss);
// Extra capacity case: Check if there is extra capacity to
// perform the store and update the length. Used for adding one
@@ -843,13 +837,13 @@
__ lw(t0, FieldMemOperand(receiver, JSArray::kLengthOffset));
__ Branch(&extra, hs, key, Operand(t0));
- KeyedStoreGenerateGenericHelper(
+ KeyedStoreGenerateMegamorphicHelper(
masm, &fast_object, &fast_double, &slow, kCheckMap,
kDontIncrementLength,
value, key, receiver, receiver_map, elements_map, elements);
- KeyedStoreGenerateGenericHelper(masm, &fast_object_grow,
&fast_double_grow,
- &slow, kDontCheckMap, kIncrementLength,
value,
- key, receiver, receiver_map,
elements_map,
- elements);
+ KeyedStoreGenerateMegamorphicHelper(masm, &fast_object_grow,
+ &fast_double_grow, &slow,
kDontCheckMap,
+ kIncrementLength, value, key,
receiver,
+ receiver_map, elements_map,
elements);
__ bind(&miss);
GenerateMiss(masm);
=======================================
--- /branches/bleeding_edge/src/ic/mips64/ic-mips64.cc Thu Oct 16 16:39:51
2014 UTC
+++ /branches/bleeding_edge/src/ic/mips64/ic-mips64.cc Tue Oct 28 13:53:53
2014 UTC
@@ -599,7 +599,7 @@
}
-static void KeyedStoreGenerateGenericHelper(
+static void KeyedStoreGenerateMegamorphicHelper(
MacroAssembler* masm, Label* fast_object, Label* fast_double, Label*
slow,
KeyedStoreCheckMap check_map, KeyedStoreIncrementLength
increment_length,
Register value, Register key, Register receiver, Register receiver_map,
@@ -749,9 +749,8 @@
}
-void KeyedStoreIC::GenerateGeneric(
- MacroAssembler* masm, StrictMode strict_mode,
- KeyedStoreStubCacheRequirement handler_requirement) {
+void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm,
+ StrictMode strict_mode) {
// ---------- S t a t e --------------
// -- a0 : value
// -- a1 : key
@@ -814,12 +813,7 @@
masm->isolate()->stub_cache()->GenerateProbe(masm, flags, false,
receiver,
key, a3, a4, a5, a6);
// Cache miss.
- if (handler_requirement == kCallRuntimeOnMissingHandler) {
- __ Branch(&slow);
- } else {
- DCHECK(handler_requirement == kMissOnMissingHandler);
- __ Branch(&miss);
- }
+ __ Branch(&miss);
// Extra capacity case: Check if there is extra capacity to
// perform the store and update the length. Used for adding one
@@ -852,13 +846,13 @@
__ ld(a4, FieldMemOperand(receiver, JSArray::kLengthOffset));
__ Branch(&extra, hs, key, Operand(a4));
- KeyedStoreGenerateGenericHelper(
+ KeyedStoreGenerateMegamorphicHelper(
masm, &fast_object, &fast_double, &slow, kCheckMap,
kDontIncrementLength,
value, key, receiver, receiver_map, elements_map, elements);
- KeyedStoreGenerateGenericHelper(masm, &fast_object_grow,
&fast_double_grow,
- &slow, kDontCheckMap, kIncrementLength,
value,
- key, receiver, receiver_map,
elements_map,
- elements);
+ KeyedStoreGenerateMegamorphicHelper(masm, &fast_object_grow,
+ &fast_double_grow, &slow,
kDontCheckMap,
+ kIncrementLength, value, key,
receiver,
+ receiver_map, elements_map,
elements);
__ bind(&miss);
GenerateMiss(masm);
=======================================
--- /branches/bleeding_edge/src/ic/x64/ic-x64.cc Thu Oct 16 11:42:47 2014
UTC
+++ /branches/bleeding_edge/src/ic/x64/ic-x64.cc Tue Oct 28 13:53:53 2014
UTC
@@ -403,7 +403,7 @@
}
-static void KeyedStoreGenerateGenericHelper(
+static void KeyedStoreGenerateMegamorphicHelper(
MacroAssembler* masm, Label* fast_object, Label* fast_double, Label*
slow,
KeyedStoreCheckMap check_map, KeyedStoreIncrementLength
increment_length) {
Label transition_smi_elements;
@@ -540,9 +540,8 @@
}
-void KeyedStoreIC::GenerateGeneric(
- MacroAssembler* masm, StrictMode strict_mode,
- KeyedStoreStubCacheRequirement handler_requirement) {
+void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm,
+ StrictMode strict_mode) {
// Return address is on the stack.
Label slow, slow_with_tagged_index, fast_object, fast_object_grow;
Label fast_double, fast_double_grow;
@@ -594,12 +593,7 @@
masm->isolate()->stub_cache()->GenerateProbe(masm, flags, false,
receiver,
key, rbx, no_reg);
// Cache miss.
- if (handler_requirement == kCallRuntimeOnMissingHandler) {
- __ jmp(&slow_with_tagged_index);
- } else {
- DCHECK(handler_requirement == kMissOnMissingHandler);
- __ jmp(&miss);
- }
+ __ jmp(&miss);
// Extra capacity case: Check if there is extra capacity to
// perform the store and update the length. Used for adding one
@@ -635,15 +629,14 @@
__ SmiCompareInteger32(FieldOperand(receiver, JSArray::kLengthOffset),
key);
__ j(below_equal, &extra);
- KeyedStoreGenerateGenericHelper(masm, &fast_object, &fast_double, &slow,
- kCheckMap, kDontIncrementLength);
- KeyedStoreGenerateGenericHelper(masm, &fast_object_grow,
&fast_double_grow,
- &slow, kDontCheckMap, kIncrementLength);
+ KeyedStoreGenerateMegamorphicHelper(masm, &fast_object, &fast_double,
&slow,
+ kCheckMap, kDontIncrementLength);
+ KeyedStoreGenerateMegamorphicHelper(masm, &fast_object_grow,
+ &fast_double_grow, &slow,
kDontCheckMap,
+ kIncrementLength);
- if (handler_requirement == kMissOnMissingHandler) {
- __ bind(&miss);
- GenerateMiss(masm);
- }
+ __ bind(&miss);
+ GenerateMiss(masm);
}
=======================================
--- /branches/bleeding_edge/src/ic/x87/ic-x87.cc Fri Oct 17 05:23:14 2014
UTC
+++ /branches/bleeding_edge/src/ic/x87/ic-x87.cc Tue Oct 28 13:53:53 2014
UTC
@@ -509,7 +509,7 @@
}
-static void KeyedStoreGenerateGenericHelper(
+static void KeyedStoreGenerateMegamorphicHelper(
MacroAssembler* masm, Label* fast_object, Label* fast_double, Label*
slow,
KeyedStoreCheckMap check_map, KeyedStoreIncrementLength
increment_length) {
Label transition_smi_elements;
@@ -647,9 +647,8 @@
}
-void KeyedStoreIC::GenerateGeneric(
- MacroAssembler* masm, StrictMode strict_mode,
- KeyedStoreStubCacheRequirement handler_requirement) {
+void KeyedStoreIC::GenerateMegamorphic(MacroAssembler* masm,
+ StrictMode strict_mode) {
// Return address is on the stack.
Label slow, fast_object, fast_object_grow;
Label fast_double, fast_double_grow;
@@ -698,12 +697,7 @@
masm->isolate()->stub_cache()->GenerateProbe(masm, flags, false,
receiver,
key, ebx, no_reg);
// Cache miss.
- if (handler_requirement == kCallRuntimeOnMissingHandler) {
- __ jmp(&slow);
- } else {
- DCHECK(handler_requirement == kMissOnMissingHandler);
- __ jmp(&miss);
- }
+ __ jmp(&miss);
// Extra capacity case: Check if there is extra capacity to
// perform the store and update the length. Used for adding one
@@ -742,15 +736,14 @@
__ cmp(key, FieldOperand(receiver, JSArray::kLengthOffset)); // Compare
smis.
__ j(above_equal, &extra);
- KeyedStoreGenerateGenericHelper(masm, &fast_object, &fast_double, &slow,
- kCheckMap, kDontIncrementLength);
- KeyedStoreGenerateGenericHelper(masm, &fast_object_grow,
&fast_double_grow,
- &slow, kDontCheckMap, kIncrementLength);
+ KeyedStoreGenerateMegamorphicHelper(masm, &fast_object, &fast_double,
&slow,
+ kCheckMap, kDontIncrementLength);
+ KeyedStoreGenerateMegamorphicHelper(masm, &fast_object_grow,
+ &fast_double_grow, &slow,
kDontCheckMap,
+ kIncrementLength);
- if (handler_requirement == kMissOnMissingHandler) {
- __ bind(&miss);
- GenerateMiss(masm);
- }
+ __ bind(&miss);
+ GenerateMiss(masm);
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
