[heap] Remove IncrementalMarking::AdvanceWithDeadline

AdvanceWithDeadline() was only used from AdvanceFromTask(). So we can
move this method into AdvanceFromTask().

AdvanceFromTask() and AdvanceOnAllocation() share quite some code,
there is already a common bottleneck for both methods: Step(). So we
can move that code into Step().

Bug: v8:12775
Change-Id: I0f749f52df05d951f4310f05ff0d3977c6b2a9aa
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3843143
Commit-Queue: Dominik Inführ <dinfuehr@chromium.org>
Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Cr-Commit-Position: refs/heads/main@{#82614}

src/heap/incremental-marking.cc

@@ -656,7 +656,9 @@ void IncrementalMarking::ScheduleBytesToMarkBasedOnTime(double time_ms) {
 }
 
 void IncrementalMarking::AdvanceFromTask() {
-  AdvanceWithDeadline(StepOrigin::kTask);
+  ScheduleBytesToMarkBasedOnTime(heap()->MonotonicallyIncreasingTimeInMs());
+  FastForwardScheduleIfCloseToFinalization();
+  Step(kStepSizeInMs, StepOrigin::kTask);
   heap()->FinalizeIncrementalMarkingIfComplete(
       GarbageCollectionReason::kFinalizeMarkingViaTask);
 }
@@ -676,11 +678,6 @@ void IncrementalMarking::AdvanceOnAllocation() {
     return;
   }
 
-  NestedTimedHistogramScope incremental_marking_scope(
-      heap_->isolate()->counters()->gc_incremental_marking());
-  TRACE_EVENT0("v8", "V8.GCIncrementalMarking");
-  TRACE_GC_EPOCH(heap_->tracer(), GCTracer::Scope::MC_INCREMENTAL,
-                 ThreadKind::kMain);
   ScheduleBytesToMarkBasedOnAllocation();
   Step(kMaxStepSizeInMs, StepOrigin::kV8);
 
@@ -696,20 +693,6 @@ void IncrementalMarking::AdvanceOnAllocation() {
   }
 }
 
-void IncrementalMarking::AdvanceWithDeadline(StepOrigin step_origin) {
-  NestedTimedHistogramScope incremental_marking_scope(
-      heap_->isolate()->counters()->gc_incremental_marking());
-  TRACE_EVENT1("v8", "V8.GCIncrementalMarking", "epoch",
-               heap_->tracer()->CurrentEpoch(GCTracer::Scope::MC_INCREMENTAL));
-  TRACE_GC_EPOCH(heap_->tracer(), GCTracer::Scope::MC_INCREMENTAL,
-                 ThreadKind::kMain);
-  DCHECK(IsRunning());
-
-  ScheduleBytesToMarkBasedOnTime(heap()->MonotonicallyIncreasingTimeInMs());
-  FastForwardScheduleIfCloseToFinalization();
-  Step(kStepSizeInMs, step_origin);
-}
-
 bool IncrementalMarking::ShouldFinalize() const {
   DCHECK(IsRunning());
 
@@ -810,6 +793,12 @@ size_t IncrementalMarking::ComputeStepSizeInBytes(StepOrigin step_origin) {
 
 void IncrementalMarking::Step(double max_step_size_in_ms,
                               StepOrigin step_origin) {
+  NestedTimedHistogramScope incremental_marking_scope(
+      heap_->isolate()->counters()->gc_incremental_marking());
+  TRACE_EVENT1("v8", "V8.GCIncrementalMarking", "epoch",
+               heap_->tracer()->CurrentEpoch(GCTracer::Scope::MC_INCREMENTAL));
+  TRACE_GC_EPOCH(heap_->tracer(), GCTracer::Scope::MC_INCREMENTAL,
+                 ThreadKind::kMain);
   DCHECK(IsRunning());
   double start = heap_->MonotonicallyIncreasingTimeInMs();