Revision: 19852
Author: [email protected]
Date: Wed Mar 12 14:28:59 2014 UTC
Log: Disable special handling of flooring division by constant until
it is fixed for real.
Added a test to check the various division-like operations more
exhaustively.
[email protected], [email protected]
Review URL: https://codereview.chromium.org/194863002
http://code.google.com/p/v8/source/detail?r=19852
Added:
/branches/bleeding_edge/test/mjsunit/compiler/division-by-constant.js
Modified:
/branches/bleeding_edge/src/a64/lithium-a64.cc
/branches/bleeding_edge/src/arm/lithium-arm.cc
/branches/bleeding_edge/src/ia32/lithium-ia32.cc
/branches/bleeding_edge/src/x64/lithium-x64.cc
=======================================
--- /dev/null
+++ /branches/bleeding_edge/test/mjsunit/compiler/division-by-constant.js
Wed Mar 12 14:28:59 2014 UTC
@@ -0,0 +1,131 @@
+// Copyright 2014 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: --allow-natives-syntax --no-use-inlining
+
+//
-----------------------------------------------------------------------------
+
+function ConstructDiv(divisor) {
+ return "return ((dividend | 0) / ((" + divisor + ") | 0)) | 0";
+}
+
+var RefDivByConstI =
+ new Function("dividend", "divisor", ConstructDiv("divisor"));
+
+%NeverOptimizeFunction(RefDivByConstI);
+
+//
-----------------------------------------------------------------------------
+
+function ConstructMod(divisor) {
+ return "return ((dividend | 0) % ((" + divisor + ") | 0)) | 0";
+}
+
+var RefModByConstI =
+ new Function("dividend", "divisor", ConstructMod("divisor"));
+
+%NeverOptimizeFunction(RefModByConstI);
+
+//
-----------------------------------------------------------------------------
+
+function ConstructFlooringDiv(divisor) {
+ return "return Math.floor(dividend / (" + divisor + ")) | 0";
+}
+
+var RefFlooringDivByConstI =
+ new Function("dividend", "divisor", ConstructFlooringDiv("divisor"));
+
+%NeverOptimizeFunction(RefFlooringDivByConstI);
+
+//
-----------------------------------------------------------------------------
+
+function PushSymmetric(values, x) {
+ values.push(x, -x);
+}
+
+function PushRangeSymmetric(values, from, to) {
+ for (var x = from; x <= to; x++) {
+ PushSymmetric(values, x);
+ }
+}
+
+function CreateTestValues() {
+ var values = [
+ // -(2^31)
+ -2147483648,
+ // Some values from "Hacker's Delight", chapter 10-7.
+ 715827883, 1431655766, -1431655765, -1431655764,
+ // Some "randomly" chosen numbers.
+ 123, -1234, 12345, -123456, 1234567, -12345678, 123456789
+ ];
+ // Powers of 2
+ for (var shift = 6; shift < 31; shift++) {
+ PushSymmetric(values, 1 << shift);
+ }
+ // Values near zero
+ PushRangeSymmetric(values, 1, 32);
+ // Various magnitudes
+ PushRangeSymmetric(values, 100, 109);
+ PushRangeSymmetric(values, 1000, 1009);
+ PushRangeSymmetric(values, 10000, 10009);
+ PushRangeSymmetric(values, 100000, 100009);
+ PushRangeSymmetric(values, 1000000, 1000009);
+ PushRangeSymmetric(values, 10000000, 10000009);
+ PushRangeSymmetric(values, 100000000, 100000009);
+ PushRangeSymmetric(values, 1000000000, 1000000009);
+ return values;
+}
+
+//
-----------------------------------------------------------------------------
+
+function TestDivisionLike(ref, construct, values, divisor) {
+ // Define the function to test.
+ var OptFun = new Function("dividend", construct(divisor));
+
+ // Warm up type feedback.
+ OptFun(7);
+ OptFun(11);
+ %OptimizeFunctionOnNextCall(OptFun);
+ OptFun(13);
+
+ // Check results.
+ values.forEach(function(dividend) {
+ // Avoid deopt caused by overflow, we do not want to test this here.
+ if (dividend === -2147483648 && divisor === -1) return;
+ assertEquals(ref(dividend, divisor), OptFun(dividend));
+ });
+}
+
+function Test(ref, construct) {
+ var values = CreateTestValues();
+ values.forEach(function(divisor) {
+ TestDivisionLike(ref, construct, values, divisor);
+ });
+}
+
+Test(RefDivByConstI, ConstructDiv);
+Test(RefModByConstI, ConstructMod);
+Test(RefFlooringDivByConstI, ConstructFlooringDiv);
=======================================
--- /branches/bleeding_edge/src/a64/lithium-a64.cc Wed Mar 12 09:59:36 2014
UTC
+++ /branches/bleeding_edge/src/a64/lithium-a64.cc Wed Mar 12 14:28:59 2014
UTC
@@ -1788,8 +1788,8 @@
LInstruction* LChunkBuilder::DoMathFloorOfDiv(HMathFloorOfDiv* instr) {
if (instr->RightIsPowerOf2()) {
return DoFlooringDivByPowerOf2I(instr);
- } else if (instr->right()->IsConstant()) {
- return DoFlooringDivByConstI(instr);
+ } else if (false && instr->right()->IsConstant()) {
+ return DoFlooringDivByConstI(instr); // TODO(svenpanne) Fix and
re-enable.
} else {
return DoFlooringDivI(instr);
}
=======================================
--- /branches/bleeding_edge/src/arm/lithium-arm.cc Wed Mar 12 09:59:36 2014
UTC
+++ /branches/bleeding_edge/src/arm/lithium-arm.cc Wed Mar 12 14:28:59 2014
UTC
@@ -1344,8 +1344,8 @@
LInstruction* LChunkBuilder::DoMathFloorOfDiv(HMathFloorOfDiv* instr) {
if (instr->RightIsPowerOf2()) {
return DoFlooringDivByPowerOf2I(instr);
- } else if (instr->right()->IsConstant()) {
- return DoFlooringDivByConstI(instr);
+ } else if (false && instr->right()->IsConstant()) {
+ return DoFlooringDivByConstI(instr); // TODO(svenpanne) Fix and
re-enable.
} else {
return DoDivI(instr);
}
=======================================
--- /branches/bleeding_edge/src/ia32/lithium-ia32.cc Wed Mar 12 09:59:36
2014 UTC
+++ /branches/bleeding_edge/src/ia32/lithium-ia32.cc Wed Mar 12 14:28:59
2014 UTC
@@ -1442,8 +1442,8 @@
LInstruction* LChunkBuilder::DoMathFloorOfDiv(HMathFloorOfDiv* instr) {
if (instr->RightIsPowerOf2()) {
return DoFlooringDivByPowerOf2I(instr);
- } else if (instr->right()->IsConstant()) {
- return DoFlooringDivByConstI(instr);
+ } else if (false && instr->right()->IsConstant()) {
+ return DoFlooringDivByConstI(instr); // TODO(svenpanne) Fix and
re-enable.
} else {
return DoDivI(instr);
}
=======================================
--- /branches/bleeding_edge/src/x64/lithium-x64.cc Wed Mar 12 09:59:36 2014
UTC
+++ /branches/bleeding_edge/src/x64/lithium-x64.cc Wed Mar 12 14:28:59 2014
UTC
@@ -1363,8 +1363,8 @@
LInstruction* LChunkBuilder::DoMathFloorOfDiv(HMathFloorOfDiv* instr) {
if (instr->RightIsPowerOf2()) {
return DoFlooringDivByPowerOf2I(instr);
- } else if (instr->right()->IsConstant()) {
- return DoFlooringDivByConstI(instr);
+ } else if (false && instr->right()->IsConstant()) {
+ return DoFlooringDivByConstI(instr); // TODO(svenpanne) Fix and
re-enable.
} else {
return DoDivI(instr);
}
--
--
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.
