Skip to content

V
V8
Commit d1d56d98 authored by vitalyr@chromium.org's avatar vitalyr@chromium.org
Browse files
Options

ia32: Fuse map and type checks in call ICs for API functions. 

This uses the fact that if a map stayed the same then the object
still passes the type check. A new builtin is added to handle the
API call in this case.

Review URL: http://codereview.chromium.org/573003

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@3825 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent ad83e411
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 859 additions and 143 deletions
src/arm/stub-cache-arm.cc
View file @ d1d56d98
...@@ -737,7 +737,11 @@ Register StubCompiler::CheckPrototypes(JSObject* object, ...@@ -737,7 +737,11 @@ Register StubCompiler::CheckPrototypes(JSObject* object,
Register holder_reg, Register holder_reg,
Register scratch, Register scratch,
String* name, String* name,
int save_at_depth,
Label* miss) { Label* miss) {
// TODO(602): support object saving.
ASSERT(save_at_depth == kInvalidProtoDepth);
// Check that the maps haven't changed. // Check that the maps haven't changed.
Register result = Register result =
masm()->CheckMaps(object, object_reg, holder, holder_reg, scratch, miss); masm()->CheckMaps(object, object_reg, holder, holder_reg, scratch, miss);
......
src/builtins.cc
View file @ d1d56d98
...@@ -474,6 +474,76 @@ BUILTIN(HandleApiCallConstruct) { ...@@ -474,6 +474,76 @@ BUILTIN(HandleApiCallConstruct) {
} }
#ifdef DEBUG
static void VerifyTypeCheck(Handle<JSObject> object,
Handle<JSFunction> function) {
FunctionTemplateInfo* info =
FunctionTemplateInfo::cast(function->shared()->function_data());
if (info->signature()->IsUndefined()) return;
SignatureInfo* signature = SignatureInfo::cast(info->signature());
Object* receiver_type = signature->receiver();
if (receiver_type->IsUndefined()) return;
FunctionTemplateInfo* type = FunctionTemplateInfo::cast(receiver_type);
ASSERT(object->IsInstanceOf(type));
}
#endif
BUILTIN(FastHandleApiCall) {
ASSERT(!CalledAsConstructor());
const bool is_construct = false;
// We expect four more arguments: function, callback, call data, and holder.
const int args_length = args.length() - 4;
ASSERT(args_length >= 0);
Handle<JSFunction> function = args.at<JSFunction>(args_length);
Object* callback_obj = args[args_length + 1];
Handle<Object> data_handle = args.at<Object>(args_length + 2);
Handle<JSObject> checked_holder = args.at<JSObject>(args_length + 3);
#ifdef DEBUG
VerifyTypeCheck(checked_holder, function);
#endif
v8::Local<v8::Object> holder = v8::Utils::ToLocal(checked_holder);
v8::Local<v8::Function> callee = v8::Utils::ToLocal(function);
v8::InvocationCallback callback =
v8::ToCData<v8::InvocationCallback>(callback_obj);
v8::Local<v8::Value> data = v8::Utils::ToLocal(data_handle);
v8::Arguments new_args = v8::ImplementationUtilities::NewArguments(
data,
holder,
callee,
is_construct,
reinterpret_cast<void**>(&args[0] - 1),
args_length - 1);
HandleScope scope;
Object* result;
v8::Handle<v8::Value> value;
{
// Leaving JavaScript.
VMState state(EXTERNAL);
#ifdef ENABLE_LOGGING_AND_PROFILING
state.set_external_callback(v8::ToCData<Address>(callback_obj));
#endif
value = callback(new_args);
}
if (value.IsEmpty()) {
result = Heap::undefined_value();
} else {
result = *reinterpret_cast<Object**>(*value);
}
RETURN_IF_SCHEDULED_EXCEPTION();
return result;
}
// Helper function to handle calls to non-function objects created through the // Helper function to handle calls to non-function objects created through the
// API. The object can be called as either a constructor (using new) or just as // API. The object can be called as either a constructor (using new) or just as
// a function (without new). // a function (without new).
......
src/builtins.h
View file @ d1d56d98
...@@ -50,6 +50,7 @@ enum BuiltinExtraArguments { ...@@ -50,6 +50,7 @@ enum BuiltinExtraArguments {
V(ArrayPop, NO_EXTRA_ARGUMENTS) \ V(ArrayPop, NO_EXTRA_ARGUMENTS) \
\ \
V(HandleApiCall, NEEDS_CALLED_FUNCTION) \ V(HandleApiCall, NEEDS_CALLED_FUNCTION) \
V(FastHandleApiCall, NO_EXTRA_ARGUMENTS) \
V(HandleApiCallConstruct, NEEDS_CALLED_FUNCTION) \ V(HandleApiCallConstruct, NEEDS_CALLED_FUNCTION) \
V(HandleApiCallAsFunction, NO_EXTRA_ARGUMENTS) \ V(HandleApiCallAsFunction, NO_EXTRA_ARGUMENTS) \
V(HandleApiCallAsConstructor, NO_EXTRA_ARGUMENTS) V(HandleApiCallAsConstructor, NO_EXTRA_ARGUMENTS)
......
src/ia32/macro-assembler-ia32.cc
View file @ d1d56d98
...@@ -554,6 +554,7 @@ void MacroAssembler::PopTryHandler() { ...@@ -554,6 +554,7 @@ void MacroAssembler::PopTryHandler() {
Register MacroAssembler::CheckMaps(JSObject* object, Register object_reg, Register MacroAssembler::CheckMaps(JSObject* object, Register object_reg,
JSObject* holder, Register holder_reg, JSObject* holder, Register holder_reg,
Register scratch, Register scratch,
int save_at_depth,
Label* miss) { Label* miss) {
// Make sure there's no overlap between scratch and the other // Make sure there's no overlap between scratch and the other
// registers. // registers.
...@@ -561,7 +562,11 @@ Register MacroAssembler::CheckMaps(JSObject* object, Register object_reg, ...@@ -561,7 +562,11 @@ Register MacroAssembler::CheckMaps(JSObject* object, Register object_reg,
// Keep track of the current object in register reg. // Keep track of the current object in register reg.
Register reg = object_reg; Register reg = object_reg;
int depth = 1; int depth = 0;
if (save_at_depth == depth) {
mov(Operand(esp, kPointerSize), object_reg);
}
// Check the maps in the prototype chain. // Check the maps in the prototype chain.
// Traverse the prototype chain from the object and do map checks. // Traverse the prototype chain from the object and do map checks.
...@@ -593,7 +598,6 @@ Register MacroAssembler::CheckMaps(JSObject* object, Register object_reg, ...@@ -593,7 +598,6 @@ Register MacroAssembler::CheckMaps(JSObject* object, Register object_reg,
// to it in the code. Load it from the map. // to it in the code. Load it from the map.
reg = holder_reg; // from now the object is in holder_reg reg = holder_reg; // from now the object is in holder_reg
mov(reg, FieldOperand(scratch, Map::kPrototypeOffset)); mov(reg, FieldOperand(scratch, Map::kPrototypeOffset));
} else { } else {
// Check the map of the current object. // Check the map of the current object.
cmp(FieldOperand(reg, HeapObject::kMapOffset), cmp(FieldOperand(reg, HeapObject::kMapOffset),
...@@ -611,6 +615,10 @@ Register MacroAssembler::CheckMaps(JSObject* object, Register object_reg, ...@@ -611,6 +615,10 @@ Register MacroAssembler::CheckMaps(JSObject* object, Register object_reg,
mov(reg, Handle<JSObject>(prototype)); mov(reg, Handle<JSObject>(prototype));
} }
if (save_at_depth == depth) {
mov(Operand(esp, kPointerSize), reg);
}
// Go to the next object in the prototype chain. // Go to the next object in the prototype chain.
object = prototype; object = prototype;
} }
...@@ -621,7 +629,7 @@ Register MacroAssembler::CheckMaps(JSObject* object, Register object_reg, ...@@ -621,7 +629,7 @@ Register MacroAssembler::CheckMaps(JSObject* object, Register object_reg,
j(not_equal, miss, not_taken); j(not_equal, miss, not_taken);
// Log the check depth. // Log the check depth.
LOG(IntEvent("check-maps-depth", depth)); LOG(IntEvent("check-maps-depth", depth + 1));
// Perform security check for access to the global object and return // Perform security check for access to the global object and return
// the holder register. // the holder register.
......
src/ia32/macro-assembler-ia32.h
View file @ d1d56d98
...@@ -194,9 +194,14 @@ class MacroAssembler: public Assembler { ...@@ -194,9 +194,14 @@ class MacroAssembler: public Assembler {
// clobbered if it the same as the holder register. The function // clobbered if it the same as the holder register. The function
// returns a register containing the holder - either object_reg or // returns a register containing the holder - either object_reg or
// holder_reg. // holder_reg.
// The function can optionally (when save_at_depth !=
// kInvalidProtoDepth) save the object at the given depth by moving
// it to [esp + kPointerSize].
Register CheckMaps(JSObject* object, Register object_reg, Register CheckMaps(JSObject* object, Register object_reg,
JSObject* holder, Register holder_reg, JSObject* holder, Register holder_reg,
Register scratch, Label* miss); Register scratch,
int save_at_depth,
Label* miss);
// Generate code for checking access rights - used for security checks // Generate code for checking access rights - used for security checks
// on access to global objects across environments. The holder register // on access to global objects across environments. The holder register
......
src/ia32/stub-cache-ia32.cc
View file @ d1d56d98
This diff is collapsed.
src/macro-assembler.h
View file @ d1d56d98
...@@ -61,6 +61,8 @@ enum AllocationFlags { ...@@ -61,6 +61,8 @@ enum AllocationFlags {
RESULT_CONTAINS_TOP = 1 << 1 RESULT_CONTAINS_TOP = 1 << 1
}; };
// Invalid depth in prototype chain.
const int kInvalidProtoDepth = -1;
#if V8_TARGET_ARCH_IA32 #if V8_TARGET_ARCH_IA32
#include "assembler.h" #include "assembler.h"
......
src/stub-cache.h
View file @ d1d56d98
...@@ -381,12 +381,25 @@ class StubCompiler BASE_EMBEDDED { ...@@ -381,12 +381,25 @@ class StubCompiler BASE_EMBEDDED {
// Check the integrity of the prototype chain to make sure that the // Check the integrity of the prototype chain to make sure that the
// current IC is still valid. // current IC is still valid.
Register CheckPrototypes(JSObject* object,
Register object_reg,
JSObject* holder,
Register holder_reg,
Register scratch,
String* name,
Label* miss) {
return CheckPrototypes(object, object_reg, holder, holder_reg, scratch,
name, kInvalidProtoDepth, miss);
}
Register CheckPrototypes(JSObject* object, Register CheckPrototypes(JSObject* object,
Register object_reg, Register object_reg,
JSObject* holder, JSObject* holder,
Register holder_reg, Register holder_reg,
Register scratch, Register scratch,
String* name, String* name,
int save_at_depth,
Label* miss); Label* miss);
protected: protected:
......
src/top.cc
View file @ d1d56d98
...@@ -949,10 +949,15 @@ Handle<Context> Top::GetCallingGlobalContext() { ...@@ -949,10 +949,15 @@ Handle<Context> Top::GetCallingGlobalContext() {
} }
bool Top::CanHaveSpecialFunctions(JSObject* object) {
return object->IsJSArray();
}
Object* Top::LookupSpecialFunction(JSObject* receiver, Object* Top::LookupSpecialFunction(JSObject* receiver,
JSObject* prototype, JSObject* prototype,
JSFunction* function) { JSFunction* function) {
if (receiver->IsJSArray()) { if (CanHaveSpecialFunctions(receiver)) {
FixedArray* table = context()->global_context()->special_function_table(); FixedArray* table = context()->global_context()->special_function_table();
for (int index = 0; index < table->length(); index +=3) { for (int index = 0; index < table->length(); index +=3) {
if ((prototype == table->get(index)) && if ((prototype == table->get(index)) &&
......
src/top.h
View file @ d1d56d98
...@@ -342,6 +342,7 @@ class Top { ...@@ -342,6 +342,7 @@ class Top {
return Handle<JSBuiltinsObject>(thread_local_.context_->builtins()); return Handle<JSBuiltinsObject>(thread_local_.context_->builtins());
} }
static bool CanHaveSpecialFunctions(JSObject* object);
static Object* LookupSpecialFunction(JSObject* receiver, static Object* LookupSpecialFunction(JSObject* receiver,
JSObject* prototype, JSObject* prototype,
JSFunction* value); JSFunction* value);
......
src/v8-counters.h
View file @ d1d56d98
...@@ -100,69 +100,73 @@ namespace internal { ...@@ -100,69 +100,73 @@ namespace internal {
SC(total_full_codegen_source_size, V8.TotalFullCodegenSourceSize) SC(total_full_codegen_source_size, V8.TotalFullCodegenSourceSize)
#define STATS_COUNTER_LIST_2(SC) \ #define STATS_COUNTER_LIST_2(SC) \
/* Number of code stubs. */ \ /* Number of code stubs. */ \
SC(code_stubs, V8.CodeStubs) \ SC(code_stubs, V8.CodeStubs) \
/* Amount of stub code. */ \ /* Amount of stub code. */ \
SC(total_stubs_code_size, V8.TotalStubsCodeSize) \ SC(total_stubs_code_size, V8.TotalStubsCodeSize) \
/* Amount of (JS) compiled code. */ \ /* Amount of (JS) compiled code. */ \
SC(total_compiled_code_size, V8.TotalCompiledCodeSize) \ SC(total_compiled_code_size, V8.TotalCompiledCodeSize) \
SC(gc_compactor_caused_by_request, V8.GCCompactorCausedByRequest) \ SC(gc_compactor_caused_by_request, V8.GCCompactorCausedByRequest) \
SC(gc_compactor_caused_by_promoted_data, \ SC(gc_compactor_caused_by_promoted_data, \
V8.GCCompactorCausedByPromotedData) \ V8.GCCompactorCausedByPromotedData) \
SC(gc_compactor_caused_by_oldspace_exhaustion, \ SC(gc_compactor_caused_by_oldspace_exhaustion, \
V8.GCCompactorCausedByOldspaceExhaustion) \ V8.GCCompactorCausedByOldspaceExhaustion) \
SC(gc_compactor_caused_by_weak_handles, \ SC(gc_compactor_caused_by_weak_handles, \
V8.GCCompactorCausedByWeakHandles) \ V8.GCCompactorCausedByWeakHandles) \
SC(gc_last_resort_from_js, V8.GCLastResortFromJS) \ SC(gc_last_resort_from_js, V8.GCLastResortFromJS) \
SC(gc_last_resort_from_handles, V8.GCLastResortFromHandles) \ SC(gc_last_resort_from_handles, V8.GCLastResortFromHandles) \
/* How is the generic keyed-load stub used? */ \ /* How is the generic keyed-load stub used? */ \
SC(keyed_load_generic_smi, V8.KeyedLoadGenericSmi) \ SC(keyed_load_generic_smi, V8.KeyedLoadGenericSmi) \
SC(keyed_load_generic_symbol, V8.KeyedLoadGenericSymbol) \ SC(keyed_load_generic_symbol, V8.KeyedLoadGenericSymbol) \
SC(keyed_load_generic_slow, V8.KeyedLoadGenericSlow) \ SC(keyed_load_generic_slow, V8.KeyedLoadGenericSlow) \
SC(keyed_load_external_array_slow, V8.KeyedLoadExternalArraySlow) \ SC(keyed_load_external_array_slow, V8.KeyedLoadExternalArraySlow) \
/* Count how much the monomorphic keyed-load stubs are hit. */ \ /* Count how much the monomorphic keyed-load stubs are hit. */ \
SC(keyed_load_function_prototype, V8.KeyedLoadFunctionPrototype) \ SC(keyed_load_function_prototype, V8.KeyedLoadFunctionPrototype) \
SC(keyed_load_string_length, V8.KeyedLoadStringLength) \ SC(keyed_load_string_length, V8.KeyedLoadStringLength) \
SC(keyed_load_array_length, V8.KeyedLoadArrayLength) \ SC(keyed_load_array_length, V8.KeyedLoadArrayLength) \
SC(keyed_load_constant_function, V8.KeyedLoadConstantFunction) \ SC(keyed_load_constant_function, V8.KeyedLoadConstantFunction) \
SC(keyed_load_field, V8.KeyedLoadField) \ SC(keyed_load_field, V8.KeyedLoadField) \
SC(keyed_load_callback, V8.KeyedLoadCallback) \ SC(keyed_load_callback, V8.KeyedLoadCallback) \
SC(keyed_load_interceptor, V8.KeyedLoadInterceptor) \ SC(keyed_load_interceptor, V8.KeyedLoadInterceptor) \
SC(keyed_load_inline, V8.KeyedLoadInline) \ SC(keyed_load_inline, V8.KeyedLoadInline) \
SC(keyed_load_inline_miss, V8.KeyedLoadInlineMiss) \ SC(keyed_load_inline_miss, V8.KeyedLoadInlineMiss) \
SC(named_load_inline, V8.NamedLoadInline) \ SC(named_load_inline, V8.NamedLoadInline) \
SC(named_load_inline_miss, V8.NamedLoadInlineMiss) \ SC(named_load_inline_miss, V8.NamedLoadInlineMiss) \
SC(named_load_global_inline, V8.NamedLoadGlobalInline) \ SC(named_load_global_inline, V8.NamedLoadGlobalInline) \
SC(named_load_global_inline_miss, V8.NamedLoadGlobalInlineMiss) \ SC(named_load_global_inline_miss, V8.NamedLoadGlobalInlineMiss) \
SC(keyed_store_field, V8.KeyedStoreField) \ SC(keyed_store_field, V8.KeyedStoreField) \
SC(keyed_store_inline, V8.KeyedStoreInline) \ SC(keyed_store_inline, V8.KeyedStoreInline) \
SC(keyed_store_inline_miss, V8.KeyedStoreInlineMiss) \ SC(keyed_store_inline_miss, V8.KeyedStoreInlineMiss) \
SC(named_store_global_inline, V8.NamedStoreGlobalInline) \ SC(named_store_global_inline, V8.NamedStoreGlobalInline) \
SC(named_store_global_inline_miss, V8.NamedStoreGlobalInlineMiss) \ SC(named_store_global_inline_miss, V8.NamedStoreGlobalInlineMiss) \
SC(call_global_inline, V8.CallGlobalInline) \ SC(call_const, V8.CallConst) \
SC(call_global_inline_miss, V8.CallGlobalInlineMiss) \ SC(call_const_fast_api, V8.CallConstFastApi) \
SC(constructed_objects, V8.ConstructedObjects) \ SC(call_const_interceptor, V8.CallConstInterceptor) \
SC(constructed_objects_runtime, V8.ConstructedObjectsRuntime) \ SC(call_const_interceptor_fast_api, V8.CallConstInterceptorFastApi) \
SC(constructed_objects_stub, V8.ConstructedObjectsStub) \ SC(call_global_inline, V8.CallGlobalInline) \
SC(array_function_runtime, V8.ArrayFunctionRuntime) \ SC(call_global_inline_miss, V8.CallGlobalInlineMiss) \
SC(array_function_native, V8.ArrayFunctionNative) \ SC(constructed_objects, V8.ConstructedObjects) \
SC(for_in, V8.ForIn) \ SC(constructed_objects_runtime, V8.ConstructedObjectsRuntime) \
SC(enum_cache_hits, V8.EnumCacheHits) \ SC(constructed_objects_stub, V8.ConstructedObjectsStub) \
SC(enum_cache_misses, V8.EnumCacheMisses) \ SC(array_function_runtime, V8.ArrayFunctionRuntime) \
SC(reloc_info_count, V8.RelocInfoCount) \ SC(array_function_native, V8.ArrayFunctionNative) \
SC(reloc_info_size, V8.RelocInfoSize) \ SC(for_in, V8.ForIn) \
SC(zone_segment_bytes, V8.ZoneSegmentBytes) \ SC(enum_cache_hits, V8.EnumCacheHits) \
SC(compute_entry_frame, V8.ComputeEntryFrame) \ SC(enum_cache_misses, V8.EnumCacheMisses) \
SC(generic_binary_stub_calls, V8.GenericBinaryStubCalls) \ SC(reloc_info_count, V8.RelocInfoCount) \
SC(generic_binary_stub_calls_regs, V8.GenericBinaryStubCallsRegs) \ SC(reloc_info_size, V8.RelocInfoSize) \
SC(string_add_runtime, V8.StringAddRuntime) \ SC(zone_segment_bytes, V8.ZoneSegmentBytes) \
SC(string_add_native, V8.StringAddNative) \ SC(compute_entry_frame, V8.ComputeEntryFrame) \
SC(sub_string_runtime, V8.SubStringRuntime) \ SC(generic_binary_stub_calls, V8.GenericBinaryStubCalls) \
SC(sub_string_native, V8.SubStringNative) \ SC(generic_binary_stub_calls_regs, V8.GenericBinaryStubCallsRegs) \
SC(string_compare_native, V8.StringCompareNative) \ SC(string_add_runtime, V8.StringAddRuntime) \
SC(string_compare_runtime, V8.StringCompareRuntime) \ SC(string_add_native, V8.StringAddNative) \
SC(regexp_entry_runtime, V8.RegExpEntryRuntime) \ SC(sub_string_runtime, V8.SubStringRuntime) \
SC(sub_string_native, V8.SubStringNative) \
SC(string_compare_native, V8.StringCompareNative) \
SC(string_compare_runtime, V8.StringCompareRuntime) \
SC(regexp_entry_runtime, V8.RegExpEntryRuntime) \
SC(regexp_entry_native, V8.RegExpEntryNative) SC(regexp_entry_native, V8.RegExpEntryNative)
// This file contains all the v8 counters that are in use. // This file contains all the v8 counters that are in use.
......
src/x64/stub-cache-x64.cc
View file @ d1d56d98
...@@ -1669,7 +1669,11 @@ Register StubCompiler::CheckPrototypes(JSObject* object, ...@@ -1669,7 +1669,11 @@ Register StubCompiler::CheckPrototypes(JSObject* object,
Register holder_reg, Register holder_reg,
Register scratch, Register scratch,
String* name, String* name,
int save_at_depth,
Label* miss) { Label* miss) {
// TODO(602): support object saving.
ASSERT(save_at_depth == kInvalidProtoDepth);
// Check that the maps haven't changed. // Check that the maps haven't changed.
Register result = Register result =
__ CheckMaps(object, object_reg, holder, holder_reg, scratch, miss); __ CheckMaps(object, object_reg, holder, holder_reg, scratch, miss);
......
test/cctest/test-api.cc
View file @ d1d56d98
This diff is collapsed.
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