From 24c2336d750b7405ddb958525caa3a1deb87bb89 Mon Sep 17 00:00:00 2001 From: "olivf@chromium.org" Date: Wed, 2 Oct 2013 18:15:57 +0000 Subject: [PATCH] Inline some more compare operations. BUG= R=hpayer@chromium.org Review URL: https://codereview.chromium.org/25009003 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@17091 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/hydrogen.cc | 27 +++++++++ test/mjsunit/compare-known-objects.js | 65 ++++++++++++++++++++ test/mjsunit/compare-objects.js | 108 ++++++++++++++++++++++++++++++++++ 3 files changed, 200 insertions(+) create mode 100644 test/mjsunit/compare-known-objects.js create mode 100644 test/mjsunit/compare-objects.js diff --git a/src/hydrogen.cc b/src/hydrogen.cc index 6bb7015..0b25984 100644 --- a/src/hydrogen.cc +++ b/src/hydrogen.cc @@ -8324,6 +8324,33 @@ void HOptimizedGraphBuilder::VisitCompareOperation(CompareOperation* expr) { New(left, right); result->set_position(expr->position()); return ast_context()->ReturnControl(result, expr->id()); + } else if (combined_type->Is(Type::String())) { + BuildCheckHeapObject(left); + AddInstruction(HCheckInstanceType::NewIsString(left, zone())); + BuildCheckHeapObject(right); + AddInstruction(HCheckInstanceType::NewIsString(right, zone())); + HStringCompareAndBranch* result = + New(left, right, op); + result->set_position(expr->position()); + return ast_context()->ReturnControl(result, expr->id()); + } else if (combined_type->NumClasses() == 1 && Token::IsEqualityOp(op)) { + BuildCheckHeapObject(left); + BuildCheckMap(left, combined_type->Classes().Current()); + BuildCheckHeapObject(right); + BuildCheckMap(right, combined_type->Classes().Current()); + HCompareObjectEqAndBranch* result = + New(left, right); + result->set_position(expr->position()); + return ast_context()->ReturnInstruction(result, expr->id()); + } else if (combined_type->Is(Type::Receiver()) && Token::IsEqualityOp(op)) { + BuildCheckHeapObject(left); + AddInstruction(HCheckInstanceType::NewIsSpecObject(left, zone())); + BuildCheckHeapObject(right); + AddInstruction(HCheckInstanceType::NewIsSpecObject(right, zone())); + HCompareObjectEqAndBranch* result = + New(left, right); + result->set_position(expr->position()); + return ast_context()->ReturnInstruction(result, expr->id()); } else { if (combined_rep.IsTagged() || combined_rep.IsNone()) { HCompareGeneric* result = diff --git a/test/mjsunit/compare-known-objects.js b/test/mjsunit/compare-known-objects.js new file mode 100644 index 0000000..afffc07 --- /dev/null +++ b/test/mjsunit/compare-known-objects.js @@ -0,0 +1,65 @@ +// 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: --allow-natives-syntax + +// Test CompareIC stubs for normal and strict equality comparison of known +// objects in slow mode. These objects share the same map even though they +// might have completely different properties. + +function eq(a, b) { + return a == b; +} + +function eq_strict(a, b) { + return a === b; +} + +function test(a, b) { + // Check CompareIC for equality of known objects. + assertTrue(eq(a, a)); + assertTrue(eq(b, b)); + assertFalse(eq(a, b)); + // Check CompareIC for strict equality of known objects. + assertTrue(eq_strict(a, a)); + assertTrue(eq_strict(b, b)); + assertFalse(eq_strict(a, b)); +} + +function O(){}; +O.prototype.t = function() {} + +var obj1 = new O; +var obj2 = new O; + +// Test original objects. +assertTrue(%HaveSameMap(obj1, obj2)); +test(obj1, obj2); + +// Test after adding property to first object. +obj1.x = 1; +test(obj1, obj2); diff --git a/test/mjsunit/compare-objects.js b/test/mjsunit/compare-objects.js new file mode 100644 index 0000000..fb31203 --- /dev/null +++ b/test/mjsunit/compare-objects.js @@ -0,0 +1,108 @@ +// 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: --allow-natives-syntax + +// Test CompareIC stubs for normal and strict equality comparison of known +// objects in hydrogen. + +function lt(a, b) { + return a < b; +} + +function gt(a, b) { + return a > b; +} + +function eq(a, b) { + return a == b; +} + +function eq_strict(a, b) { + return a === b; +} + +function test(a, b, less, greater) { + // Check CompareIC for equality of known objects. + assertTrue(eq(a, a)); + assertTrue(eq(b, b)); + assertFalse(eq(a, b)); + assertTrue(eq_strict(a, a)); + assertTrue(eq_strict(b, b)); + assertFalse(eq_strict(a, b)); + assertEquals(lt(a, b), less); + assertEquals(gt(a, b), greater); + assertEquals(lt(b, a), greater); + assertEquals(gt(b, a), less); +} + +var obj1 = {toString: function() {return "1";}}; +var obj2 = {toString: function() {return "2";}}; + +var less = obj1 < obj2; +var greater = obj1 > obj2; + +test(obj1, obj2, less, greater); +test(obj1, obj2, less, greater); +test(obj1, obj2, less, greater); +%OptimizeFunctionOnNextCall(test); +test(obj1, obj2, less, greater); +test(obj1, obj2, less, greater); + +obj1.x = 1; +test(obj1, obj2, less, greater); + +obj2.y = 2; +test(obj1, obj2, less, greater); + +var obj1 = {test: 3}; +var obj2 = {test2: 3}; + +var less = obj1 < obj2; +var greater = obj1 > obj2; + +test(obj1, obj2, less, greater); +test(obj1, obj2, less, greater); +test(obj1, obj2, less, greater); +%OptimizeFunctionOnNextCall(test); +test(obj1, obj2, less, greater); +test(obj1, obj2, less, greater); + +obj1.toString = function() {return "1"}; +var less = obj1 < obj2; +var greater = obj1 > obj2; +test(obj1, obj2, less, greater); +%OptimizeFunctionOnNextCall(test); +test(obj1, obj2, less, greater); + +obj2.toString = function() {return "2"}; +var less = true; +var greater = false; + +test(obj1, obj2, less, greater); +obj2.y = 2; +test(obj1, obj2, less, greater); -- 2.7.4