Commit bc32a0a7 authored by ulan's avatar ulan Committed by Commit Bot

[heap] Disable concurrent marking for cctests that rely on manual GC.

BUG=chromium:694255

Review-Url: https://codereview.chromium.org/2910933002
Cr-Commit-Position: refs/heads/master@{#45570}
parent 8ad8319e
...@@ -114,6 +114,7 @@ TEST(ArrayBuffer_ScavengeAndMC) { ...@@ -114,6 +114,7 @@ TEST(ArrayBuffer_ScavengeAndMC) {
} }
TEST(ArrayBuffer_Compaction) { TEST(ArrayBuffer_Compaction) {
FLAG_concurrent_marking = false;
FLAG_stress_incremental_marking = false; FLAG_stress_incremental_marking = false;
FLAG_manual_evacuation_candidates_selection = true; FLAG_manual_evacuation_candidates_selection = true;
CcTest::InitializeVM(); CcTest::InitializeVM();
......
...@@ -47,6 +47,7 @@ HEAP_TEST(CompactionFullAbortedPage) { ...@@ -47,6 +47,7 @@ HEAP_TEST(CompactionFullAbortedPage) {
// Disable concurrent sweeping to ensure memory is in an expected state, i.e., // Disable concurrent sweeping to ensure memory is in an expected state, i.e.,
// we can reach the state of a half aborted page. // we can reach the state of a half aborted page.
FLAG_concurrent_sweeping = false; FLAG_concurrent_sweeping = false;
FLAG_concurrent_marking = false;
FLAG_stress_incremental_marking = false; FLAG_stress_incremental_marking = false;
FLAG_manual_evacuation_candidates_selection = true; FLAG_manual_evacuation_candidates_selection = true;
CcTest::InitializeVM(); CcTest::InitializeVM();
...@@ -90,6 +91,7 @@ HEAP_TEST(CompactionPartiallyAbortedPage) { ...@@ -90,6 +91,7 @@ HEAP_TEST(CompactionPartiallyAbortedPage) {
// Disable concurrent sweeping to ensure memory is in an expected state, i.e., // Disable concurrent sweeping to ensure memory is in an expected state, i.e.,
// we can reach the state of a half aborted page. // we can reach the state of a half aborted page.
FLAG_concurrent_sweeping = false; FLAG_concurrent_sweeping = false;
FLAG_concurrent_marking = false;
FLAG_stress_incremental_marking = false; FLAG_stress_incremental_marking = false;
FLAG_manual_evacuation_candidates_selection = true; FLAG_manual_evacuation_candidates_selection = true;
...@@ -165,6 +167,7 @@ HEAP_TEST(CompactionPartiallyAbortedPageIntraAbortedPointers) { ...@@ -165,6 +167,7 @@ HEAP_TEST(CompactionPartiallyAbortedPageIntraAbortedPointers) {
// Disable concurrent sweeping to ensure memory is in an expected state, i.e., // Disable concurrent sweeping to ensure memory is in an expected state, i.e.,
// we can reach the state of a half aborted page. // we can reach the state of a half aborted page.
FLAG_concurrent_sweeping = false; FLAG_concurrent_sweeping = false;
FLAG_concurrent_marking = false;
FLAG_stress_incremental_marking = false; FLAG_stress_incremental_marking = false;
FLAG_manual_evacuation_candidates_selection = true; FLAG_manual_evacuation_candidates_selection = true;
...@@ -253,6 +256,7 @@ HEAP_TEST(CompactionPartiallyAbortedPageWithStoreBufferEntries) { ...@@ -253,6 +256,7 @@ HEAP_TEST(CompactionPartiallyAbortedPageWithStoreBufferEntries) {
// Disable concurrent sweeping to ensure memory is in an expected state, i.e., // Disable concurrent sweeping to ensure memory is in an expected state, i.e.,
// we can reach the state of a half aborted page. // we can reach the state of a half aborted page.
FLAG_concurrent_sweeping = false; FLAG_concurrent_sweeping = false;
FLAG_concurrent_marking = false;
FLAG_stress_incremental_marking = false; FLAG_stress_incremental_marking = false;
FLAG_manual_evacuation_candidates_selection = true; FLAG_manual_evacuation_candidates_selection = true;
......
...@@ -742,6 +742,7 @@ TEST(BytecodeArray) { ...@@ -742,6 +742,7 @@ TEST(BytecodeArray) {
static const int kFrameSize = 32; static const int kFrameSize = 32;
static const int kParameterCount = 2; static const int kParameterCount = 2;
FLAG_concurrent_marking = false;
FLAG_manual_evacuation_candidates_selection = true; FLAG_manual_evacuation_candidates_selection = true;
FLAG_stress_incremental_marking = false; FLAG_stress_incremental_marking = false;
CcTest::InitializeVM(); CcTest::InitializeVM();
...@@ -3157,6 +3158,7 @@ TEST(ReleaseOverReservedPages) { ...@@ -3157,6 +3158,7 @@ TEST(ReleaseOverReservedPages) {
// memory is distributed. Since this is non-deterministic because of // memory is distributed. Since this is non-deterministic because of
// concurrent sweeping, we disable it for this test. // concurrent sweeping, we disable it for this test.
FLAG_parallel_compaction = false; FLAG_parallel_compaction = false;
FLAG_concurrent_marking = false;
// Concurrent sweeping adds non determinism, depending on when memory is // Concurrent sweeping adds non determinism, depending on when memory is
// available for further reuse. // available for further reuse.
FLAG_concurrent_sweeping = false; FLAG_concurrent_sweeping = false;
...@@ -3867,6 +3869,7 @@ TEST(Regress513496) { ...@@ -3867,6 +3869,7 @@ TEST(Regress513496) {
TEST(LargeObjectSlotRecording) { TEST(LargeObjectSlotRecording) {
if (!FLAG_incremental_marking) return; if (!FLAG_incremental_marking) return;
FLAG_concurrent_marking = false;
FLAG_manual_evacuation_candidates_selection = true; FLAG_manual_evacuation_candidates_selection = true;
FLAG_stress_incremental_marking = false; FLAG_stress_incremental_marking = false;
CcTest::InitializeVM(); CcTest::InitializeVM();
...@@ -4858,6 +4861,7 @@ static void RequestInterrupt(const v8::FunctionCallbackInfo<v8::Value>& args) { ...@@ -4858,6 +4861,7 @@ static void RequestInterrupt(const v8::FunctionCallbackInfo<v8::Value>& args) {
} }
HEAP_TEST(Regress538257) { HEAP_TEST(Regress538257) {
FLAG_concurrent_marking = false;
FLAG_manual_evacuation_candidates_selection = true; FLAG_manual_evacuation_candidates_selection = true;
v8::Isolate::CreateParams create_params; v8::Isolate::CreateParams create_params;
// Set heap limits. // Set heap limits.
...@@ -5656,6 +5660,7 @@ TEST(SharedFunctionInfoIterator) { ...@@ -5656,6 +5660,7 @@ TEST(SharedFunctionInfoIterator) {
} }
HEAP_TEST(Regress587004) { HEAP_TEST(Regress587004) {
FLAG_concurrent_marking = false;
FLAG_concurrent_sweeping = false; FLAG_concurrent_sweeping = false;
#ifdef VERIFY_HEAP #ifdef VERIFY_HEAP
FLAG_verify_heap = false; FLAG_verify_heap = false;
...@@ -5698,6 +5703,7 @@ HEAP_TEST(Regress589413) { ...@@ -5698,6 +5703,7 @@ HEAP_TEST(Regress589413) {
FLAG_stress_compaction = true; FLAG_stress_compaction = true;
FLAG_manual_evacuation_candidates_selection = true; FLAG_manual_evacuation_candidates_selection = true;
FLAG_parallel_compaction = false; FLAG_parallel_compaction = false;
FLAG_concurrent_marking = false;
FLAG_concurrent_sweeping = false; FLAG_concurrent_sweeping = false;
CcTest::InitializeVM(); CcTest::InitializeVM();
v8::HandleScope scope(CcTest::isolate()); v8::HandleScope scope(CcTest::isolate());
...@@ -5945,6 +5951,7 @@ TEST(Regress631969) { ...@@ -5945,6 +5951,7 @@ TEST(Regress631969) {
if (!FLAG_incremental_marking) return; if (!FLAG_incremental_marking) return;
FLAG_manual_evacuation_candidates_selection = true; FLAG_manual_evacuation_candidates_selection = true;
FLAG_parallel_compaction = false; FLAG_parallel_compaction = false;
FLAG_concurrent_marking = false;
FLAG_concurrent_sweeping = false; FLAG_concurrent_sweeping = false;
CcTest::InitializeVM(); CcTest::InitializeVM();
v8::HandleScope scope(CcTest::isolate()); v8::HandleScope scope(CcTest::isolate());
......
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