Revert "Expose the number of microtasks from RunMicrotasks"
This reverts commit 516d90685be84cc944ada034d065269ec189f695.
Reason for revert: Breaks layout tests:
https://ci.chromium.org/p/v8/builders/luci.v8.ci/V8-Blink%20Linux%2064/29444
See also:
https://v8.dev/docs/blink-layout-tests
Original change's description:
> Expose the number of microtasks from RunMicrotasks
>
> This CL adds the number of processed microtasks to the tracing marker
> of RunMicrotasks, plus let RunMicrotasks return the number.
>
> Bug: v8:7804, v8:8124
> Change-Id: Ie584e22964121fbda3a822379d760e7518fc54a7
> Reviewed-on: https://chromium-review.googlesource.com/c/1425277
> Commit-Queue: Taiju Tsuiki <tzik@chromium.org>
> Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#59017}
TBR=bmeurer@chromium.org,tzik@chromium.org
Change-Id: I7db675dbbc496cc3c45220aa141252dd371d2780
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: v8:7804, v8:8124
Reviewed-on: https://chromium-review.googlesource.com/c/1429859
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#59018}diff --git a/src/builtins/builtins-microtask-queue-gen.cc b/src/builtins/builtins-microtask-queue-gen.cc
index de59e75..0c00777 100644
--- a/src/builtins/builtins-microtask-queue-gen.cc
+++ b/src/builtins/builtins-microtask-queue-gen.cc
@@ -35,7 +35,6 @@
TNode<IntPtrT> index);
void RunSingleMicrotask(TNode<Context> current_context,
TNode<Microtask> microtask);
- void IncrementFinishedMicrotaskCount(TNode<RawPtrT> microtask_queue);
TNode<Context> GetCurrentContext();
void SetCurrentContext(TNode<Context> context);
@@ -312,17 +311,6 @@
BIND(&done);
}
-void MicrotaskQueueBuiltinsAssembler::IncrementFinishedMicrotaskCount(
- TNode<RawPtrT> microtask_queue) {
- TNode<IntPtrT> count = UncheckedCast<IntPtrT>(
- Load(MachineType::IntPtr(), microtask_queue,
- IntPtrConstant(MicrotaskQueue::kFinishedMicrotaskCountOffset)));
- TNode<IntPtrT> new_count = IntPtrAdd(count, IntPtrConstant(1));
- StoreNoWriteBarrier(
- MachineType::PointerRepresentation(), microtask_queue,
- IntPtrConstant(MicrotaskQueue::kFinishedMicrotaskCountOffset), new_count);
-}
-
TNode<Context> MicrotaskQueueBuiltinsAssembler::GetCurrentContext() {
auto ref = ExternalReference::Create(kContextAddress, isolate());
return TNode<Context>::UncheckedCast(
@@ -543,7 +531,6 @@
SetMicrotaskQueueStart(microtask_queue, new_start);
RunSingleMicrotask(current_context, microtask);
- IncrementFinishedMicrotaskCount(microtask_queue);
Goto(&loop);
BIND(&done);
diff --git a/src/microtask-queue.cc b/src/microtask-queue.cc
index 98c10b0..5010b0b 100644
--- a/src/microtask-queue.cc
+++ b/src/microtask-queue.cc
@@ -25,8 +25,6 @@
OFFSET_OF(MicrotaskQueue, capacity_);
const size_t MicrotaskQueue::kSizeOffset = OFFSET_OF(MicrotaskQueue, size_);
const size_t MicrotaskQueue::kStartOffset = OFFSET_OF(MicrotaskQueue, start_);
-const size_t MicrotaskQueue::kFinishedMicrotaskCountOffset =
- OFFSET_OF(MicrotaskQueue, finished_microtask_count_);
const intptr_t MicrotaskQueue::kMinimumCapacity = 8;
@@ -116,27 +114,20 @@
return 0;
}
- intptr_t base_count = finished_microtask_count_;
-
HandleScope handle_scope(isolate);
MaybeHandle<Object> maybe_exception;
MaybeHandle<Object> maybe_result;
- int processed_microtask_count;
{
SetIsRunningMicrotasks scope(&is_running_microtasks_);
v8::Isolate::SuppressMicrotaskExecutionScope suppress(
reinterpret_cast<v8::Isolate*>(isolate));
HandleScopeImplementer::EnteredContextRewindScope rewind_scope(
isolate->handle_scope_implementer());
- TRACE_EVENT_BEGIN0("v8.execute", "RunMicrotasks");
+ TRACE_EVENT0("v8.execute", "RunMicrotasks");
TRACE_EVENT_CALL_STATS_SCOPED(isolate, "v8", "V8.RunMicrotasks");
maybe_result = Execution::TryRunMicrotasks(isolate, this, &maybe_exception);
- processed_microtask_count =
- static_cast<int>(finished_microtask_count_ - base_count);
- TRACE_EVENT_END1("v8.execute", "RunMicrotasks", "microtask_count",
- processed_microtask_count);
}
// If execution is terminating, clean up and propagate that to TryCatch scope.
@@ -153,7 +144,8 @@
DCHECK_EQ(0, size());
OnCompleted(isolate);
- return processed_microtask_count;
+ // TODO(tzik): Return the number of microtasks run in this round.
+ return 0;
}
void MicrotaskQueue::IterateMicrotasks(RootVisitor* visitor) {
diff --git a/src/microtask-queue.h b/src/microtask-queue.h
index 302469a..c4db47a 100644
--- a/src/microtask-queue.h
+++ b/src/microtask-queue.h
@@ -37,9 +37,9 @@
void EnqueueMicrotask(Microtask microtask);
- // Runs all queued Microtasks.
- // Returns -1 if the execution is terminating, otherwise, returns the number
- // of microtasks that ran in this round.
+ // Returns -1 if the execution is terminating, otherwise, returns 0.
+ // TODO(tzik): Update the implementation to return the number of processed
+ // microtasks.
int RunMicrotasks(Isolate* isolate);
// Iterate all pending Microtasks in this queue as strong roots, so that
@@ -86,7 +86,6 @@
static const size_t kCapacityOffset;
static const size_t kSizeOffset;
static const size_t kStartOffset;
- static const size_t kFinishedMicrotaskCountOffset;
static const intptr_t kMinimumCapacity;
@@ -104,9 +103,6 @@
intptr_t start_ = 0;
Address* ring_buffer_ = nullptr;
- // The number of finished microtask.
- intptr_t finished_microtask_count_ = 0;
-
// MicrotaskQueue instances form a doubly linked list loop, so that all
// instances are reachable through |next_|.
MicrotaskQueue* next_ = nullptr;
diff --git a/test/unittests/microtask-queue-unittest.cc b/test/unittests/microtask-queue-unittest.cc
index 70285d4..cc2c7f0 100644
--- a/test/unittests/microtask-queue-unittest.cc
+++ b/test/unittests/microtask-queue-unittest.cc
@@ -88,7 +88,7 @@
}));
EXPECT_EQ(MicrotaskQueue::kMinimumCapacity, microtask_queue()->capacity());
EXPECT_EQ(1, microtask_queue()->size());
- EXPECT_EQ(1, microtask_queue()->RunMicrotasks(isolate()));
+ microtask_queue()->RunMicrotasks(isolate());
EXPECT_TRUE(ran);
EXPECT_EQ(0, microtask_queue()->size());
}
@@ -100,7 +100,7 @@
// Enqueue and flush the queue first to have non-zero |start_|.
microtask_queue()->EnqueueMicrotask(
*NewMicrotask([&count] { EXPECT_EQ(0, count++); }));
- EXPECT_EQ(1, microtask_queue()->RunMicrotasks(isolate()));
+ microtask_queue()->RunMicrotasks(isolate());
EXPECT_LT(0, microtask_queue()->capacity());
EXPECT_EQ(0, microtask_queue()->size());
@@ -122,8 +122,7 @@
EXPECT_EQ(MicrotaskQueue::kMinimumCapacity + 1, microtask_queue()->size());
// Run all pending Microtasks to ensure they run in the proper order.
- EXPECT_EQ(MicrotaskQueue::kMinimumCapacity + 1,
- microtask_queue()->RunMicrotasks(isolate()));
+ microtask_queue()->RunMicrotasks(isolate());
EXPECT_EQ(MicrotaskQueue::kMinimumCapacity + 2, count);
}
@@ -164,8 +163,7 @@
for (int i = 0; i < MicrotaskQueue::kMinimumCapacity / 2 + 1; ++i) {
microtask_queue()->EnqueueMicrotask(*NewMicrotask([] {}));
}
- EXPECT_EQ(MicrotaskQueue::kMinimumCapacity / 2 + 1,
- microtask_queue()->RunMicrotasks(isolate()));
+ microtask_queue()->RunMicrotasks(isolate());
std::vector<Object> expected;
for (int i = 0; i < MicrotaskQueue::kMinimumCapacity / 2 + 1; ++i) {
