Skip to content
Permalink
Browse files

deps: V8: cherry-pick 687d865fe251

Original commit message:

    [heap] Perform GCs on v8::BackingStore allocation

    This adds heuristics to perform young and full GCs on allocation
    of external ArrayBuffer backing stores.

    Young GCs are performed proactively based on the external backing
    store bytes for the young generation. Full GCs are performed only
    if the allocation fails. Subsequent CLs will add heuristics to
    start incremental full GCs based on the external backing store bytes.

    This will allow us to remove AdjustAmountOfExternalMemory for
    ArrayBuffers.

    Bug: v8:9701, chromium:1008938
    Change-Id: I0e8688f582989518926c38260b5cf14e2ca93f84
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1803614
    Commit-Queue: Ulan Degenbaev <ulan@chromium.org>
    Reviewed-by: Dominik Inführ <dinfuehr@chromium.org>
    Reviewed-by: Hannes Payer <hpayer@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#65480}

PR-URL: #31007
Refs: v8/v8@687d865
Refs: #1671
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
  • Loading branch information
ChALkeR authored and BridgeAR committed Dec 17, 2019
1 parent 7fe8399 commit 647f3c76391f3722691d7ed9613adc260384e529
Showing with 45 additions and 12 deletions.
  1. +8 −0 deps/v8/src/heap/heap.cc
  2. +0 −4 deps/v8/src/heap/heap.h
  3. +16 −8 deps/v8/src/heap/spaces.h
  4. +21 −0 deps/v8/test/cctest/heap/test-heap.cc
@@ -2761,6 +2761,14 @@ HeapObject Heap::AlignWithFiller(HeapObject object, int object_size,

void* Heap::AllocateExternalBackingStore(
const std::function<void*(size_t)>& allocate, size_t byte_length) {
size_t new_space_backing_store_bytes =
new_space()->ExternalBackingStoreBytes();
if (new_space_backing_store_bytes >= 2 * kMaxSemiSpaceSize &&
new_space_backing_store_bytes >= byte_length) {
// Performing a young generation GC amortizes over the allocated backing
// store bytes and may free enough external bytes for this allocation.
CollectGarbage(NEW_SPACE, GarbageCollectionReason::kExternalMemoryPressure);
}
// TODO(ulan): Perform GCs proactively based on the byte_length and
// the current external backing store counters.
void* result = allocate(byte_length);
@@ -1793,10 +1793,6 @@ class Heap {

void FinalizePartialMap(Map map);

// Allocate empty fixed typed array of given type.
V8_WARN_UNUSED_RESULT AllocationResult
AllocateEmptyFixedTypedArray(ExternalArrayType array_type);

void set_force_oom(bool value) { force_oom_ = value; }

// ===========================================================================
@@ -2804,14 +2804,14 @@ class V8_EXPORT_PRIVATE NewSpace
void Shrink();

// Return the allocated bytes in the active semispace.
size_t Size() override {
size_t Size() final {
DCHECK_GE(top(), to_space_.page_low());
return to_space_.pages_used() *
MemoryChunkLayout::AllocatableMemoryInDataPage() +
static_cast<size_t>(top() - to_space_.page_low());
}

size_t SizeOfObjects() override { return Size(); }
size_t SizeOfObjects() final { return Size(); }

// Return the allocatable capacity of a semispace.
size_t Capacity() {
@@ -2829,30 +2829,38 @@ class V8_EXPORT_PRIVATE NewSpace

// Committed memory for NewSpace is the committed memory of both semi-spaces
// combined.
size_t CommittedMemory() override {
size_t CommittedMemory() final {
return from_space_.CommittedMemory() + to_space_.CommittedMemory();
}

size_t MaximumCommittedMemory() override {
size_t MaximumCommittedMemory() final {
return from_space_.MaximumCommittedMemory() +
to_space_.MaximumCommittedMemory();
}

// Approximate amount of physical memory committed for this space.
size_t CommittedPhysicalMemory() override;
size_t CommittedPhysicalMemory() final;

// Return the available bytes without growing.
size_t Available() override {
size_t Available() final {
DCHECK_GE(Capacity(), Size());
return Capacity() - Size();
}

size_t ExternalBackingStoreBytes(
ExternalBackingStoreType type) const override {
size_t ExternalBackingStoreBytes(ExternalBackingStoreType type) const final {
DCHECK_EQ(0, from_space_.ExternalBackingStoreBytes(type));
return to_space_.ExternalBackingStoreBytes(type);
}

size_t ExternalBackingStoreBytes() {
size_t result = 0;
for (int i = 0; i < ExternalBackingStoreType::kNumTypes; i++) {
result +=
ExternalBackingStoreBytes(static_cast<ExternalBackingStoreType>(i));
}
return result;
}

size_t AllocatedSinceLastGC() {
const Address age_mark = to_space_.age_mark();
DCHECK_NE(age_mark, kNullAddress);
@@ -6823,6 +6823,27 @@ TEST(CodeObjectRegistry) {
CHECK(MemoryChunk::FromAddress(code2_address)->Contains(code2_address));
}

TEST(Regress9701) {
ManualGCScope manual_gc_scope;
if (!FLAG_incremental_marking) return;
CcTest::InitializeVM();
Heap* heap = CcTest::heap();
// Start with an empty new space.
CcTest::CollectGarbage(NEW_SPACE);
CcTest::CollectGarbage(NEW_SPACE);

int mark_sweep_count_before = heap->ms_count();
// Allocate many short living array buffers.
for (int i = 0; i < 1000; i++) {
HandleScope scope(heap->isolate());
CcTest::i_isolate()->factory()->NewJSArrayBufferAndBackingStore(
64 * KB, InitializedFlag::kZeroInitialized);
}
int mark_sweep_count_after = heap->ms_count();
// We expect only scavenges, no full GCs.
CHECK_EQ(mark_sweep_count_before, mark_sweep_count_after);
}

} // namespace heap
} // namespace internal
} // namespace v8

0 comments on commit 647f3c7

Please sign in to comment.
You can’t perform that action at this time.