Commit 810fcb28 authored by machenbach's avatar machenbach Committed by Commit bot

Revert of [heap] Reland: Use store buffer for writes coming from mutator....

Revert of [heap] Reland: Use store buffer for writes coming from mutator. (patchset #1 id:1 of https://codereview.chromium.org/2529293004/ )

Reason for revert:
Suspect for tsan failures:
https://build.chromium.org/p/client.v8/builders/V8%20Linux64%20TSAN/builds/12915

Original issue's description:
> [heap] Reland: Use store buffer for writes coming from mutator.
>
> This reverts commit 061c2ab2.
>
> BUG=chromium:648568, chromium:669270
>
> Committed: https://crrev.com/fa2fdf275197185d9bca9d5e72c16a60722c3893
> Cr-Commit-Position: refs/heads/master@{#41341}

TBR=mlippautz@chromium.org,hpayer@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:648568, chromium:669270

Review-Url: https://codereview.chromium.org/2534803004
Cr-Commit-Position: refs/heads/master@{#41342}
parent fa2fdf27
...@@ -502,7 +502,9 @@ void Heap::RecordWrite(Object* object, int offset, Object* o) { ...@@ -502,7 +502,9 @@ void Heap::RecordWrite(Object* object, int offset, Object* o) {
if (!InNewSpace(o) || !object->IsHeapObject() || InNewSpace(object)) { if (!InNewSpace(o) || !object->IsHeapObject() || InNewSpace(object)) {
return; return;
} }
store_buffer()->InsertEntry(HeapObject::cast(object)->address() + offset); RememberedSet<OLD_TO_NEW>::Insert(
Page::FromAddress(reinterpret_cast<Address>(object)),
HeapObject::cast(object)->address() + offset);
} }
void Heap::RecordWriteIntoCode(Code* host, RelocInfo* rinfo, Object* value) { void Heap::RecordWriteIntoCode(Code* host, RelocInfo* rinfo, Object* value) {
...@@ -513,9 +515,11 @@ void Heap::RecordWriteIntoCode(Code* host, RelocInfo* rinfo, Object* value) { ...@@ -513,9 +515,11 @@ void Heap::RecordWriteIntoCode(Code* host, RelocInfo* rinfo, Object* value) {
void Heap::RecordFixedArrayElements(FixedArray* array, int offset, int length) { void Heap::RecordFixedArrayElements(FixedArray* array, int offset, int length) {
if (InNewSpace(array)) return; if (InNewSpace(array)) return;
Page* page = Page::FromAddress(reinterpret_cast<Address>(array));
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
if (!InNewSpace(array->get(offset + i))) continue; if (!InNewSpace(array->get(offset + i))) continue;
store_buffer()->InsertEntry( RememberedSet<OLD_TO_NEW>::Insert(
page,
reinterpret_cast<Address>(array->RawFieldOfElementAt(offset + i))); reinterpret_cast<Address>(array->RawFieldOfElementAt(offset + i)));
} }
} }
......
...@@ -5885,7 +5885,8 @@ void Heap::ClearRecordedSlot(HeapObject* object, Object** slot) { ...@@ -5885,7 +5885,8 @@ void Heap::ClearRecordedSlot(HeapObject* object, Object** slot) {
Address slot_addr = reinterpret_cast<Address>(slot); Address slot_addr = reinterpret_cast<Address>(slot);
Page* page = Page::FromAddress(slot_addr); Page* page = Page::FromAddress(slot_addr);
DCHECK_EQ(page->owner()->identity(), OLD_SPACE); DCHECK_EQ(page->owner()->identity(), OLD_SPACE);
store_buffer()->DeleteEntry(slot_addr); store_buffer()->MoveAllEntriesToRememberedSet();
RememberedSet<OLD_TO_NEW>::Remove(page, slot_addr);
RememberedSet<OLD_TO_OLD>::Remove(page, slot_addr); RememberedSet<OLD_TO_OLD>::Remove(page, slot_addr);
} }
} }
...@@ -5906,7 +5907,9 @@ void Heap::ClearRecordedSlotRange(Address start, Address end) { ...@@ -5906,7 +5907,9 @@ void Heap::ClearRecordedSlotRange(Address start, Address end) {
Page* page = Page::FromAddress(start); Page* page = Page::FromAddress(start);
if (!page->InNewSpace()) { if (!page->InNewSpace()) {
DCHECK_EQ(page->owner()->identity(), OLD_SPACE); DCHECK_EQ(page->owner()->identity(), OLD_SPACE);
store_buffer()->DeleteEntry(start, end); store_buffer()->MoveAllEntriesToRememberedSet();
RememberedSet<OLD_TO_NEW>::RemoveRange(page, start, end,
SlotSet::PREFREE_EMPTY_BUCKETS);
RememberedSet<OLD_TO_OLD>::RemoveRange(page, start, end, RememberedSet<OLD_TO_OLD>::RemoveRange(page, start, end,
SlotSet::FREE_EMPTY_BUCKETS); SlotSet::FREE_EMPTY_BUCKETS);
} }
......
...@@ -138,28 +138,14 @@ void StoreBuffer::ConcurrentlyProcessStoreBuffer() { ...@@ -138,28 +138,14 @@ void StoreBuffer::ConcurrentlyProcessStoreBuffer() {
} }
void StoreBuffer::DeleteEntry(Address start, Address end) { void StoreBuffer::DeleteEntry(Address start, Address end) {
// Deletions coming from the GC are directly deleted from the remembered if (top_ + sizeof(Address) * 2 > limit_[current_]) {
// set. Deletions coming from the runtime are added to the store buffer StoreBufferOverflow(heap_->isolate());
// to allow concurrent processing.
if (heap_->gc_state() == Heap::NOT_IN_GC) {
if (top_ + sizeof(Address) * 2 > limit_[current_]) {
StoreBufferOverflow(heap_->isolate());
}
*top_ = MarkDeletionAddress(start);
top_++;
*top_ = end;
top_++;
} else {
// In GC the store buffer has to be empty at any time.
DCHECK(Empty());
Page* page = Page::FromAddress(start);
if (end) {
RememberedSet<OLD_TO_NEW>::RemoveRange(page, start, end,
SlotSet::PREFREE_EMPTY_BUCKETS);
} else {
RememberedSet<OLD_TO_NEW>::Remove(page, start);
}
} }
*top_ = MarkDeletionAddress(start);
top_++;
*top_ = end;
top_++;
} }
} // namespace internal } // namespace internal
} // namespace v8 } // namespace v8
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include "src/base/platform/platform.h" #include "src/base/platform/platform.h"
#include "src/cancelable-task.h" #include "src/cancelable-task.h"
#include "src/globals.h" #include "src/globals.h"
#include "src/heap/remembered-set.h"
#include "src/heap/slot-set.h" #include "src/heap/slot-set.h"
namespace v8 { namespace v8 {
...@@ -29,7 +28,7 @@ class StoreBuffer { ...@@ -29,7 +28,7 @@ class StoreBuffer {
static const int kStoreBuffers = 2; static const int kStoreBuffers = 2;
static const intptr_t kDeletionTag = 1; static const intptr_t kDeletionTag = 1;
V8_EXPORT_PRIVATE static void StoreBufferOverflow(Isolate* isolate); static void StoreBufferOverflow(Isolate* isolate);
explicit StoreBuffer(Heap* heap); explicit StoreBuffer(Heap* heap);
void SetUp(); void SetUp();
...@@ -65,23 +64,6 @@ class StoreBuffer { ...@@ -65,23 +64,6 @@ class StoreBuffer {
// the more efficient Remove method will be called in this case. // the more efficient Remove method will be called in this case.
void DeleteEntry(Address start, Address end = nullptr); void DeleteEntry(Address start, Address end = nullptr);
void InsertEntry(Address slot) {
// Insertions coming from the GC are directly inserted into the remembered
// set. Insertions coming from the runtime are added to the store buffer to
// allow concurrent processing.
if (heap_->gc_state() == Heap::NOT_IN_GC) {
if (top_ + sizeof(Address) > limit_[current_]) {
StoreBufferOverflow(heap_->isolate());
}
*top_ = slot;
top_++;
} else {
// In GC the store buffer has to be empty at any time.
DCHECK(Empty());
RememberedSet<OLD_TO_NEW>::Insert(Page::FromAddress(slot), slot);
}
}
// Used by the concurrent processing thread to transfer entries from the // Used by the concurrent processing thread to transfer entries from the
// store buffer to the remembered set. // store buffer to the remembered set.
void ConcurrentlyProcessStoreBuffer(); void ConcurrentlyProcessStoreBuffer();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment