From dde49c9dc3a9418866fe081387fc9749bac1b006 Mon Sep 17 00:00:00 2001 From: "hpayer@chromium.org" Date: Mon, 5 May 2014 16:48:33 +0000 Subject: [PATCH] Set max new space size in tests to proper MB value. Revert "Limit old space size in test which require a large new space." This reverts commit r21103. Revert "Remove max space limits in tests." This reverts commit r21104. BUG= R=jkummerow@chromium.org Review URL: https://codereview.chromium.org/263103006 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@21149 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- test/cctest/test-api.cc | 2 +- test/cctest/test-heap.cc | 20 ++++++++++---------- test/cctest/test-strings.cc | 2 +- test/mjsunit/binary-op-newspace.js | 2 +- test/mjsunit/compiler/math-floor-global.js | 2 +- test/mjsunit/compiler/math-floor-local.js | 2 +- test/mjsunit/define-property-gc.js | 1 + test/mjsunit/math-abs.js | 2 +- test/mjsunit/math-floor-part1.js | 2 +- test/mjsunit/math-floor-part2.js | 2 +- test/mjsunit/math-floor-part3.js | 2 +- test/mjsunit/math-floor-part4.js | 2 +- test/mjsunit/regress/regress-1708.js | 2 +- test/mjsunit/regress/regress-99167.js | 2 +- test/mjsunit/regress/regress-create-exception.js | 1 + 15 files changed, 24 insertions(+), 22 deletions(-) diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc index 14912b7..4dad1ee 100644 --- a/test/cctest/test-api.cc +++ b/test/cctest/test-api.cc @@ -19517,7 +19517,7 @@ class InitDefaultIsolateThread : public v8::internal::Thread { case SetResourceConstraints: { static const int K = 1024; v8::ResourceConstraints constraints; - constraints.set_max_new_space_size(256 * K); + constraints.set_max_new_space_size(2 * K * K); constraints.set_max_old_space_size(4 * K * K); v8::SetResourceConstraints(CcTest::isolate(), &constraints); break; diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc index e91a080..913d80a 100644 --- a/test/cctest/test-heap.cc +++ b/test/cctest/test-heap.cc @@ -2208,7 +2208,7 @@ TEST(OptimizedAllocationAlwaysInNewSpace) { TEST(OptimizedPretenuringAllocationFolding) { i::FLAG_allow_natives_syntax = true; - i::FLAG_max_new_space_size = 2048; + i::FLAG_max_new_space_size = 2; i::FLAG_allocation_site_pretenuring = false; CcTest::InitializeVM(); if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return; @@ -2251,7 +2251,7 @@ TEST(OptimizedPretenuringAllocationFolding) { TEST(OptimizedPretenuringAllocationFoldingBlocks) { i::FLAG_allow_natives_syntax = true; - i::FLAG_max_new_space_size = 2048; + i::FLAG_max_new_space_size = 2; i::FLAG_allocation_site_pretenuring = false; CcTest::InitializeVM(); if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return; @@ -2294,7 +2294,7 @@ TEST(OptimizedPretenuringAllocationFoldingBlocks) { TEST(OptimizedPretenuringObjectArrayLiterals) { i::FLAG_allow_natives_syntax = true; - i::FLAG_max_new_space_size = 2048; + i::FLAG_max_new_space_size = 2; CcTest::InitializeVM(); if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return; if (i::FLAG_gc_global || i::FLAG_stress_compaction) return; @@ -2323,7 +2323,7 @@ TEST(OptimizedPretenuringObjectArrayLiterals) { TEST(OptimizedPretenuringMixedInObjectProperties) { i::FLAG_allow_natives_syntax = true; - i::FLAG_max_new_space_size = 2048; + i::FLAG_max_new_space_size = 2; CcTest::InitializeVM(); if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return; if (i::FLAG_gc_global || i::FLAG_stress_compaction) return; @@ -2358,7 +2358,7 @@ TEST(OptimizedPretenuringMixedInObjectProperties) { TEST(OptimizedPretenuringDoubleArrayProperties) { i::FLAG_allow_natives_syntax = true; - i::FLAG_max_new_space_size = 2048; + i::FLAG_max_new_space_size = 2; CcTest::InitializeVM(); if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return; if (i::FLAG_gc_global || i::FLAG_stress_compaction) return; @@ -2387,7 +2387,7 @@ TEST(OptimizedPretenuringDoubleArrayProperties) { TEST(OptimizedPretenuringdoubleArrayLiterals) { i::FLAG_allow_natives_syntax = true; - i::FLAG_max_new_space_size = 2048; + i::FLAG_max_new_space_size = 2; CcTest::InitializeVM(); if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return; if (i::FLAG_gc_global || i::FLAG_stress_compaction) return; @@ -2416,7 +2416,7 @@ TEST(OptimizedPretenuringdoubleArrayLiterals) { TEST(OptimizedPretenuringNestedMixedArrayLiterals) { i::FLAG_allow_natives_syntax = true; - i::FLAG_max_new_space_size = 2048; + i::FLAG_max_new_space_size = 2; CcTest::InitializeVM(); if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return; if (i::FLAG_gc_global || i::FLAG_stress_compaction) return; @@ -2454,7 +2454,7 @@ TEST(OptimizedPretenuringNestedMixedArrayLiterals) { TEST(OptimizedPretenuringNestedObjectLiterals) { i::FLAG_allow_natives_syntax = true; - i::FLAG_max_new_space_size = 2048; + i::FLAG_max_new_space_size = 2; CcTest::InitializeVM(); if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return; if (i::FLAG_gc_global || i::FLAG_stress_compaction) return; @@ -2492,7 +2492,7 @@ TEST(OptimizedPretenuringNestedObjectLiterals) { TEST(OptimizedPretenuringNestedDoubleLiterals) { i::FLAG_allow_natives_syntax = true; - i::FLAG_max_new_space_size = 2048; + i::FLAG_max_new_space_size = 2; CcTest::InitializeVM(); if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return; if (i::FLAG_gc_global || i::FLAG_stress_compaction) return; @@ -2538,7 +2538,7 @@ TEST(OptimizedPretenuringConstructorCalls) { return; } i::FLAG_allow_natives_syntax = true; - i::FLAG_max_new_space_size = 2048; + i::FLAG_max_new_space_size = 2; CcTest::InitializeVM(); if (!CcTest::i_isolate()->use_crankshaft() || i::FLAG_always_opt) return; if (i::FLAG_gc_global || i::FLAG_stress_compaction) return; diff --git a/test/cctest/test-strings.cc b/test/cctest/test-strings.cc index 81294e8..706836c 100644 --- a/test/cctest/test-strings.cc +++ b/test/cctest/test-strings.cc @@ -1203,7 +1203,7 @@ TEST(AsciiArrayJoin) { // Set heap limits. static const int K = 1024; v8::ResourceConstraints constraints; - constraints.set_max_new_space_size(256 * K); + constraints.set_max_new_space_size(2 * K * K); constraints.set_max_old_space_size(4 * K * K); v8::SetResourceConstraints(CcTest::isolate(), &constraints); diff --git a/test/mjsunit/binary-op-newspace.js b/test/mjsunit/binary-op-newspace.js index b47fcf6..dac7d24 100644 --- a/test/mjsunit/binary-op-newspace.js +++ b/test/mjsunit/binary-op-newspace.js @@ -25,7 +25,7 @@ // (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: --noopt +// Flags: --max-new-space-size=2 --noopt // Check that a mod where the stub code hits a failure in heap number // allocation still works. diff --git a/test/mjsunit/compiler/math-floor-global.js b/test/mjsunit/compiler/math-floor-global.js index 71b8054..4a3bcb7 100644 --- a/test/mjsunit/compiler/math-floor-global.js +++ b/test/mjsunit/compiler/math-floor-global.js @@ -25,7 +25,7 @@ // (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 +// Flags: --max-new-space-size=2 --allow-natives-syntax // Test inlining of Math.floor when assigned to a global. var flo = Math.floor; diff --git a/test/mjsunit/compiler/math-floor-local.js b/test/mjsunit/compiler/math-floor-local.js index 58e082c..8424ac9 100644 --- a/test/mjsunit/compiler/math-floor-local.js +++ b/test/mjsunit/compiler/math-floor-local.js @@ -25,7 +25,7 @@ // (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 +// Flags: --max-new-space-size=2 --allow-natives-syntax // Test inlining of Math.floor when assigned to a local. var test_id = 0; diff --git a/test/mjsunit/define-property-gc.js b/test/mjsunit/define-property-gc.js index 0b5d06c..573a7ed 100644 --- a/test/mjsunit/define-property-gc.js +++ b/test/mjsunit/define-property-gc.js @@ -26,6 +26,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Tests the handling of GC issues in the defineProperty method. +// Flags: --max-new-space-size=2 function Regular() { this[0] = 0; diff --git a/test/mjsunit/math-abs.js b/test/mjsunit/math-abs.js index dfe4f3f..09b9c88 100644 --- a/test/mjsunit/math-abs.js +++ b/test/mjsunit/math-abs.js @@ -25,7 +25,7 @@ // (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 +// Flags: --max-new-space-size=2 --allow-natives-syntax function zero() { var x = 0.5; diff --git a/test/mjsunit/math-floor-part1.js b/test/mjsunit/math-floor-part1.js index c75e10f..bae47dc 100644 --- a/test/mjsunit/math-floor-part1.js +++ b/test/mjsunit/math-floor-part1.js @@ -25,7 +25,7 @@ // (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 +// Flags: --max-new-space-size=2 --allow-natives-syntax var test_id = 0; diff --git a/test/mjsunit/math-floor-part2.js b/test/mjsunit/math-floor-part2.js index d34bfbd..ad60fba 100644 --- a/test/mjsunit/math-floor-part2.js +++ b/test/mjsunit/math-floor-part2.js @@ -25,7 +25,7 @@ // (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 +// Flags: --max-new-space-size=2 --allow-natives-syntax var test_id = 0; diff --git a/test/mjsunit/math-floor-part3.js b/test/mjsunit/math-floor-part3.js index 70eb2c6..a6d1c5e 100644 --- a/test/mjsunit/math-floor-part3.js +++ b/test/mjsunit/math-floor-part3.js @@ -25,7 +25,7 @@ // (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 +// Flags: --max-new-space-size=2 --allow-natives-syntax var test_id = 0; diff --git a/test/mjsunit/math-floor-part4.js b/test/mjsunit/math-floor-part4.js index e9a752e..58212b4 100644 --- a/test/mjsunit/math-floor-part4.js +++ b/test/mjsunit/math-floor-part4.js @@ -25,7 +25,7 @@ // (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 +// Flags: --max-new-space-size=2 --allow-natives-syntax var test_id = 0; diff --git a/test/mjsunit/regress/regress-1708.js b/test/mjsunit/regress/regress-1708.js index 7f36ce5..48ee79c 100644 --- a/test/mjsunit/regress/regress-1708.js +++ b/test/mjsunit/regress/regress-1708.js @@ -32,7 +32,7 @@ // sure that concurrent sweeping, which relies on similar assumptions // as lazy sweeping works correctly. -// Flags: --expose-gc --noincremental-marking +// Flags: --expose-gc --noincremental-marking --max-new-space-size=2 (function() { var head = new Array(1); diff --git a/test/mjsunit/regress/regress-99167.js b/test/mjsunit/regress/regress-99167.js index 2583c12..777acf4 100644 --- a/test/mjsunit/regress/regress-99167.js +++ b/test/mjsunit/regress/regress-99167.js @@ -25,7 +25,7 @@ // (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: --expose-gc +// Flags: --expose-gc --max-new-space-size=2 eval("function Node() { this.a = 1; this.a = 3; }"); new Node; diff --git a/test/mjsunit/regress/regress-create-exception.js b/test/mjsunit/regress/regress-create-exception.js index f7393e1..e055304 100644 --- a/test/mjsunit/regress/regress-create-exception.js +++ b/test/mjsunit/regress/regress-create-exception.js @@ -25,6 +25,7 @@ // (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=2 "use strict"; // Check for GC bug constructing exceptions. -- 2.7.4