Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

Unified Diff: test/cctest/heap/test-spaces.cc

Issue 2239323002: Revert of "[heap] Switch to 500k pages" (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « test/cctest/heap/test-heap.cc ('k') | test/cctest/test-serialize.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/cctest/heap/test-spaces.cc
diff --git a/test/cctest/heap/test-spaces.cc b/test/cctest/heap/test-spaces.cc
index 8f42519c1cd8be910db894a45de948b41495bab4..2328518f2a68cd0a9bed0cef3ab8277a8e179892 100644
--- a/test/cctest/heap/test-spaces.cc
+++ b/test/cctest/heap/test-spaces.cc
@@ -32,7 +32,6 @@
#include "src/v8.h"
#include "test/cctest/cctest.h"
#include "test/cctest/heap/heap-tester.h"
-#include "test/cctest/heap/heap-utils.h"
namespace v8 {
namespace internal {
@@ -479,7 +478,8 @@
CHECK(lo->AllocateRaw(lo_size, NOT_EXECUTABLE).IsRetry());
}
-TEST(SizeOfInitialHeap) {
+
+TEST(SizeOfFirstPageIsLargeEnough) {
if (i::FLAG_always_opt) return;
// Bootstrapping without a snapshot causes more allocations.
CcTest::InitializeVM();
@@ -495,31 +495,22 @@
return;
}
- // The limit for each space for an empty isolate containing just the
- // snapshot.
- const size_t kMaxInitialSizePerSpace = 1536 * KB; // 1.5MB
-
- // Freshly initialized VM gets by with the snapshot size (which is below
- // kMaxInitialSizePerSpace per space).
- Heap* heap = isolate->heap();
- int page_count[LAST_PAGED_SPACE + 1] = {0, 0, 0, 0};
+ // 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.
if (i == CODE_SPACE && i::FLAG_debug_code) continue;
-
- page_count[i] = heap->paged_space(i)->CountTotalPages();
- // Check that the initial heap is also below the limit.
- CHECK_LT(static_cast<size_t>(heap->paged_space(i)->CommittedMemory()),
- kMaxInitialSizePerSpace);
- }
-
- // Executing the empty script gets by with the same number of pages, i.e.,
- // requires no extra space.
+ CHECK_EQ(1, isolate->heap()->paged_space(i)->CountTotalPages());
+ }
+
+ // Executing the empty script gets by with one page per space.
CompileRun("/*empty*/");
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.
if (i == CODE_SPACE && i::FLAG_debug_code) continue;
- CHECK_EQ(page_count[i], isolate->heap()->paged_space(i)->CountTotalPages());
+ CHECK_EQ(1, isolate->heap()->paged_space(i)->CountTotalPages());
}
// No large objects required to perform the above steps.
@@ -690,105 +681,5 @@
isolate->Dispose();
}
-TEST(ShrinkPageToHighWaterMarkFreeSpaceEnd) {
- CcTest::InitializeVM();
- Isolate* isolate = CcTest::i_isolate();
- HandleScope scope(isolate);
-
- heap::SealCurrentObjects(CcTest::heap());
-
- // Prepare page that only contains a single object and a trailing FreeSpace
- // filler.
- Handle<FixedArray> array = isolate->factory()->NewFixedArray(128, TENURED);
- Page* page = Page::FromAddress(array->address());
-
- // Reset space so high water mark is consistent.
- CcTest::heap()->old_space()->ResetFreeList();
- CcTest::heap()->old_space()->EmptyAllocationInfo();
-
- HeapObject* filler =
- HeapObject::FromAddress(array->address() + array->Size());
- CHECK(filler->IsFreeSpace());
- size_t shrinked = page->ShrinkToHighWaterMark();
- size_t should_have_shrinked =
- RoundDown(static_cast<size_t>(Page::kAllocatableMemory - array->Size()),
- base::OS::CommitPageSize());
- CHECK_EQ(should_have_shrinked, shrinked);
-}
-
-TEST(ShrinkPageToHighWaterMarkNoFiller) {
- CcTest::InitializeVM();
- Isolate* isolate = CcTest::i_isolate();
- HandleScope scope(isolate);
-
- heap::SealCurrentObjects(CcTest::heap());
-
- const int kFillerSize = 0;
- std::vector<Handle<FixedArray>> arrays =
- heap::FillOldSpacePageWithFixedArrays(CcTest::heap(), kFillerSize);
- Handle<FixedArray> array = arrays.back();
- Page* page = Page::FromAddress(array->address());
- CHECK_EQ(page->area_end(), array->address() + array->Size() + kFillerSize);
-
- // Reset space so high water mark and fillers are consistent.
- CcTest::heap()->old_space()->ResetFreeList();
- CcTest::heap()->old_space()->EmptyAllocationInfo();
-
- const size_t shrinked = page->ShrinkToHighWaterMark();
- CHECK_EQ(0, shrinked);
-}
-
-TEST(ShrinkPageToHighWaterMarkOneWordFiller) {
- CcTest::InitializeVM();
- Isolate* isolate = CcTest::i_isolate();
- HandleScope scope(isolate);
-
- heap::SealCurrentObjects(CcTest::heap());
-
- const int kFillerSize = kPointerSize;
- std::vector<Handle<FixedArray>> arrays =
- heap::FillOldSpacePageWithFixedArrays(CcTest::heap(), kFillerSize);
- Handle<FixedArray> array = arrays.back();
- Page* page = Page::FromAddress(array->address());
- CHECK_EQ(page->area_end(), array->address() + array->Size() + kFillerSize);
-
- // Reset space so high water mark and fillers are consistent.
- CcTest::heap()->old_space()->ResetFreeList();
- CcTest::heap()->old_space()->EmptyAllocationInfo();
-
- HeapObject* filler =
- HeapObject::FromAddress(array->address() + array->Size());
- CHECK_EQ(filler->map(), CcTest::heap()->one_pointer_filler_map());
-
- const size_t shrinked = page->ShrinkToHighWaterMark();
- CHECK_EQ(0, shrinked);
-}
-
-TEST(ShrinkPageToHighWaterMarkTwoWordFiller) {
- CcTest::InitializeVM();
- Isolate* isolate = CcTest::i_isolate();
- HandleScope scope(isolate);
-
- heap::SealCurrentObjects(CcTest::heap());
-
- const int kFillerSize = 2 * kPointerSize;
- std::vector<Handle<FixedArray>> arrays =
- heap::FillOldSpacePageWithFixedArrays(CcTest::heap(), kFillerSize);
- Handle<FixedArray> array = arrays.back();
- Page* page = Page::FromAddress(array->address());
- CHECK_EQ(page->area_end(), array->address() + array->Size() + kFillerSize);
-
- // Reset space so high water mark and fillers are consistent.
- CcTest::heap()->old_space()->ResetFreeList();
- CcTest::heap()->old_space()->EmptyAllocationInfo();
-
- HeapObject* filler =
- HeapObject::FromAddress(array->address() + array->Size());
- CHECK_EQ(filler->map(), CcTest::heap()->two_pointer_filler_map());
-
- const size_t shrinked = page->ShrinkToHighWaterMark();
- CHECK_EQ(0, shrinked);
-}
-
} // namespace internal
} // namespace v8
« no previous file with comments | « test/cctest/heap/test-heap.cc ('k') | test/cctest/test-serialize.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698