Reviewers: Jakob,
Description:
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 b9c4ecd019caebbf28480d124e8649ae411876c8.
Revert "Remove max space limits in tests."
This reverts commit d5e8afac2d4e8c7df5df16540ed2c306d3e4cd91.
BUG=
Please review this at https://codereview.chromium.org/263103006/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+24, -22 lines):
M test/cctest/test-api.cc
M test/cctest/test-heap.cc
M test/cctest/test-strings.cc
M test/mjsunit/binary-op-newspace.js
M test/mjsunit/compiler/math-floor-global.js
M test/mjsunit/compiler/math-floor-local.js
M test/mjsunit/define-property-gc.js
M test/mjsunit/math-abs.js
M test/mjsunit/math-floor-part1.js
M test/mjsunit/math-floor-part2.js
M test/mjsunit/math-floor-part3.js
M test/mjsunit/math-floor-part4.js
M test/mjsunit/regress/regress-1708.js
M test/mjsunit/regress/regress-99167.js
M test/mjsunit/regress/regress-create-exception.js
Index: test/cctest/test-api.cc
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
index
14912b7d5db21bc8f1d8518106025418aa1c5be0..4dad1ee4a8c921a5d0ababdee43ec0b1f0da0b3c
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;
Index: test/cctest/test-heap.cc
diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc
index
e91a08047da2802e11e9a383b8bec25f6bbbaed5..913d80a180815ce81863368b84a04e205fec4f5a
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;
Index: test/cctest/test-strings.cc
diff --git a/test/cctest/test-strings.cc b/test/cctest/test-strings.cc
index
81294e847a965de65d82bced70e2d22d43565587..706836c1c9ed646e22cf7a8ffb321fc6cdde928a
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);
Index: test/mjsunit/binary-op-newspace.js
diff --git a/test/mjsunit/binary-op-newspace.js
b/test/mjsunit/binary-op-newspace.js
index
b47fcf6f59b1f8f7fc640cf309377a040e265f88..e3341c4a7a7003c9faddefdeb9de21ea93796d3f
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=256 --noopt
// Check that a mod where the stub code hits a failure in heap number
// allocation still works.
Index: test/mjsunit/compiler/math-floor-global.js
diff --git a/test/mjsunit/compiler/math-floor-global.js
b/test/mjsunit/compiler/math-floor-global.js
index
71b8054a3238a7a3f076854de7b5a4670d4d0ee3..3b9d1254537dce8d3dfb8a09ca0deacc278d57ff
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=128 --allow-natives-syntax
// Test inlining of Math.floor when assigned to a global.
var flo = Math.floor;
Index: test/mjsunit/compiler/math-floor-local.js
diff --git a/test/mjsunit/compiler/math-floor-local.js
b/test/mjsunit/compiler/math-floor-local.js
index
58e082c7b1bf2f4ba7c45ca0c5a163bce0918631..fef3347e800bf083069a32106d12fa65467b6fc2
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=128 --allow-natives-syntax
// Test inlining of Math.floor when assigned to a local.
var test_id = 0;
Index: test/mjsunit/define-property-gc.js
diff --git a/test/mjsunit/define-property-gc.js
b/test/mjsunit/define-property-gc.js
index
0b5d06c751da973062519e50a46ecc54dc3a169d..b38164d0f40b52c685448a7c2d84ced2aa7187f2
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=256
function Regular() {
this[0] = 0;
Index: test/mjsunit/math-abs.js
diff --git a/test/mjsunit/math-abs.js b/test/mjsunit/math-abs.js
index
dfe4f3fae2f4c272c6599d6b4d46df82de297f94..d6ee3f2da7853f071559cbb32911dcde3a81f506
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=256 --allow-natives-syntax
function zero() {
var x = 0.5;
Index: test/mjsunit/math-floor-part1.js
diff --git a/test/mjsunit/math-floor-part1.js
b/test/mjsunit/math-floor-part1.js
index
c75e10fc7c67c312de3e4669496da3daf1709ba2..a4fca7c6d1c2c14e9cf88bcc3b8e918e69d083f7
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=128 --allow-natives-syntax
var test_id = 0;
Index: test/mjsunit/math-floor-part2.js
diff --git a/test/mjsunit/math-floor-part2.js
b/test/mjsunit/math-floor-part2.js
index
d34bfbd8bedf98c35451e1edfcc02b1280c1850e..d9bc410fa2f31a91878c246cd66a32d8b31f75bf
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=256 --allow-natives-syntax
var test_id = 0;
Index: test/mjsunit/math-floor-part3.js
diff --git a/test/mjsunit/math-floor-part3.js
b/test/mjsunit/math-floor-part3.js
index
70eb2c67efdd07ea677de49b26a09972290d630b..0b0e687f9ea5b2a81affe021481a48e67aba3da7
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=256 --allow-natives-syntax
var test_id = 0;
Index: test/mjsunit/math-floor-part4.js
diff --git a/test/mjsunit/math-floor-part4.js
b/test/mjsunit/math-floor-part4.js
index
e9a752e7d40c993f78b48ea8491a3fd0c904fb0c..94adc459b4f0e2d15e46d65eedf2639ab211495f
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=256 --allow-natives-syntax
var test_id = 0;
Index: test/mjsunit/regress/regress-1708.js
diff --git a/test/mjsunit/regress/regress-1708.js
b/test/mjsunit/regress/regress-1708.js
index
7f36ce54a592ba8f906c559aa3837d580ceec7e4..76f97682236e4cf15166eb816ba7e315b537c0b6
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 1000
(function() {
var head = new Array(1);
Index: test/mjsunit/regress/regress-99167.js
diff --git a/test/mjsunit/regress/regress-99167.js
b/test/mjsunit/regress/regress-99167.js
index
2583c125f87bec56a11545a1f1f21efdbeb93298..5053ae5d24f5766e6d3116456fae305427196be5
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=1024
eval("function Node() { this.a = 1; this.a = 3; }");
new Node;
Index: test/mjsunit/regress/regress-create-exception.js
diff --git a/test/mjsunit/regress/regress-create-exception.js
b/test/mjsunit/regress/regress-create-exception.js
index
f7393e1162586a75fd076e2ae350e813b217c7b0..d3face9f3736e0b3d067461cdfb9cf30883ffb1a
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=256
"use strict";
// Check for GC bug constructing exceptions.
--
--
v8-dev mailing list
v8-dev@googlegroups.com
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 v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
