Reviewers: Hannes Payer,
Message:
As discussed this week, let's get rid of the flag.
Description:
[GC] Remove FLAG_incremental_marking_steps
BUG=
Please review this at https://codereview.chromium.org/1281923002/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+3, -8 lines):
M src/flag-definitions.h
M src/heap/heap.cc
M src/heap/incremental-marking.cc
M src/heap/spaces.cc
Index: src/flag-definitions.h
diff --git a/src/flag-definitions.h b/src/flag-definitions.h
index
aec048dade461325c7fa0f369d3ba491e0dc263b..7463741441752416e2e7afdfac2f2d8b463ade69
100644
--- a/src/flag-definitions.h
+++ b/src/flag-definitions.h
@@ -636,7 +636,6 @@ DEFINE_BOOL(age_code, true,
"track un-executed functions to age code and flush only "
"old code (required for code flushing)")
DEFINE_BOOL(incremental_marking, true, "use incremental marking")
-DEFINE_BOOL(incremental_marking_steps, true, "do incremental marking
steps")
DEFINE_BOOL(overapproximate_weak_closure, true,
"overapproximate weak closer to reduce atomic pause time")
DEFINE_INT(min_progress_during_object_groups_marking, 128,
Index: src/heap/heap.cc
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index
08282f7f69fb43f59b308b47bceb1ce3e62255d9..1ae3caadfb42c33ff4bc46a175abcc6cde228bff
100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -905,8 +905,7 @@ bool Heap::CollectGarbage(GarbageCollector collector,
const char* gc_reason,
!mark_compact_collector()->finalize_incremental_marking() &&
!mark_compact_collector()->abort_incremental_marking() &&
!incremental_marking()->IsStopped() &&
- !incremental_marking()->should_hurry() &&
- FLAG_incremental_marking_steps) {
+ !incremental_marking()->should_hurry() && FLAG_incremental_marking) {
// Make progress in incremental marking.
const intptr_t kStepSizeWhenDelayedByScavenge = 1 * MB;
incremental_marking()->Step(kStepSizeWhenDelayedByScavenge,
Index: src/heap/incremental-marking.cc
diff --git a/src/heap/incremental-marking.cc
b/src/heap/incremental-marking.cc
index
307f398460335a822b67e1b1c04f6b387b45c6d7..109f4ea84802df419bb0e1a4a9ec492f39487030
100644
--- a/src/heap/incremental-marking.cc
+++ b/src/heap/incremental-marking.cc
@@ -411,8 +411,7 @@ bool IncrementalMarking::CanBeActivated() {
// marking is turned on, 2) when we are currently not in a GC, and
// 3) when we are currently not serializing or deserializing the heap.
// Don't switch on for very small heaps.
- return FLAG_incremental_marking && FLAG_incremental_marking_steps &&
- heap_->gc_state() == Heap::NOT_IN_GC &&
+ return FLAG_incremental_marking && heap_->gc_state() == Heap::NOT_IN_GC
&&
heap_->deserialization_complete() &&
!heap_->isolate()->serializer_enabled() &&
heap_->PromotedSpaceSizeOfObjects() > kActivationThreshold;
@@ -478,7 +477,6 @@ void IncrementalMarking::Start(int mark_compact_flags,
(reason == nullptr) ? "unknown reason" : reason);
}
DCHECK(FLAG_incremental_marking);
- DCHECK(FLAG_incremental_marking_steps);
DCHECK(state_ == STOPPED);
DCHECK(heap_->gc_state() == Heap::NOT_IN_GC);
DCHECK(!heap_->isolate()->serializer_enabled());
@@ -912,7 +910,6 @@ intptr_t IncrementalMarking::Step(intptr_t
allocated_bytes,
ForceMarkingAction marking,
ForceCompletionAction completion) {
if (heap_->gc_state() != Heap::NOT_IN_GC || !FLAG_incremental_marking ||
- !FLAG_incremental_marking_steps ||
(state_ != SWEEPING && state_ != MARKING)) {
return 0;
}
Index: src/heap/spaces.cc
diff --git a/src/heap/spaces.cc b/src/heap/spaces.cc
index
ba0ddb6e38f87d1ac4180061fca72865bb6c8719..ac0f4fe7cbc52713a982a0c6b0df32cb18cd3efa
100644
--- a/src/heap/spaces.cc
+++ b/src/heap/spaces.cc
@@ -2428,7 +2428,7 @@ HeapObject* FreeList::Allocate(int size_in_bytes) {
DCHECK(owner_->top() == NULL && owner_->limit() == NULL);
} else if (bytes_left > kThreshold &&
owner_->heap()->incremental_marking()->IsMarkingIncomplete()
&&
- FLAG_incremental_marking_steps) {
+ FLAG_incremental_marking) {
int linear_size = owner_->RoundSizeDownToObjectAlignment(kThreshold);
// We don't want to give too large linear areas to the allocator while
// incremental marking is going on, because we won't check again
whether
--
--
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.
