Reviewers: Hannes Payer,

Description:
Increase code space allowance for first page size.

This has become necessary as we have more experimental natives
that run after deserializing from the snapshot.

[email protected]
BUG=v8:4200
LOG=N

Please review this at https://codereview.chromium.org/1218973002/

Base URL: https://chromium.googlesource.com/v8/v8.git@master

Affected files (+4, -7 lines):
  M src/snapshot/snapshot-common.cc
  M test/cctest/cctest.status
  M test/cctest/test-spaces.cc


Index: src/snapshot/snapshot-common.cc
diff --git a/src/snapshot/snapshot-common.cc b/src/snapshot/snapshot-common.cc index 89fe8af2eb774d8f72ce88303ca4a7344d4b6f90..ab8a88486eab2ae1d8f9551827117d18a737f849 100644
--- a/src/snapshot/snapshot-common.cc
+++ b/src/snapshot/snapshot-common.cc
@@ -137,7 +137,7 @@ void CalculateFirstPageSizes(bool is_default_snapshot,
                   2 * context_reservations[context_index].chunk_size()) +
                  Page::kObjectStartOffset;
       // Add a small allowance to the code space for small scripts.
-      if (space == CODE_SPACE) required += 32 * KB;
+      if (space == CODE_SPACE) required += 64 * KB;
     } else {
       // We expect the vanilla snapshot to only require on page per space.
       DCHECK(!is_default_snapshot);
Index: test/cctest/cctest.status
diff --git a/test/cctest/cctest.status b/test/cctest/cctest.status
index 2ef829675e8a0cd2a618626cdcdca02bc6d2607a..0686205e9d2d46ba7edfcda049653e3f69b1e793 100644
--- a/test/cctest/cctest.status
+++ b/test/cctest/cctest.status
@@ -154,9 +154,6 @@

   # BUG(v8:3434).
   ' test-api/LoadICFastApi_DirectCall_GCMoveStubWithProfiler': [SKIP],
-
-  # BUG(v8:4200).
-  'test-spaces/SizeOfFirstPageIsLargeEnough': [PASS, FAIL],
 }],  # 'arch == arm64'

 ['arch == arm64 and simulator_run == True', {
@@ -293,9 +290,6 @@
   'test-serialize/DeserializeFromSecondSerializationAndRunScript2': [SKIP],
   'test-serialize/DeserializeAndRunScript2': [SKIP],
   'test-serialize/DeserializeFromSecondSerialization': [SKIP],
-
-  # BUG(v8:4200).
-  'test-spaces/SizeOfFirstPageIsLargeEnough': [PASS, FAIL],
 }],  # 'arch == mips64el'

##############################################################################
Index: test/cctest/test-spaces.cc
diff --git a/test/cctest/test-spaces.cc b/test/cctest/test-spaces.cc
index 85b33c9cf0531d586e0b7ca8cc8ff0b2a7d40dc7..3f5e437223a57ba246c093ce8ce4d0ea7d061fcc 100644
--- a/test/cctest/test-spaces.cc
+++ b/test/cctest/test-spaces.cc
@@ -439,6 +439,9 @@ TEST(SizeOfFirstPageIsLargeEnough) {
   if (!isolate->snapshot_available()) return;
   if (Snapshot::EmbedsScript(isolate)) return;

+ // If this test fails due to enabling experimental natives that are not part
+  // of the snapshot, we may need to adjust CalculateFirstPageSizes.
+
   // Freshly initialized VM gets by with one page per space.
   for (int i = FIRST_PAGED_SPACE; i <= LAST_PAGED_SPACE; i++) {
// Debug code can be very large, so skip CODE_SPACE if we are generating it.


--
--
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.

Reply via email to