Author: [email protected]
Date: Thu Mar 19 06:01:50 2009
New Revision: 1547

Added:
    branches/bleeding_edge/test/mjsunit/big-array-literal.js
Modified:
    branches/bleeding_edge/test/mjsunit/big-object-literal.js
    branches/bleeding_edge/test/mjsunit/mjsunit.status

Log:
Speed up slow test that times out on ARM.
Review URL: http://codereview.chromium.org/50008

Added: branches/bleeding_edge/test/mjsunit/big-array-literal.js
==============================================================================
--- (empty file)
+++ branches/bleeding_edge/test/mjsunit/big-array-literal.js    Thu Mar 19  
06:01:50 2009
@@ -0,0 +1,111 @@
+// Copyright 2009 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.
+
+// Test that we can make large object literals that work.
+// Also test that we can attempt to make even larger object literals  
without
+// crashing.
+function testLiteral(size, array_in_middle) {
+  print(size);
+
+  var f;
+
+  // Build object-literal string.
+  var literal = "function f() { return ";
+
+  for (var i = 0; i < size; i++) {
+    literal += "[";
+  }
+
+  literal += array_in_middle ? " [42.2]" : "{a:42.2}";
+
+  for (var i = 0; i < size; i++) {
+    literal += "]";
+  }
+
+  literal += "; }";
+
+  // Create the object literal.
+  eval(literal);
+
+  var x = f();
+
+  // Check that the properties have the expected values.
+  for (var i = 0; i < size; i++) {
+    x = x[0];
+  }
+
+  if (array_in_middle) {
+    assertEquals(42.2, x[0]), "x array in middle";
+    x[0] = 41.2;
+  } else {
+    assertEquals(42.2, x.a, "x object in middle");
+    x.a = 41.2;
+  }
+
+  var y = f();
+  for (var i = 0; i < size; i++) {
+    y = y[0];
+  }
+
+  if (array_in_middle) {
+    assertEquals(42.2, y[0], "y array in middle");
+    y[0] = 41.2;
+  } else {
+    assertEquals(42.2, y.a, "y object in middle");
+    y.a = 41.2;
+  }
+}
+
+// The sizes to test.
+var sizes = [1, 2, 100, 200, 400];
+
+// Run the test.
+for (var i = 0; i < sizes.length; i++) {
+  testLiteral(sizes[i], false);
+  testLiteral(sizes[i], true);
+}
+
+function testLiteralAndCatch(size) {
+  var big_enough = false;
+  try {
+    testLiteral(size, false);
+  } catch (e) {
+    big_enough = true;
+  }
+  try {
+    testLiteral(size, true);
+  } catch (e) {
+    big_enough = true;
+  }
+  return big_enough;
+}
+
+// Catch stack overflows.
+
+testLiteralAndCatch(1000) ||
+testLiteralAndCatch(20000) ||
+testLiteralAndCatch(200000);

Modified: branches/bleeding_edge/test/mjsunit/big-object-literal.js
==============================================================================
--- branches/bleeding_edge/test/mjsunit/big-object-literal.js   (original)
+++ branches/bleeding_edge/test/mjsunit/big-object-literal.js   Thu Mar 19  
06:01:50 2009
@@ -28,7 +28,7 @@
  // Test that we can make large object literals that work.
  // Also test that we can attempt to make even larger object literals  
without
  // crashing.
-function testLiteral(size, arrays, array_in_middle) {
+function testLiteral(size, array_in_middle) {
    print(size);

    var f;
@@ -37,19 +37,15 @@
    var literal = "function f() { return ";

    for (var i = 0; i < size; i++) {
-    literal += arrays ? "[" : "{a:";
+    literal += "{a:";
    }

    literal += array_in_middle ? " [42.2]" : "{a:42.2}";

    for (var i = 0; i < size; i++) {
-    if (arrays) {
-      literal += "]";
-    } else {
-      literal += "}";
-      if (i < size - 1) {
-        literal += ", b:42, c:/asd/, x:'foo', y:[], z:new Object()";
-      }
+    literal += "}";
+    if (i < size - 1) {
+      literal += ", b:42, c:/asd/, x:'foo', y:[], z:new Object()";
      }
    }

@@ -62,7 +58,7 @@

    // Check that the properties have the expected values.
    for (var i = 0; i < size; i++) {
-    x = arrays ? x[0] : x.a;
+    x = x.a;
    }

    if (array_in_middle) {
@@ -75,7 +71,7 @@

    var y = f();
    for (var i = 0; i < size; i++) {
-    y = arrays ? y[0] : y.a;
+    y = y.a;
    }

    if (array_in_middle) {
@@ -92,31 +88,19 @@

  // Run the test.
  for (var i = 0; i < sizes.length; i++) {
-  testLiteral(sizes[i], false, false);
-  testLiteral(sizes[i], false, true);
-  testLiteral(sizes[i], true, false);
-  testLiteral(sizes[i], true, true);
+  testLiteral(sizes[i], false);
+  testLiteral(sizes[i], true);
  }

  function testLiteralAndCatch(size) {
    var big_enough = false;
    try {
-    testLiteral(size, false, false);
+    testLiteral(size, false);
    } catch (e) {
      big_enough = true;
    }
    try {
-    testLiteral(size, false, true);
-  } catch (e) {
-    big_enough = true;
-  }
-  try {
-    testLiteral(size, true, false);
-  } catch (e) {
-    big_enough = true;
-  }
-  try {
-    testLiteral(size, true, true);
+    testLiteral(size, true);
    } catch (e) {
      big_enough = true;
    }

Modified: branches/bleeding_edge/test/mjsunit/mjsunit.status
==============================================================================
--- branches/bleeding_edge/test/mjsunit/mjsunit.status  (original)
+++ branches/bleeding_edge/test/mjsunit/mjsunit.status  Thu Mar 19 06:01:50  
2009
@@ -34,6 +34,8 @@
  # too long to run in debug mode on ARM.
  fuzz-natives: PASS, SKIP if ($mode == release || $arch == arm)

+big-object-literal: PASS, SKIP if ($arch == arm)
+
  # Bug realiably triggers a debug assertion and crashed in release mode.
  bugs/bug-269: CRASH, FAIL if $mode == debug


--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---

Reply via email to