Commit eae5c62d authored by Clemens Hammacher's avatar Clemens Hammacher Committed by Commit Bot

[wasm][gc] Start next gc after current one

We only run one GC at a time. If another one should be triggered before
the previous one finished, that second one is just ignored.
This CL changes that to set a bit on the current GC to trigger another
one once it finished. This fixes situations where
a) a lot of code becomes dead after a GC is triggered but before it
   finished, but
b) no more code becomes dead after the GC.

R=mstarzinger@chromium.org

Bug: v8:8217
Change-Id: I5b5ca055124f467e1b0d67b8eb818069affc4a1d
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1598696Reviewed-by: 's avatarMichael Starzinger <mstarzinger@chromium.org>
Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#61278}
parent d1eb6c5f
...@@ -117,6 +117,11 @@ struct WasmEngine::CurrentGCInfo { ...@@ -117,6 +117,11 @@ struct WasmEngine::CurrentGCInfo {
// Set of dead code. Filled with all potentially dead code on initialization. // Set of dead code. Filled with all potentially dead code on initialization.
// Code that is still in-use is removed by the individual isolates. // Code that is still in-use is removed by the individual isolates.
std::unordered_set<WasmCode*> dead_code; std::unordered_set<WasmCode*> dead_code;
// If during this GC, another GC was requested, we skipped that other GC (we
// only run one GC at a time). Remember though to trigger another one once
// this one finishes.
bool run_another_gc = false;
}; };
struct WasmEngine::IsolateInfo { struct WasmEngine::IsolateInfo {
...@@ -731,7 +736,9 @@ void WasmEngine::ReportLiveCodeForGC(Isolate* isolate, ...@@ -731,7 +736,9 @@ void WasmEngine::ReportLiveCodeForGC(Isolate* isolate,
dead_code[code->native_module()].push_back(code); dead_code[code->native_module()].push_back(code);
} }
} }
bool run_another_gc = current_gc_info_->run_another_gc;
current_gc_info_.reset(); current_gc_info_.reset();
if (run_another_gc) TriggerGC();
FreeDeadCodeLocked(dead_code); FreeDeadCodeLocked(dead_code);
} }
...@@ -763,13 +770,19 @@ bool WasmEngine::AddPotentiallyDeadCode(WasmCode* code) { ...@@ -763,13 +770,19 @@ bool WasmEngine::AddPotentiallyDeadCode(WasmCode* code) {
FLAG_stress_wasm_code_gc FLAG_stress_wasm_code_gc
? 0 ? 0
: 1 * MB + code_manager_.committed_code_space() / 10; : 1 * MB + code_manager_.committed_code_space() / 10;
bool need_gc = new_potentially_dead_code_size_ > dead_code_limit; if (new_potentially_dead_code_size_ > dead_code_limit) {
if (need_gc && !current_gc_info_) { if (current_gc_info_ == nullptr) {
TRACE_CODE_GC( TRACE_CODE_GC(
"Triggering GC (potentially dead: %zu bytes; limit: %zu bytes).\n", "Triggering GC (potentially dead: %zu bytes; limit: %zu bytes).\n",
new_potentially_dead_code_size_, dead_code_limit); new_potentially_dead_code_size_, dead_code_limit);
new_potentially_dead_code_size_ = 0;
TriggerGC(); TriggerGC();
} else if (!current_gc_info_->run_another_gc) {
TRACE_CODE_GC(
"Scheduling another GC after the current one (potentially dead: "
"%zu bytes; limit: %zu bytes).\n",
new_potentially_dead_code_size_, dead_code_limit);
current_gc_info_->run_another_gc = true;
}
} }
} }
return true; return true;
......
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