Commit 66d75d41 authored by Daniel Clifford's avatar Daniel Clifford Committed by Commit Bot

[builtins] Enable inlining of polymorphic receivers in Array.prototype.forEach

In the process, also enable support for PACKED_DOUBLE_ELEMENTS arrays.

Change-Id: I16dd79276f1023e30b072d45216396533077f53c
Reviewed-on: https://chromium-review.googlesource.com/571006
Commit-Queue: Daniel Clifford <danno@chromium.org>
Reviewed-by: 's avatarBenedikt Meurer <bmeurer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48289}
parent 0f5d3ed1
...@@ -625,14 +625,27 @@ Reduction JSCallReducer::ReduceArrayForEach(Handle<JSFunction> function, ...@@ -625,14 +625,27 @@ Reduction JSCallReducer::ReduceArrayForEach(Handle<JSFunction> function,
if (result != NodeProperties::kReliableReceiverMaps) { if (result != NodeProperties::kReliableReceiverMaps) {
return NoChange(); return NoChange();
} }
if (receiver_maps.size() != 1) return NoChange(); if (receiver_maps.size() == 0) return NoChange();
Handle<Map> receiver_map(receiver_maps[0]);
ElementsKind kind = receiver_map->elements_kind(); ElementsKind kind = IsDoubleElementsKind(receiver_maps[0]->elements_kind())
// TODO(danno): Handle double packed elements ? PACKED_DOUBLE_ELEMENTS
if (!IsFastElementsKind(kind) || IsDoubleElementsKind(kind) || : PACKED_ELEMENTS;
!CanInlineArrayIteratingBuiltin(receiver_map)) { for (Handle<Map> receiver_map : receiver_maps) {
ElementsKind next_kind = receiver_map->elements_kind();
if (!CanInlineArrayIteratingBuiltin(receiver_map)) {
return NoChange();
}
if (!IsFastElementsKind(next_kind) ||
(IsDoubleElementsKind(next_kind) && IsHoleyElementsKind(next_kind))) {
return NoChange(); return NoChange();
} }
if (IsDoubleElementsKind(kind) != IsDoubleElementsKind(next_kind)) {
return NoChange();
}
if (IsHoleyElementsKind(next_kind)) {
kind = HOLEY_ELEMENTS;
}
}
// Install code dependencies on the {receiver} prototype maps and the // Install code dependencies on the {receiver} prototype maps and the
// global array protector cell. // global array protector cell.
...@@ -692,14 +705,9 @@ Reduction JSCallReducer::ReduceArrayForEach(Handle<JSFunction> function, ...@@ -692,14 +705,9 @@ Reduction JSCallReducer::ReduceArrayForEach(Handle<JSFunction> function,
graph()->NewNode(common()->Checkpoint(), frame_state, effect, control); graph()->NewNode(common()->Checkpoint(), frame_state, effect, control);
// Make sure the map hasn't changed during the iteration // Make sure the map hasn't changed during the iteration
Node* orig_map = jsgraph()->HeapConstant(receiver_map); effect = graph()->NewNode(
Node* array_map = effect = simplified()->CheckMaps(CheckMapsFlag::kNone, receiver_maps), receiver,
graph()->NewNode(simplified()->LoadField(AccessBuilder::ForMap()), effect, control);
receiver, effect, control);
Node* check_map =
graph()->NewNode(simplified()->ReferenceEqual(), array_map, orig_map);
effect =
graph()->NewNode(simplified()->CheckIf(), check_map, effect, control);
// Make sure that the access is still in bounds, since the callback could have // Make sure that the access is still in bounds, since the callback could have
// changed the array's size. // changed the array's size.
...@@ -717,7 +725,7 @@ Reduction JSCallReducer::ReduceArrayForEach(Handle<JSFunction> function, ...@@ -717,7 +725,7 @@ Reduction JSCallReducer::ReduceArrayForEach(Handle<JSFunction> function,
effect, control); effect, control);
Node* element = graph()->NewNode( Node* element = graph()->NewNode(
simplified()->LoadElement(AccessBuilder::ForFixedArrayElement()), simplified()->LoadElement(AccessBuilder::ForFixedArrayElement(kind)),
elements, k, effect, control); elements, k, effect, control);
Node* next_k = Node* next_k =
......
// Copyright 2017 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Flags: --allow-natives-syntax --expose-gc --turbo-inline-array-builtins
var a = [0, 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,0,0];
var b = [{}, {}];
var c = [,,,,,2,3,4];
var d = [0.5,3,4];
var e = [,,,,0.5,3,4];
// Make sure that calls to forEach handle a certain degree of polymorphism (no
// hole check)
(function() {
var result = 0;
var polymorph1 = function(arg) {
var sum = function(v,i,o) {
result += i;
}
arg.forEach(sum);
}
polymorph1(a);
polymorph1(a);
polymorph1(b);
polymorph1(a);
polymorph1(a);
%OptimizeFunctionOnNextCall(polymorph1);
polymorph1(a);
polymorph1(b);
assertEquals(1757, result);
})();
// Make sure that calls to forEach handle a certain degree of polymorphism.
(function() {
var result = 0;
var polymorph1 = function(arg) {
var sum = function(v,i,o) {
result += i;
}
arg.forEach(sum);
}
polymorph1(a);
polymorph1(a);
polymorph1(b);
polymorph1(a);
polymorph1(c);
polymorph1(a);
%OptimizeFunctionOnNextCall(polymorph1);
polymorph1(a);
polymorph1(b);
assertEquals(1775, result);
})();
// Make sure that calls to forEach with mixed object/double arrays don't inline
// forEach.
(function() {
var result = 0;
var polymorph1 = function(arg) {
var sum = function(v,i,o) {
result += i;
}
arg.forEach(sum);
}
polymorph1(a);
polymorph1(a);
polymorph1(b);
polymorph1(a);
polymorph1(d);
polymorph1(a);
%OptimizeFunctionOnNextCall(polymorph1);
polymorph1(a);
polymorph1(b);
assertEquals(1760, result);
})();
// Make sure that calls to forEach with double arrays get the right result
(function() {
var result = 0;
var polymorph1 = function(arg) {
var sum = function(v,i,o) {
result += v;
}
arg.forEach(sum);
}
polymorph1(d);
polymorph1(d);
polymorph1(d);
%OptimizeFunctionOnNextCall(polymorph1);
polymorph1(d);
polymorph1(d);
assertEquals(37.5, result);
})();
// Make sure that calls to forEach with mixed double arrays get the right result
(function() {
var result = 0;
var polymorph1 = function(arg) {
var sum = function(v,i,o) {
result += v;
}
arg.forEach(sum);
}
polymorph1(d);
polymorph1(e);
polymorph1(d);
%OptimizeFunctionOnNextCall(polymorph1);
polymorph1(d);
polymorph1(e);
assertEquals(37.5, result);
})();
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