Skip to content

V
V8
Commit b8b50400 authored by fschneider@chromium.org's avatar fschneider@chromium.org
Browse files
Options

Inline builtin Math functions functions in more cases. 

Until now we only could inline as specialized HIR instructions when called
as a method (e.g. Math.abs)

It is very common practice to abbreviate calls to those functions by defining
a global or local variable like:

var a = Math.abs;
var x = a(123);

This change allows inlining them when called as a function (global or local).
Review URL: https://chromiumcodereview.appspot.com/9365013

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@10640 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 8e1399c7
Show whitespace changes
Inline Side-by-side
Showing with 387 additions and 10 deletions
src/hydrogen.cc
View file @ b8b50400
...@@ -5058,7 +5058,38 @@ bool HGraphBuilder::TryInline(Call* expr, bool drop_extra) { ...@@ -5058,7 +5058,38 @@ bool HGraphBuilder::TryInline(Call* expr, bool drop_extra) {
} }
bool HGraphBuilder::TryInlineBuiltinFunction(Call* expr, bool HGraphBuilder::TryInlineBuiltinFunctionCall(Call* expr, bool drop_extra) {
if (!expr->target()->shared()->HasBuiltinFunctionId()) return false;
BuiltinFunctionId id = expr->target()->shared()->builtin_function_id();
switch (id) {
case kMathRound:
case kMathFloor:
case kMathAbs:
case kMathSqrt:
case kMathLog:
case kMathSin:
case kMathCos:
if (expr->arguments()->length() == 1) {
HValue* argument = Pop();
HValue* context = environment()->LookupContext();
Drop(1); // Receiver.
HUnaryMathOperation* op =
new(zone()) HUnaryMathOperation(context, argument, id);
op->set_position(expr->position());
if (drop_extra) Drop(1); // Optionally drop the function.
ast_context()->ReturnInstruction(op, expr->id());
return true;
}
break;
default:
// Not supported for inlining yet.
break;
}
return false;
}
bool HGraphBuilder::TryInlineBuiltinMethodCall(Call* expr,
HValue* receiver, HValue* receiver,
Handle<Map> receiver_map, Handle<Map> receiver_map,
CheckType check_type) { CheckType check_type) {
...@@ -5155,7 +5186,7 @@ bool HGraphBuilder::TryInlineBuiltinFunction(Call* expr, ...@@ -5155,7 +5186,7 @@ bool HGraphBuilder::TryInlineBuiltinFunction(Call* expr,
case kMathRandom: case kMathRandom:
if (argument_count == 1 && check_type == RECEIVER_MAP_CHECK) { if (argument_count == 1 && check_type == RECEIVER_MAP_CHECK) {
AddCheckConstantFunction(expr, receiver, receiver_map, true); AddCheckConstantFunction(expr, receiver, receiver_map, true);
Drop(1); Drop(1); // Receiver.
HValue* context = environment()->LookupContext(); HValue* context = environment()->LookupContext();
HGlobalObject* global_object = new(zone()) HGlobalObject(context); HGlobalObject* global_object = new(zone()) HGlobalObject(context);
AddInstruction(global_object); AddInstruction(global_object);
...@@ -5323,10 +5354,15 @@ void HGraphBuilder::VisitCall(Call* expr) { ...@@ -5323,10 +5354,15 @@ void HGraphBuilder::VisitCall(Call* expr) {
Handle<Map> receiver_map = (types == NULL || types->is_empty()) Handle<Map> receiver_map = (types == NULL || types->is_empty())
? Handle<Map>::null() ? Handle<Map>::null()
: types->first(); : types->first();
if (TryInlineBuiltinFunction(expr, if (TryInlineBuiltinMethodCall(expr,
receiver, receiver,
receiver_map, receiver_map,
expr->check_type())) { expr->check_type())) {
if (FLAG_trace_inlining) {
PrintF("Inlining builtin ");
expr->target()->ShortPrint();
PrintF("\n");
}
return; return;
} }
...@@ -5397,6 +5433,14 @@ void HGraphBuilder::VisitCall(Call* expr) { ...@@ -5397,6 +5433,14 @@ void HGraphBuilder::VisitCall(Call* expr) {
IsGlobalObject()); IsGlobalObject());
environment()->SetExpressionStackAt(receiver_index, global_receiver); environment()->SetExpressionStackAt(receiver_index, global_receiver);
if (TryInlineBuiltinFunctionCall(expr, false)) { // Nothing to drop.
if (FLAG_trace_inlining) {
PrintF("Inlining builtin ");
expr->target()->ShortPrint();
PrintF("\n");
}
return;
}
if (TryInline(expr)) return; if (TryInline(expr)) return;
call = PreProcessCall(new(zone()) HCallKnownGlobal(expr->target(), call = PreProcessCall(new(zone()) HCallKnownGlobal(expr->target(),
argument_count)); argument_count));
...@@ -5423,6 +5467,16 @@ void HGraphBuilder::VisitCall(Call* expr) { ...@@ -5423,6 +5467,16 @@ void HGraphBuilder::VisitCall(Call* expr) {
PushAndAdd(receiver); PushAndAdd(receiver);
CHECK_ALIVE(VisitExpressions(expr->arguments())); CHECK_ALIVE(VisitExpressions(expr->arguments()));
AddInstruction(new(zone()) HCheckFunction(function, expr->target())); AddInstruction(new(zone()) HCheckFunction(function, expr->target()));
if (TryInlineBuiltinFunctionCall(expr, true)) { // Drop the function.
if (FLAG_trace_inlining) {
PrintF("Inlining builtin ");
expr->target()->ShortPrint();
PrintF("\n");
}
return;
}
if (TryInline(expr, true)) { // Drop function from environment. if (TryInline(expr, true)) { // Drop function from environment.
return; return;
} else { } else {
......
src/hydrogen.h
View file @ b8b50400
...@@ -918,10 +918,11 @@ class HGraphBuilder: public AstVisitor { ...@@ -918,10 +918,11 @@ class HGraphBuilder: public AstVisitor {
bool TryCallApply(Call* expr); bool TryCallApply(Call* expr);
bool TryInline(Call* expr, bool drop_extra = false); bool TryInline(Call* expr, bool drop_extra = false);
bool TryInlineBuiltinFunction(Call* expr, bool TryInlineBuiltinMethodCall(Call* expr,
HValue* receiver, HValue* receiver,
Handle<Map> receiver_map, Handle<Map> receiver_map,
CheckType check_type); CheckType check_type);
bool TryInlineBuiltinFunctionCall(Call* expr, bool drop_extra);
// If --trace-inlining, print a line of the inlining trace. Inlining // If --trace-inlining, print a line of the inlining trace. Inlining
// succeeded if the reason string is NULL and failed if there is a // succeeded if the reason string is NULL and failed if there is a
......
test/mjsunit/compiler/math-floor-global.js 0 → 100644
View file @ b8b50400
// Copyright 2012 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following
// disclaimer in the documentation and/or other materials provided
// with the distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived
// from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Flags: --max-new-space-size=256 --allow-natives-syntax
// Test inlining of Math.floor when assigned to a global.
var flo = Math.floor;
var test_id = 0;
function testFloor(expect, input) {
var test = new Function('n',
'"' + (test_id++) + '";return flo(n)');
assertEquals(expect, test(input));
assertEquals(expect, test(input));
assertEquals(expect, test(input));
%OptimizeFunctionOnNextCall(test);
assertEquals(expect, test(input));
}
function zero() {
var x = 0.5;
return (function() { return x - 0.5; })();
}
function test() {
testFloor(0, 0);
testFloor(0, zero());
testFloor(-0, -0);
testFloor(Infinity, Infinity);
testFloor(-Infinity, -Infinity);
testFloor(NaN, NaN);
// Ensure that a negative zero coming from Math.floor is properly handled
// by other operations.
function ifloor(x) {
return 1 / Math.floor(x);
}
assertEquals(-Infinity, ifloor(-0));
assertEquals(-Infinity, ifloor(-0));
assertEquals(-Infinity, ifloor(-0));
%OptimizeFunctionOnNextCall(ifloor);
assertEquals(-Infinity, ifloor(-0));
testFloor(0, 0.1);
testFloor(0, 0.49999999999999994);
testFloor(0, 0.5);
testFloor(0, 0.7);
testFloor(-1, -0.1);
testFloor(-1, -0.49999999999999994);
testFloor(-1, -0.5);
testFloor(-1, -0.7);
testFloor(1, 1);
testFloor(1, 1.1);
testFloor(1, 1.5);
testFloor(1, 1.7);
testFloor(-1, -1);
testFloor(-2, -1.1);
testFloor(-2, -1.5);
testFloor(-2, -1.7);
testFloor(0, Number.MIN_VALUE);
testFloor(-1, -Number.MIN_VALUE);
testFloor(Number.MAX_VALUE, Number.MAX_VALUE);
testFloor(-Number.MAX_VALUE, -Number.MAX_VALUE);
testFloor(Infinity, Infinity);
testFloor(-Infinity, -Infinity);
// 2^30 is a smi boundary.
var two_30 = 1 << 30;
testFloor(two_30, two_30);
testFloor(two_30, two_30 + 0.1);
testFloor(two_30, two_30 + 0.5);
testFloor(two_30, two_30 + 0.7);
testFloor(two_30 - 1, two_30 - 1);
testFloor(two_30 - 1, two_30 - 1 + 0.1);
testFloor(two_30 - 1, two_30 - 1 + 0.5);
testFloor(two_30 - 1, two_30 - 1 + 0.7);
testFloor(-two_30, -two_30);
testFloor(-two_30, -two_30 + 0.1);
testFloor(-two_30, -two_30 + 0.5);
testFloor(-two_30, -two_30 + 0.7);
testFloor(-two_30 + 1, -two_30 + 1);
testFloor(-two_30 + 1, -two_30 + 1 + 0.1);
testFloor(-two_30 + 1, -two_30 + 1 + 0.5);
testFloor(-two_30 + 1, -two_30 + 1 + 0.7);
// 2^52 is a precision boundary.
var two_52 = (1 << 30) * (1 << 22);
testFloor(two_52, two_52);
testFloor(two_52, two_52 + 0.1);
assertEquals(two_52, two_52 + 0.5);
testFloor(two_52, two_52 + 0.5);
assertEquals(two_52 + 1, two_52 + 0.7);
testFloor(two_52 + 1, two_52 + 0.7);
testFloor(two_52 - 1, two_52 - 1);
testFloor(two_52 - 1, two_52 - 1 + 0.1);
testFloor(two_52 - 1, two_52 - 1 + 0.5);
testFloor(two_52 - 1, two_52 - 1 + 0.7);
testFloor(-two_52, -two_52);
testFloor(-two_52, -two_52 + 0.1);
testFloor(-two_52, -two_52 + 0.5);
testFloor(-two_52, -two_52 + 0.7);
testFloor(-two_52 + 1, -two_52 + 1);
testFloor(-two_52 + 1, -two_52 + 1 + 0.1);
testFloor(-two_52 + 1, -two_52 + 1 + 0.5);
testFloor(-two_52 + 1, -two_52 + 1 + 0.7);
}
// Test in a loop to cover the custom IC and GC-related issues.
for (var i = 0; i < 50; i++) {
test();
}
// Regression test for a bug where a negative zero coming from Math.floor
// was not properly handled by other operations.
function floorsum(i, n) {
var ret = Math.floor(n);
while (--i > 0) {
ret += Math.floor(n);
}
return ret;
}
assertEquals(-0, floorsum(1, -0));
%OptimizeFunctionOnNextCall(floorsum);
// The optimized function will deopt. Run it with enough iterations to try
// to optimize via OSR (triggering the bug).
assertEquals(-0, floorsum(100000, -0));
test/mjsunit/compiler/math-floor-local.js 0 → 100644
View file @ b8b50400
// Copyright 2012 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following
// disclaimer in the documentation and/or other materials provided
// with the distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived
// from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Flags: --max-new-space-size=256 --allow-natives-syntax
// Test inlining of Math.floor when assigned to a local.
var test_id = 0;
function testFloor(expect, input) {
var test = new Function('n',
'"' + (test_id++) +
'";var f = Math.floor; return f(n)');
assertEquals(expect, test(input));
assertEquals(expect, test(input));
assertEquals(expect, test(input));
%OptimizeFunctionOnNextCall(test);
assertEquals(expect, test(input));
}
function zero() {
var x = 0.5;
return (function() { return x - 0.5; })();
}
function test() {
testFloor(0, 0);
testFloor(0, zero());
testFloor(-0, -0);
testFloor(Infinity, Infinity);
testFloor(-Infinity, -Infinity);
testFloor(NaN, NaN);
// Ensure that a negative zero coming from Math.floor is properly handled
// by other operations.
function ifloor(x) {
return 1 / Math.floor(x);
}
assertEquals(-Infinity, ifloor(-0));
assertEquals(-Infinity, ifloor(-0));
assertEquals(-Infinity, ifloor(-0));
%OptimizeFunctionOnNextCall(ifloor);
assertEquals(-Infinity, ifloor(-0));
testFloor(0, 0.1);
testFloor(0, 0.49999999999999994);
testFloor(0, 0.5);
testFloor(0, 0.7);
testFloor(-1, -0.1);
testFloor(-1, -0.49999999999999994);
testFloor(-1, -0.5);
testFloor(-1, -0.7);
testFloor(1, 1);
testFloor(1, 1.1);
testFloor(1, 1.5);
testFloor(1, 1.7);
testFloor(-1, -1);
testFloor(-2, -1.1);
testFloor(-2, -1.5);
testFloor(-2, -1.7);
testFloor(0, Number.MIN_VALUE);
testFloor(-1, -Number.MIN_VALUE);
testFloor(Number.MAX_VALUE, Number.MAX_VALUE);
testFloor(-Number.MAX_VALUE, -Number.MAX_VALUE);
testFloor(Infinity, Infinity);
testFloor(-Infinity, -Infinity);
// 2^30 is a smi boundary.
var two_30 = 1 << 30;
testFloor(two_30, two_30);
testFloor(two_30, two_30 + 0.1);
testFloor(two_30, two_30 + 0.5);
testFloor(two_30, two_30 + 0.7);
testFloor(two_30 - 1, two_30 - 1);
testFloor(two_30 - 1, two_30 - 1 + 0.1);
testFloor(two_30 - 1, two_30 - 1 + 0.5);
testFloor(two_30 - 1, two_30 - 1 + 0.7);
testFloor(-two_30, -two_30);
testFloor(-two_30, -two_30 + 0.1);
testFloor(-two_30, -two_30 + 0.5);
testFloor(-two_30, -two_30 + 0.7);
testFloor(-two_30 + 1, -two_30 + 1);
testFloor(-two_30 + 1, -two_30 + 1 + 0.1);
testFloor(-two_30 + 1, -two_30 + 1 + 0.5);
testFloor(-two_30 + 1, -two_30 + 1 + 0.7);
// 2^52 is a precision boundary.
var two_52 = (1 << 30) * (1 << 22);
testFloor(two_52, two_52);
testFloor(two_52, two_52 + 0.1);
assertEquals(two_52, two_52 + 0.5);
testFloor(two_52, two_52 + 0.5);
assertEquals(two_52 + 1, two_52 + 0.7);
testFloor(two_52 + 1, two_52 + 0.7);
testFloor(two_52 - 1, two_52 - 1);
testFloor(two_52 - 1, two_52 - 1 + 0.1);
testFloor(two_52 - 1, two_52 - 1 + 0.5);
testFloor(two_52 - 1, two_52 - 1 + 0.7);
testFloor(-two_52, -two_52);
testFloor(-two_52, -two_52 + 0.1);
testFloor(-two_52, -two_52 + 0.5);
testFloor(-two_52, -two_52 + 0.7);
testFloor(-two_52 + 1, -two_52 + 1);
testFloor(-two_52 + 1, -two_52 + 1 + 0.1);
testFloor(-two_52 + 1, -two_52 + 1 + 0.5);
testFloor(-two_52 + 1, -two_52 + 1 + 0.7);
}
// Test in a loop to cover the custom IC and GC-related issues.
for (var i = 0; i < 50; i++) {
test();
}
// Regression test for a bug where a negative zero coming from Math.floor
// was not properly handled by other operations.
function floorsum(i, n) {
var ret = Math.floor(n);
while (--i > 0) {
ret += Math.floor(n);
}
return ret;
}
assertEquals(-0, floorsum(1, -0));
%OptimizeFunctionOnNextCall(floorsum);
// The optimized function will deopt. Run it with enough iterations to try
// to optimize via OSR (triggering the bug).
assertEquals(-0, floorsum(100000, -0));
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