[build] Move RuntimeCallStatsTimerScope into its own header

danelphick · V8 LUCI CQ · commit e63a71eafee3 · 2021-06-09T16:50:48.000Z
By moving this out of counters.h, counters.h no longer needs to depend on isolate.h. Change-Id: Ic5272e3b3a729c0a438124dc5cdc1835817f3341 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2949098 Auto-Submit: Dan Elphick <delphick@chromium.org> Reviewed-by: Ross McIlroy <rmcilroy@chromium.org> Commit-Queue: Dan Elphick <delphick@chromium.org> Cr-Commit-Position: refs/heads/master@{#75055}
diff --git a/BUILD.gn b/BUILD.gn
@@ -2792,6 +2792,7 @@ v8_header_set("v8_internal_headers") {
     "src/logging/log-utils.h",
     "src/logging/log.h",
     "src/logging/metrics.h",
+    "src/logging/runtime-call-stats-scope.h",
     "src/logging/runtime-call-stats.h",
     "src/logging/tracing-flags.h",
     "src/numbers/bignum-dtoa.h",
diff --git a/src/api/api-arguments-inl.h b/src/api/api-arguments-inl.h
@@ -6,11 +6,10 @@
 #define V8_API_API_ARGUMENTS_INL_H_
 
 #include "src/api/api-arguments.h"
-
 #include "src/api/api-inl.h"
 #include "src/debug/debug.h"
 #include "src/execution/vm-state-inl.h"
-#include "src/logging/counters.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/api-callbacks.h"
 #include "src/objects/slots-inl.h"
 #include "src/tracing/trace-event.h"
diff --git a/src/api/api-natives.cc b/src/api/api-natives.cc
@@ -7,6 +7,7 @@
 #include "src/api/api-inl.h"
 #include "src/common/message-template.h"
 #include "src/execution/isolate-inl.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/api-callbacks.h"
 #include "src/objects/hash-table-inl.h"
 #include "src/objects/lookup.h"
diff --git a/src/api/api.cc b/src/api/api.cc
@@ -59,6 +59,7 @@
 #include "src/json/json-stringifier.h"
 #include "src/logging/counters.h"
 #include "src/logging/metrics.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/logging/tracing-flags.h"
 #include "src/numbers/conversions-inl.h"
 #include "src/objects/api-callbacks.h"
diff --git a/src/ast/scopes.cc b/src/ast/scopes.cc
@@ -13,7 +13,7 @@
 #include "src/common/message-template.h"
 #include "src/heap/local-factory-inl.h"
 #include "src/init/bootstrapper.h"
-#include "src/logging/counters.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/module-inl.h"
 #include "src/objects/objects-inl.h"
 #include "src/objects/scope-info.h"
diff --git a/src/baseline/baseline-compiler.cc b/src/baseline/baseline-compiler.cc
@@ -8,13 +8,12 @@
 #if V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_ARM64 || \
     V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_RISCV64
 
-#include "src/baseline/baseline-compiler.h"
-
 #include <algorithm>
 #include <type_traits>
 
 #include "src/baseline/baseline-assembler-inl.h"
 #include "src/baseline/baseline-assembler.h"
+#include "src/baseline/baseline-compiler.h"
 #include "src/builtins/builtins-constructor.h"
 #include "src/builtins/builtins-descriptors.h"
 #include "src/builtins/builtins.h"
@@ -27,6 +26,7 @@
 #include "src/execution/frame-constants.h"
 #include "src/interpreter/bytecode-array-iterator.h"
 #include "src/interpreter/bytecode-flags.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/code.h"
 #include "src/objects/heap-object.h"
 #include "src/objects/instance-type.h"
diff --git a/src/baseline/baseline.cc b/src/baseline/baseline.cc
@@ -15,7 +15,7 @@
 #include "src/baseline/baseline-compiler.h"
 #include "src/debug/debug.h"
 #include "src/heap/factory-inl.h"
-#include "src/logging/counters.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/script-inl.h"
 #include "src/objects/shared-function-info-inl.h"
 
diff --git a/src/builtins/accessors.cc b/src/builtins/accessors.cc
@@ -12,7 +12,7 @@
 #include "src/execution/isolate-inl.h"
 #include "src/execution/messages.h"
 #include "src/heap/factory.h"
-#include "src/logging/counters.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/api-callbacks.h"
 #include "src/objects/contexts.h"
 #include "src/objects/field-index-inl.h"
diff --git a/src/builtins/builtins-api.cc b/src/builtins/builtins-api.cc
@@ -6,8 +6,8 @@
 #include "src/api/api-natives.h"
 #include "src/builtins/builtins-utils-inl.h"
 #include "src/builtins/builtins.h"
-#include "src/logging/counters.h"
 #include "src/logging/log.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/objects-inl.h"
 #include "src/objects/prototype.h"
 #include "src/objects/templates.h"
diff --git a/src/builtins/builtins-utils.h b/src/builtins/builtins-utils.h
@@ -10,6 +10,7 @@
 #include "src/execution/arguments.h"
 #include "src/execution/isolate.h"
 #include "src/heap/factory.h"
+#include "src/logging/runtime-call-stats-scope.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/codegen/compiler.cc b/src/codegen/compiler.cc
@@ -43,7 +43,9 @@
 #include "src/heap/parked-scope.h"
 #include "src/init/bootstrapper.h"
 #include "src/interpreter/interpreter.h"
+#include "src/logging/counters.h"
 #include "src/logging/log-inl.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/feedback-cell-inl.h"
 #include "src/objects/js-function-inl.h"
 #include "src/objects/map.h"
diff --git a/src/codegen/external-reference-table.cc b/src/codegen/external-reference-table.cc
@@ -6,6 +6,7 @@
 
 #include "src/builtins/accessors.h"
 #include "src/codegen/external-reference.h"
+#include "src/execution/isolate.h"
 #include "src/ic/stub-cache.h"
 #include "src/logging/counters.h"
 
diff --git a/src/compiler-dispatcher/compiler-dispatcher.cc b/src/compiler-dispatcher/compiler-dispatcher.cc
@@ -9,6 +9,8 @@
 #include "src/codegen/compiler.h"
 #include "src/flags/flags.h"
 #include "src/handles/global-handles.h"
+#include "src/logging/counters.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/objects-inl.h"
 #include "src/parsing/parse-info.h"
 #include "src/parsing/parser.h"
diff --git a/src/compiler-dispatcher/optimizing-compile-dispatcher.cc b/src/compiler-dispatcher/optimizing-compile-dispatcher.cc
@@ -14,6 +14,7 @@
 #include "src/init/v8.h"
 #include "src/logging/counters.h"
 #include "src/logging/log.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/objects-inl.h"
 #include "src/tasks/cancelable-task.h"
 #include "src/tracing/trace-event.h"
diff --git a/src/compiler/pipeline.cc b/src/compiler/pipeline.cc
@@ -86,6 +86,7 @@
 #include "src/heap/local-heap.h"
 #include "src/init/bootstrapper.h"
 #include "src/logging/counters.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/shared-function-info.h"
 #include "src/parsing/parse-info.h"
 #include "src/tracing/trace-event.h"
diff --git a/src/deoptimizer/deoptimizer.cc b/src/deoptimizer/deoptimizer.cc
@@ -17,6 +17,7 @@
 #include "src/handles/handles-inl.h"
 #include "src/logging/counters.h"
 #include "src/logging/log.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/js-function-inl.h"
 #include "src/objects/oddball.h"
 #include "src/snapshot/embedded/embedded-data.h"
diff --git a/src/diagnostics/objects-debug.cc b/src/diagnostics/objects-debug.cc
@@ -12,7 +12,7 @@
 #include "src/heap/read-only-heap.h"
 #include "src/ic/handler-configuration-inl.h"
 #include "src/init/bootstrapper.h"
-#include "src/logging/counters.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/allocation-site-inl.h"
 #include "src/objects/arguments-inl.h"
 #include "src/objects/bigint.h"
diff --git a/src/execution/arguments.h b/src/execution/arguments.h
@@ -6,7 +6,7 @@
 #define V8_EXECUTION_ARGUMENTS_H_
 
 #include "src/handles/handles.h"
-#include "src/logging/counters.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/objects.h"
 #include "src/objects/slots.h"
 #include "src/tracing/trace-event.h"
diff --git a/src/execution/execution.cc b/src/execution/execution.cc
@@ -9,7 +9,7 @@
 #include "src/execution/frames.h"
 #include "src/execution/isolate-inl.h"
 #include "src/execution/vm-state-inl.h"
-#include "src/logging/counters.h"
+#include "src/logging/runtime-call-stats-scope.h"
 
 #if V8_ENABLE_WEBASSEMBLY
 #include "src/compiler/wasm-compiler.h"  // Only for static asserts.
diff --git a/src/execution/isolate.cc b/src/execution/isolate.cc
@@ -63,6 +63,7 @@
 #include "src/logging/counters.h"
 #include "src/logging/log.h"
 #include "src/logging/metrics.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/numbers/hash-seed-inl.h"
 #include "src/objects/backing-store.h"
 #include "src/objects/elements.h"
diff --git a/src/execution/messages.cc b/src/execution/messages.cc
@@ -14,7 +14,7 @@
 #include "src/execution/frames-inl.h"
 #include "src/execution/frames.h"
 #include "src/execution/isolate-inl.h"
-#include "src/logging/counters.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/foreign-inl.h"
 #include "src/objects/js-array-inl.h"
 #include "src/objects/stack-frame-info-inl.h"
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
@@ -76,6 +76,7 @@
 #include "src/init/v8.h"
 #include "src/interpreter/interpreter.h"
 #include "src/logging/log.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/numbers/conversions.h"
 #include "src/objects/data-handler.h"
 #include "src/objects/feedback-vector.h"
diff --git a/src/heap/incremental-marking.cc b/src/heap/incremental-marking.cc
@@ -22,6 +22,7 @@
 #include "src/heap/objects-visiting.h"
 #include "src/heap/safepoint.h"
 #include "src/init/v8.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/numbers/conversions.h"
 #include "src/objects/data-handler-inl.h"
 #include "src/objects/embedder-data-array-inl.h"
diff --git a/src/heap/paged-spaces.cc b/src/heap/paged-spaces.cc
@@ -15,7 +15,7 @@
 #include "src/heap/memory-chunk-inl.h"
 #include "src/heap/paged-spaces-inl.h"
 #include "src/heap/read-only-heap.h"
-#include "src/logging/counters.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/string.h"
 #include "src/utils/utils.h"
 
diff --git a/src/init/bootstrapper.cc b/src/init/bootstrapper.cc
@@ -21,6 +21,7 @@
 #include "src/extensions/ignition-statistics-extension.h"
 #include "src/extensions/statistics-extension.h"
 #include "src/extensions/trigger-failure-extension.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/objects.h"
 #ifdef ENABLE_VTUNE_TRACEMARK
 #include "src/extensions/vtunedomain-support-extension.h"
diff --git a/src/interpreter/interpreter.cc b/src/interpreter/interpreter.cc
@@ -18,6 +18,7 @@
 #include "src/init/setup-isolate.h"
 #include "src/interpreter/bytecode-generator.h"
 #include "src/interpreter/bytecodes.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/objects-inl.h"
 #include "src/objects/shared-function-info.h"
 #include "src/objects/slots.h"
diff --git a/src/logging/counters.h b/src/logging/counters.h
@@ -13,9 +13,10 @@
 #include "src/base/platform/elapsed-timer.h"
 #include "src/base/platform/time.h"
 #include "src/common/globals.h"
-#include "src/execution/isolate.h"
 #include "src/logging/counters-definitions.h"
 #include "src/logging/runtime-call-stats.h"
+#include "src/objects/code-kind.h"
+#include "src/objects/fixed-array.h"
 #include "src/objects/objects.h"
 #include "src/utils/allocation.h"
 
@@ -27,6 +28,7 @@ namespace internal {
 // manipulated by name.
 
 class Counters;
+class Isolate;
 
 class StatsTable {
  public:
@@ -846,15 +848,6 @@ void HistogramTimer::Stop() {
   TimedHistogram::Stop(&timer_, counters()->isolate());
 }
 
-#ifdef V8_RUNTIME_CALL_STATS
-RuntimeCallTimerScope::RuntimeCallTimerScope(Isolate* isolate,
-                                             RuntimeCallCounterId counter_id) {
-  if (V8_LIKELY(!TracingFlags::is_runtime_stats_enabled())) return;
-  stats_ = isolate->counters()->runtime_call_stats();
-  stats_->Enter(&timer_, counter_id);
-}
-#endif  // defined(V8_RUNTIME_CALL_STATS)
-
 }  // namespace internal
 }  // namespace v8
 
diff --git a/src/logging/runtime-call-stats-scope.h b/src/logging/runtime-call-stats-scope.h
@@ -0,0 +1,39 @@
+// Copyright 2021 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef V8_LOGGING_RUNTIME_CALL_STATS_SCOPE_H_
+#define V8_LOGGING_RUNTIME_CALL_STATS_SCOPE_H_
+
+#include <memory>
+
+#include "src/execution/isolate.h"
+#include "src/logging/counters.h"
+#include "src/logging/runtime-call-stats.h"
+#include "src/logging/tracing-flags.h"
+
+namespace v8 {
+namespace internal {
+
+#ifdef V8_RUNTIME_CALL_STATS
+
+#define RCS_SCOPE(...) \
+  v8::internal::RuntimeCallTimerScope rcs_timer_scope(__VA_ARGS__)
+
+RuntimeCallTimerScope::RuntimeCallTimerScope(Isolate* isolate,
+                                             RuntimeCallCounterId counter_id) {
+  if (V8_LIKELY(!TracingFlags::is_runtime_stats_enabled())) return;
+  stats_ = isolate->counters()->runtime_call_stats();
+  stats_->Enter(&timer_, counter_id);
+}
+
+#else  // RUNTIME_CALL_STATS
+
+#define RCS_SCOPE(...)
+
+#endif  // defined(V8_RUNTIME_CALL_STATS)
+
+}  // namespace internal
+}  // namespace v8
+
+#endif  // V8_LOGGING_RUNTIME_CALL_STATS_SCOPE_H_
diff --git a/src/logging/runtime-call-stats.h b/src/logging/runtime-call-stats.h
@@ -29,9 +29,6 @@ namespace internal {
 
 #ifdef V8_RUNTIME_CALL_STATS
 
-#define RCS_SCOPE(...) \
-  v8::internal::RuntimeCallTimerScope rcs_timer_scope(__VA_ARGS__)
-
 class RuntimeCallCounter final {
  public:
   RuntimeCallCounter() : RuntimeCallCounter(nullptr) {}
@@ -743,7 +740,6 @@ class V8_NODISCARD RuntimeCallTimerScope {
 
 #else  // RUNTIME_CALL_STATS
 
-#define RCS_SCOPE(...)
 #define TRACE_HANDLER_STATS(...)
 #define CHANGE_CURRENT_RUNTIME_COUNTER(...)
 
diff --git a/src/objects/lookup-inl.h b/src/objects/lookup-inl.h
@@ -7,9 +7,12 @@
 
 #include "src/objects/lookup.h"
 
+// Include other inline headers *after* including lookup.h, such that e.g. the
+// definition of LookupIterator is available (and this comment prevents
+// clang-format from merging that include into the following ones).
 #include "src/handles/handles-inl.h"
 #include "src/heap/factory-inl.h"
-#include "src/logging/counters.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/api-callbacks.h"
 #include "src/objects/internal-index.h"
 #include "src/objects/map-inl.h"
diff --git a/src/objects/map.cc b/src/objects/map.cc
@@ -11,6 +11,7 @@
 #include "src/heap/heap-write-barrier-inl.h"
 #include "src/init/bootstrapper.h"
 #include "src/logging/log.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/arguments-inl.h"
 #include "src/objects/descriptor-array.h"
 #include "src/objects/elements-kind.h"
diff --git a/src/objects/objects.cc b/src/objects/objects.cc
@@ -43,6 +43,7 @@
 #include "src/init/bootstrapper.h"
 #include "src/logging/counters.h"
 #include "src/logging/log.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/allocation-site-inl.h"
 #include "src/objects/allocation-site-scopes.h"
 #include "src/objects/api-callbacks.h"
diff --git a/src/parsing/parser-base.h b/src/parsing/parser-base.h
@@ -6,6 +6,7 @@
 #define V8_PARSING_PARSER_BASE_H_
 
 #include <stdint.h>
+
 #include <utility>
 #include <vector>
 
@@ -18,8 +19,8 @@
 #include "src/codegen/bailout-reason.h"
 #include "src/common/globals.h"
 #include "src/common/message-template.h"
-#include "src/logging/counters.h"
 #include "src/logging/log.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/objects/function-kind.h"
 #include "src/parsing/expression-scope.h"
 #include "src/parsing/func-name-inferrer.h"
diff --git a/src/parsing/parser.cc b/src/parsing/parser.cc
@@ -20,6 +20,7 @@
 #include "src/compiler-dispatcher/compiler-dispatcher.h"
 #include "src/logging/counters.h"
 #include "src/logging/log.h"
+#include "src/logging/runtime-call-stats-scope.h"
 #include "src/numbers/conversions-inl.h"
 #include "src/objects/scope-info.h"
 #include "src/parsing/parse-info.h"
diff --git a/src/parsing/preparser.cc b/src/parsing/preparser.cc
diff --git a/src/parsing/rewriter.cc b/src/parsing/rewriter.cc
diff --git a/src/parsing/scanner-character-streams.cc b/src/parsing/scanner-character-streams.cc
diff --git a/src/snapshot/code-serializer.cc b/src/snapshot/code-serializer.cc
diff --git a/src/snapshot/snapshot.cc b/src/snapshot/snapshot.cc
diff --git a/src/web-snapshot/web-snapshot.cc b/src/web-snapshot/web-snapshot.cc
