Reviewers: Hannes Payer,
Description:
Remove parallel sweeping mode, it's no longer used
BUG=none
[email protected]
LOG=n
Please review this at https://codereview.chromium.org/404743002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+6, -22 lines):
M src/flag-definitions.h
M src/mark-compact.h
M src/mark-compact.cc
M src/sweeper-thread.cc
Index: src/flag-definitions.h
diff --git a/src/flag-definitions.h b/src/flag-definitions.h
index
6c2d614a3eae8419dbd9bce0aae78763814b9b40..87a4133f6d248f41f3c95f90f135cf01e5cc29c4
100644
--- a/src/flag-definitions.h
+++ b/src/flag-definitions.h
@@ -516,7 +516,6 @@ DEFINE_BOOL(trace_incremental_marking, false,
"trace progress of the incremental marking")
DEFINE_BOOL(track_gc_object_stats, false,
"track object counts and memory usage")
-DEFINE_BOOL(parallel_sweeping, false, "enable parallel sweeping")
DEFINE_BOOL(concurrent_sweeping, true, "enable concurrent sweeping")
DEFINE_INT(sweeper_threads, 0,
"number of parallel and concurrent sweeping threads")
@@ -650,7 +649,6 @@ DEFINE_BOOL(predictable, false, "enable predictable
mode")
DEFINE_NEG_IMPLICATION(predictable, concurrent_recompilation)
DEFINE_NEG_IMPLICATION(predictable, concurrent_osr)
DEFINE_NEG_IMPLICATION(predictable, concurrent_sweeping)
-DEFINE_NEG_IMPLICATION(predictable, parallel_sweeping)
//
Index: src/mark-compact.cc
diff --git a/src/mark-compact.cc b/src/mark-compact.cc
index
9df3e6f1446280a9ad3564e4db24de9bce7d5b22..e888a2df0f34bbf8a7452101678bdc48bb5ce3f4
100644
--- a/src/mark-compact.cc
+++ b/src/mark-compact.cc
@@ -205,10 +205,8 @@ static void VerifyEvacuation(NewSpace* space) {
static void VerifyEvacuation(PagedSpace* space) {
- // TODO(hpayer): Bring back VerifyEvacuation for parallel-concurrently
- // swept pages.
- if ((FLAG_concurrent_sweeping || FLAG_parallel_sweeping) &&
- !space->is_iterable()) return;
+ // TODO(hpayer): Bring back VerifyEvacuation for concurrently swept
pages.
+ if (FLAG_concurrent_sweeping && !space->is_iterable()) return;
PageIterator it(space);
while (it.has_next()) {
@@ -4147,8 +4145,7 @@ void MarkCompactCollector::SweepSpace(PagedSpace*
space, SweeperType sweeper) {
}
switch (sweeper) {
- case CONCURRENT_CONSERVATIVE:
- case PARALLEL_CONSERVATIVE: {
+ case CONCURRENT_CONSERVATIVE: {
if (!parallel_sweeping_active) {
if (FLAG_gc_verbose) {
PrintF("Sweeping 0x%" V8PRIxPTR " conservatively.\n",
@@ -4209,9 +4206,6 @@ void MarkCompactCollector::SweepSpaces() {
state_ = SWEEP_SPACES;
#endif
SweeperType how_to_sweep = CONCURRENT_CONSERVATIVE;
- if (FLAG_parallel_sweeping) how_to_sweep = PARALLEL_CONSERVATIVE;
- if (FLAG_concurrent_sweeping) how_to_sweep = CONCURRENT_CONSERVATIVE;
-
if (sweep_precisely_) how_to_sweep = PRECISE;
MoveEvacuationCandidatesToEndOfPagesList();
@@ -4227,14 +4221,9 @@ void MarkCompactCollector::SweepSpaces() {
SweepSpace(heap()->old_data_space(), how_to_sweep);
}
- if (how_to_sweep == PARALLEL_CONSERVATIVE ||
- how_to_sweep == CONCURRENT_CONSERVATIVE) {
+ if (how_to_sweep == CONCURRENT_CONSERVATIVE) {
StartSweeperThreads();
}
-
- if (how_to_sweep == PARALLEL_CONSERVATIVE) {
- EnsureSweepingCompleted();
- }
}
RemoveDeadInvalidatedCode();
Index: src/mark-compact.h
diff --git a/src/mark-compact.h b/src/mark-compact.h
index
65167799ebc0afadb2741daeea83183ae78704cb..a2338c1c7992f3cad51d88563c9a82740a183c73
100644
--- a/src/mark-compact.h
+++ b/src/mark-compact.h
@@ -570,7 +570,6 @@ class MarkCompactCollector {
void EnableCodeFlushing(bool enable);
enum SweeperType {
- PARALLEL_CONSERVATIVE,
CONCURRENT_CONSERVATIVE,
PRECISE
};
Index: src/sweeper-thread.cc
diff --git a/src/sweeper-thread.cc b/src/sweeper-thread.cc
index
fee3e92ff43974de780b6686784dbe9966d7fd50..f1641639dbe641e808926f4de0fee0f99c2393a2
100644
--- a/src/sweeper-thread.cc
+++ b/src/sweeper-thread.cc
@@ -76,11 +76,9 @@ bool SweeperThread::SweepingCompleted() {
int SweeperThread::NumberOfThreads(int max_available) {
- if (!FLAG_concurrent_sweeping && !FLAG_parallel_sweeping) return 0;
+ if (!FLAG_concurrent_sweeping) return 0;
if (FLAG_sweeper_threads > 0) return FLAG_sweeper_threads;
- if (FLAG_concurrent_sweeping) return max_available - 1;
- ASSERT(FLAG_parallel_sweeping);
- return max_available;
+ return max_available - 1;
}
} } // namespace v8::internal
--
--
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.
