From 8b231d80ca253f82c5a0b1ec032f83384fdebb0c Mon Sep 17 00:00:00 2001 From: Clemens Backes Date: Tue, 6 Dec 2022 14:53:13 +0100 Subject: [PATCH] [wasm] Remove deprecated CPU timings in metrics The fields were deprecated in https://crrev.com/c/4079227; remove them now. R=mlippautz@chromium.org Bug: v8:13565 Change-Id: I02429bd050fde42873fc77de9151337cccb16411 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4083069 Reviewed-by: Michael Lippautz Commit-Queue: Clemens Backes Cr-Commit-Position: refs/heads/main@{#85594} --- include/v8-metrics.h | 48 -------------------------------------------- 1 file changed, 48 deletions(-) diff --git a/include/v8-metrics.h b/include/v8-metrics.h index 418531e22b..5c6c1c4705 100644 --- a/include/v8-metrics.h +++ b/include/v8-metrics.h @@ -108,34 +108,12 @@ struct WasmModuleDecoded { function_count(function_count), wall_clock_duration_in_us(wall_clock_duration_in_us) {} - V8_DEPRECATED("Use the version without cpu_duration_in_us") - WasmModuleDecoded(bool async, bool streamed, bool success, - size_t module_size_in_bytes, size_t function_count, - int64_t wall_clock_duration_in_us, - int64_t cpu_duration_in_us) - : async(async), - streamed(streamed), - success(success), - module_size_in_bytes(module_size_in_bytes), - function_count(function_count), - wall_clock_duration_in_us(wall_clock_duration_in_us), - cpu_duration_in_us(cpu_duration_in_us) {} - - START_ALLOW_USE_DEPRECATED() - // Copy constructor and copy assignment operator are allowed to copy the - // {cpu_duration_in_us} field. - WasmModuleDecoded(const WasmModuleDecoded&) = default; - WasmModuleDecoded& operator=(const WasmModuleDecoded&) = default; - END_ALLOW_USE_DEPRECATED() - bool async = false; bool streamed = false; bool success = false; size_t module_size_in_bytes = 0; size_t function_count = 0; int64_t wall_clock_duration_in_us = -1; - V8_DEPRECATED("We do not collect cpu times any more") - int64_t cpu_duration_in_us = -1; }; struct WasmModuleCompiled { @@ -155,30 +133,6 @@ struct WasmModuleCompiled { liftoff_bailout_count(liftoff_bailout_count), wall_clock_duration_in_us(wall_clock_duration_in_us) {} - V8_DEPRECATED("Use the version without cpu_duration_in_us") - WasmModuleCompiled(bool async, bool streamed, bool cached, bool deserialized, - bool lazy, bool success, size_t code_size_in_bytes, - size_t liftoff_bailout_count, - int64_t wall_clock_duration_in_us, - int64_t cpu_duration_in_us) - : async(async), - streamed(streamed), - cached(cached), - deserialized(deserialized), - lazy(lazy), - success(success), - code_size_in_bytes(code_size_in_bytes), - liftoff_bailout_count(liftoff_bailout_count), - wall_clock_duration_in_us(wall_clock_duration_in_us), - cpu_duration_in_us(cpu_duration_in_us) {} - - START_ALLOW_USE_DEPRECATED() - // Copy constructor and copy assignment operator are allowed to copy the - // {cpu_duration_in_us} field. - WasmModuleCompiled(const WasmModuleCompiled&) = default; - WasmModuleCompiled& operator=(const WasmModuleCompiled&) = default; - END_ALLOW_USE_DEPRECATED() - bool async = false; bool streamed = false; bool cached = false; @@ -188,8 +142,6 @@ struct WasmModuleCompiled { size_t code_size_in_bytes = 0; size_t liftoff_bailout_count = 0; int64_t wall_clock_duration_in_us = -1; - V8_DEPRECATED("We do not collect cpu times any more") - int64_t cpu_duration_in_us = -1; }; struct WasmModuleInstantiated {