Revision: 3902
Author: [email protected]
Date: Thu Feb 18 09:30:32 2010
Log: Make setting length on arrays faster.
Review URL: http://codereview.chromium.org/647013
http://code.google.com/p/v8/source/detail?r=3902
Modified:
/branches/bleeding_edge/src/arm/ic-arm.cc
/branches/bleeding_edge/src/builtins.cc
/branches/bleeding_edge/src/builtins.h
/branches/bleeding_edge/src/ia32/ic-ia32.cc
/branches/bleeding_edge/src/ic.cc
/branches/bleeding_edge/src/ic.h
/branches/bleeding_edge/src/objects-inl.h
/branches/bleeding_edge/src/objects.cc
/branches/bleeding_edge/src/objects.h
/branches/bleeding_edge/src/x64/ic-x64.cc
=======================================
--- /branches/bleeding_edge/src/arm/ic-arm.cc Tue Feb 16 06:13:21 2010
+++ /branches/bleeding_edge/src/arm/ic-arm.cc Thu Feb 18 09:30:32 2010
@@ -856,6 +856,53 @@
// Perform tail call to the entry.
__ TailCallRuntime(ExternalReference(IC_Utility(kStoreIC_Miss)), 3, 1);
}
+
+
+void StoreIC::GenerateArrayLength(MacroAssembler* masm) {
+ // ----------- S t a t e -------------
+ // -- r0 : value
+ // -- r1 : receiver
+ // -- r2 : name
+ // -- lr : return address
+ // -----------------------------------
+ //
+ // This accepts as a receiver anything JSObject::SetElementsLength
accepts
+ // (currently anything except for external and pixel arrays which means
+ // anything with elements of FixedArray type.), but currently is
restricted
+ // to JSArray.
+ // Value must be a number, but only smis are accepted as the most common
case.
+
+ Label miss;
+
+ Register receiver = r1;
+ Register value = r0;
+ Register scratch = r3;
+
+ // Check that the receiver isn't a smi.
+ __ BranchOnSmi(receiver, &miss);
+
+ // Check that the object is a JS array.
+ __ CompareObjectType(receiver, scratch, scratch, JS_ARRAY_TYPE);
+ __ b(ne, &miss);
+
+ // Check that elements are FixedArray.
+ __ ldr(scratch, FieldMemOperand(receiver, JSArray::kElementsOffset));
+ __ CompareObjectType(scratch, scratch, scratch, FIXED_ARRAY_TYPE);
+ __ b(ne, &miss);
+
+ // Check that value is a smi.
+ __ BranchOnNotSmi(value, &miss);
+
+ // Prepare tail call to StoreIC_ArrayLength.
+ __ push(receiver);
+ __ push(value);
+
+ __ TailCallRuntime(ExternalReference(IC_Utility(kStoreIC_ArrayLength)),
2, 1);
+
+ __ bind(&miss);
+
+ GenerateMiss(masm);
+}
#undef __
=======================================
--- /branches/bleeding_edge/src/builtins.cc Wed Feb 17 05:04:30 2010
+++ /branches/bleeding_edge/src/builtins.cc Thu Feb 18 09:30:32 2010
@@ -1077,6 +1077,11 @@
static void Generate_StoreIC_Megamorphic(MacroAssembler* masm) {
StoreIC::GenerateMegamorphic(masm);
}
+
+
+static void Generate_StoreIC_ArrayLength(MacroAssembler* masm) {
+ StoreIC::GenerateArrayLength(masm);
+}
static void Generate_KeyedStoreIC_Generic(MacroAssembler* masm) {
=======================================
--- /branches/bleeding_edge/src/builtins.h Wed Feb 17 02:54:49 2010
+++ /branches/bleeding_edge/src/builtins.h Thu Feb 18 09:30:32 2010
@@ -96,6 +96,7 @@
V(KeyedLoadIC_IndexedInterceptor, KEYED_LOAD_IC, MEGAMORPHIC) \
\
V(StoreIC_Initialize, STORE_IC, UNINITIALIZED) \
+ V(StoreIC_ArrayLength, STORE_IC, MONOMORPHIC) \
V(StoreIC_Megamorphic, STORE_IC, MEGAMORPHIC) \
\
V(KeyedStoreIC_Initialize, KEYED_STORE_IC, UNINITIALIZED) \
=======================================
--- /branches/bleeding_edge/src/ia32/ic-ia32.cc Thu Feb 18 02:09:54 2010
+++ /branches/bleeding_edge/src/ia32/ic-ia32.cc Thu Feb 18 09:30:32 2010
@@ -1433,6 +1433,57 @@
// Perform tail call to the entry.
__ TailCallRuntime(ExternalReference(IC_Utility(kStoreIC_Miss)), 3, 1);
}
+
+
+void StoreIC::GenerateArrayLength(MacroAssembler* masm) {
+ // ----------- S t a t e -------------
+ // -- eax : value
+ // -- ecx : name
+ // -- edx : receiver
+ // -- esp[0] : return address
+ // -----------------------------------
+ //
+ // This accepts as a receiver anything JSObject::SetElementsLength
accepts
+ // (currently anything except for external and pixel arrays which means
+ // anything with elements of FixedArray type.), but currently is
restricted
+ // to JSArray.
+ // Value must be a number, but only smis are accepted as the most common
case.
+
+ Label miss;
+
+ Register receiver = edx;
+ Register value = eax;
+ Register scratch = ebx;
+
+ // Check that the receiver isn't a smi.
+ __ test(receiver, Immediate(kSmiTagMask));
+ __ j(zero, &miss, not_taken);
+
+ // Check that the object is a JS array.
+ __ CmpObjectType(receiver, JS_ARRAY_TYPE, scratch);
+ __ j(not_equal, &miss, not_taken);
+
+ // Check that elements are FixedArray.
+ __ mov(scratch, FieldOperand(receiver, JSArray::kElementsOffset));
+ __ CmpObjectType(scratch, FIXED_ARRAY_TYPE, scratch);
+ __ j(not_equal, &miss, not_taken);
+
+ // Check that value is a smi.
+ __ test(value, Immediate(kSmiTagMask));
+ __ j(not_zero, &miss, not_taken);
+
+ // Prepare tail call to StoreIC_ArrayLength.
+ __ pop(scratch);
+ __ push(receiver);
+ __ push(value);
+ __ push(scratch); // return address
+
+ __ TailCallRuntime(ExternalReference(IC_Utility(kStoreIC_ArrayLength)),
2, 1);
+
+ __ bind(&miss);
+
+ GenerateMiss(masm);
+}
// Defined in ic.cc.
=======================================
--- /branches/bleeding_edge/src/ic.cc Thu Feb 18 07:10:35 2010
+++ /branches/bleeding_edge/src/ic.cc Thu Feb 18 09:30:32 2010
@@ -1048,6 +1048,20 @@
if (result.is_null()) return Failure::Exception();
return *value;
}
+
+
+ // Use specialized code for setting the length of arrays.
+ if (receiver->IsJSArray()
+ && name->Equals(Heap::length_symbol())
+ && receiver->AllowsSetElementsLength()) {
+#ifdef DEBUG
+ if (FLAG_trace_ic) PrintF("[StoreIC : +#length /array]\n");
+#endif
+ Code* target = Builtins::builtin(Builtins::StoreIC_ArrayLength);
+ set_target(target);
+ StubCache::Set(*name, HeapObject::cast(*object)->map(), target);
+ return receiver->SetProperty(*name, *value, NONE);
+ }
// Lookup the property locally in the receiver.
if (FLAG_use_ic && !receiver->IsJSGlobalProxy()) {
@@ -1342,6 +1356,17 @@
return ic.Store(state, args.at<Object>(0), args.at<String>(1),
args.at<Object>(2));
}
+
+
+Object* StoreIC_ArrayLength(Arguments args) {
+ NoHandleAllocation nha;
+
+ ASSERT(args.length() == 2);
+ JSObject* receiver = JSObject::cast(args[0]);
+ Object* len = args[1];
+
+ return receiver->SetElementsLength(len);
+}
// Extend storage is called in a store inline cache when
=======================================
--- /branches/bleeding_edge/src/ic.h Fri Feb 12 06:21:18 2010
+++ /branches/bleeding_edge/src/ic.h Thu Feb 18 09:30:32 2010
@@ -45,6 +45,7 @@
ICU(KeyedLoadIC_Miss) \
ICU(CallIC_Miss) \
ICU(StoreIC_Miss) \
+ ICU(StoreIC_ArrayLength) \
ICU(SharedStoreIC_ExtendStorage) \
ICU(KeyedStoreIC_Miss) \
/* Utilities for IC stubs. */ \
@@ -358,6 +359,7 @@
static void GenerateInitialize(MacroAssembler* masm) {
GenerateMiss(masm); }
static void GenerateMiss(MacroAssembler* masm);
static void GenerateMegamorphic(MacroAssembler* masm);
+ static void GenerateArrayLength(MacroAssembler* masm);
private:
// Update the inline cache and the global stub cache based on the
=======================================
--- /branches/bleeding_edge/src/objects-inl.h Fri Jan 29 03:46:55 2010
+++ /branches/bleeding_edge/src/objects-inl.h Thu Feb 18 09:30:32 2010
@@ -2771,6 +2771,13 @@
bool JSObject::HasIndexedInterceptor() {
return map()->has_indexed_interceptor();
}
+
+
+bool JSObject::AllowsSetElementsLength() {
+ bool result = elements()->IsFixedArray();
+ ASSERT(result == (!HasPixelElements() && !HasExternalArrayElements()));
+ return result;
+}
StringDictionary* JSObject::property_dictionary() {
=======================================
--- /branches/bleeding_edge/src/objects.cc Thu Feb 18 07:10:35 2010
+++ /branches/bleeding_edge/src/objects.cc Thu Feb 18 09:30:32 2010
@@ -5304,7 +5304,7 @@
Object* JSObject::SetElementsLength(Object* len) {
// We should never end in here with a pixel or external array.
- ASSERT(!HasPixelElements() && !HasExternalArrayElements());
+ ASSERT(AllowsSetElementsLength());
Object* smi_length = len->ToSmi();
if (smi_length->IsSmi()) {
=======================================
--- /branches/bleeding_edge/src/objects.h Thu Feb 18 01:07:03 2010
+++ /branches/bleeding_edge/src/objects.h Thu Feb 18 09:30:32 2010
@@ -1161,6 +1161,7 @@
inline bool HasExternalIntElements();
inline bool HasExternalUnsignedIntElements();
inline bool HasExternalFloatElements();
+ inline bool AllowsSetElementsLength();
inline NumberDictionary* element_dictionary(); // Gets slow elements.
// Collects elements starting at index 0.
=======================================
--- /branches/bleeding_edge/src/x64/ic-x64.cc Tue Feb 16 06:13:21 2010
+++ /branches/bleeding_edge/src/x64/ic-x64.cc Thu Feb 18 09:30:32 2010
@@ -1406,6 +1406,55 @@
// Cache miss: Jump to runtime.
GenerateMiss(masm);
}
+
+
+void StoreIC::GenerateArrayLength(MacroAssembler* masm) {
+ // ----------- S t a t e -------------
+ // -- rax : value
+ // -- rcx : name
+ // -- rdx : receiver
+ // -- rsp[0] : return address
+ // -----------------------------------
+ //
+ // This accepts as a receiver anything JSObject::SetElementsLength
accepts
+ // (currently anything except for external and pixel arrays which means
+ // anything with elements of FixedArray type.), but currently is
restricted
+ // to JSArray.
+ // Value must be a number, but only smis are accepted as the most common
case.
+
+ Label miss;
+
+ Register receiver = rdx;
+ Register value = rax;
+ Register scratch = rbx;
+
+ // Check that the receiver isn't a smi.
+ __ JumpIfSmi(receiver, &miss);
+
+ // Check that the object is a JS array.
+ __ CmpObjectType(receiver, JS_ARRAY_TYPE, scratch);
+ __ j(not_equal, &miss);
+
+ // Check that elements are FixedArray.
+ __ movq(scratch, FieldOperand(receiver, JSArray::kElementsOffset));
+ __ CmpObjectType(scratch, FIXED_ARRAY_TYPE, scratch);
+ __ j(not_equal, &miss);
+
+ // Check that value is a smi.
+ __ JumpIfNotSmi(value, &miss);
+
+ // Prepare tail call to StoreIC_ArrayLength.
+ __ pop(scratch);
+ __ push(receiver);
+ __ push(value);
+ __ push(scratch); // return address
+
+ __ TailCallRuntime(ExternalReference(IC_Utility(kStoreIC_ArrayLength)),
2, 1);
+
+ __ bind(&miss);
+
+ GenerateMiss(masm);
+}
#undef __
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
