gpu: Remove Unused GPU Memory Tracking Histograms

These GPU Memory Tracking UMA is no longer used. The sum of these
memory tracking can be found Memory.Gpu.PrivateMemoryFootprint. The
latest memory tracking uses the peak memory observer.

Bug: 928615, 1112389
Change-Id: Ia4ced34d8e1b7c7135b95d69219e1f5f4fe6e054
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2469076Reviewed-by: Khushal <khushalsagar@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Jonathan Ross <jonross@chromium.org>
Reviewed-by: Brian White <bcwhite@chromium.org>
Commit-Queue: weiliangc <weiliangc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818032}

gpu/command_buffer/service/gpu_command_buffer_memory_tracker.cc

@@ -11,58 +11,19 @@
 #include "gpu/ipc/common/command_buffer_id.h"
 #include "gpu/ipc/common/gpu_peak_memory.h"
 
-// Macro to reduce code duplication when logging memory in
-// GpuCommandBufferMemoryTracker. This is needed as the UMA_HISTOGRAM_* macros
-// require a unique call-site per histogram (you can't funnel multiple strings
-// into the same call-site).
-#define GPU_COMMAND_BUFFER_MEMORY_BLOCK(category)                          \
-  do {                                                                     \
-    uint64_t mb_used = size_ / (1024 * 1024);                              \
-    switch (context_type_) {                                               \
-      case CONTEXT_TYPE_WEBGL1:                                            \
-      case CONTEXT_TYPE_WEBGL2:                                            \
-      case CONTEXT_TYPE_WEBGL2_COMPUTE:                                    \
-        UMA_HISTOGRAM_MEMORY_LARGE_MB("GPU.ContextMemory.WebGL." category, \
-                                      mb_used);                            \
-        break;                                                             \
-      case CONTEXT_TYPE_OPENGLES2:                                         \
-      case CONTEXT_TYPE_OPENGLES3:                                         \
-        UMA_HISTOGRAM_MEMORY_LARGE_MB("GPU.ContextMemory.GLES." category,  \
-                                      mb_used);                            \
-        break;                                                             \
-      case CONTEXT_TYPE_WEBGPU:                                            \
-        break;                                                             \
-    }                                                                      \
-  } while (false)
-
 namespace gpu {
 
 GpuCommandBufferMemoryTracker::GpuCommandBufferMemoryTracker(
     CommandBufferId command_buffer_id,
     uint64_t client_tracing_id,
-    ContextType context_type,
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
     Observer* observer)
     : command_buffer_id_(command_buffer_id),
       client_tracing_id_(client_tracing_id),
-      context_type_(context_type),
-      memory_pressure_listener_(
-          FROM_HERE,
-          base::BindRepeating(
-              &GpuCommandBufferMemoryTracker::LogMemoryStatsPressure,
-              base::Unretained(this))),
       observer_(observer) {
-  // Set up |memory_stats_timer_| to call LogMemoryPeriodic periodically
-  // via the provided |task_runner|.
-  memory_stats_timer_.SetTaskRunner(std::move(task_runner));
-  memory_stats_timer_.Start(
-      FROM_HERE, base::TimeDelta::FromSeconds(30), this,
-      &GpuCommandBufferMemoryTracker::LogMemoryStatsPeriodic);
 }
 
-GpuCommandBufferMemoryTracker::~GpuCommandBufferMemoryTracker() {
-  LogMemoryStatsShutdown();
-}
+GpuCommandBufferMemoryTracker::~GpuCommandBufferMemoryTracker() = default;
 
 void GpuCommandBufferMemoryTracker::TrackMemoryAllocatedChange(int64_t delta) {
   DCHECK(delta >= 0 || size_ >= static_cast<uint64_t>(-delta));
@@ -90,21 +51,4 @@ uint64_t GpuCommandBufferMemoryTracker::ContextGroupTracingId() const {
   return command_buffer_id_.GetUnsafeValue();
 }
 
-void GpuCommandBufferMemoryTracker::LogMemoryStatsPeriodic() {
-  GPU_COMMAND_BUFFER_MEMORY_BLOCK("Periodic");
-}
-
-void GpuCommandBufferMemoryTracker::LogMemoryStatsShutdown() {
-  GPU_COMMAND_BUFFER_MEMORY_BLOCK("Shutdown");
-}
-
-void GpuCommandBufferMemoryTracker::LogMemoryStatsPressure(
-    base::MemoryPressureListener::MemoryPressureLevel pressure_level) {
-  // Only log on CRITICAL memory pressure.
-  if (pressure_level ==
-      base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL) {
-    GPU_COMMAND_BUFFER_MEMORY_BLOCK("Pressure");
-  }
-}
-
 }  // namespace gpu

gpu/command_buffer/service/gpu_command_buffer_memory_tracker.h

@@ -24,7 +24,6 @@ class GPU_GLES2_EXPORT GpuCommandBufferMemoryTracker : public MemoryTracker {
   GpuCommandBufferMemoryTracker(
       CommandBufferId command_buffer_id,
       uint64_t client_tracing_id,
-      ContextType context_type,
       scoped_refptr<base::SingleThreadTaskRunner> task_runner,
       Observer* observer);
   ~GpuCommandBufferMemoryTracker() override;
@@ -37,20 +36,10 @@ class GPU_GLES2_EXPORT GpuCommandBufferMemoryTracker : public MemoryTracker {
   uint64_t ContextGroupTracingId() const override;
 
  private:
-  void LogMemoryStatsPeriodic();
-  void LogMemoryStatsShutdown();
-  void LogMemoryStatsPressure(
-      base::MemoryPressureListener::MemoryPressureLevel pressure_level);
-
   uint64_t size_ = 0;
   const CommandBufferId command_buffer_id_;
   const uint64_t client_tracing_id_;
 
-  // Variables used in memory stat histogram logging.
-  const ContextType context_type_;
-  base::RepeatingTimer memory_stats_timer_;
-  base::MemoryPressureListener memory_pressure_listener_;
-
   MemoryTracker::Observer* const observer_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferMemoryTracker);

gpu/ipc/in_process_command_buffer.cc

@@ -358,7 +358,7 @@ gpu::ContextResult InProcessCommandBuffer::InitializeOnGpuThread(
         base::trace_event::MemoryDumpManager::GetInstance()
             ->GetTracingProcessId();
     memory_tracker = std::make_unique<GpuCommandBufferMemoryTracker>(
-        command_buffer_id_, client_tracing_id, params.attribs.context_type,
+        command_buffer_id_, client_tracing_id,
         base::ThreadTaskRunnerHandle::Get(), /* obserer=*/nullptr);
   }
 

gpu/ipc/service/command_buffer_stub.cc

@@ -649,15 +649,14 @@ void CommandBufferStub::RemoveDestructionObserver(
   destruction_observers_.RemoveObserver(observer);
 }
 
-std::unique_ptr<MemoryTracker> CommandBufferStub::CreateMemoryTracker(
-    const GPUCreateCommandBufferConfig& init_params) const {
+std::unique_ptr<MemoryTracker> CommandBufferStub::CreateMemoryTracker() const {
   MemoryTrackerFactory current_factory = GetMemoryTrackerFactory();
   if (current_factory)
-    return current_factory.Run(init_params);
+    return current_factory.Run();
 
   return std::make_unique<GpuCommandBufferMemoryTracker>(
       command_buffer_id_, channel_->client_tracing_id(),
-      init_params.attribs.context_type, channel_->task_runner(),
+      channel_->task_runner(),
       channel_->gpu_channel_manager()->peak_memory_monitor());
 }
 

gpu/ipc/service/command_buffer_stub.h

@@ -106,8 +106,7 @@ class GPU_IPC_SERVICE_EXPORT CommandBufferStub
   void HandleReturnData(base::span<const uint8_t> data) override;
 
   using MemoryTrackerFactory =
-      base::RepeatingCallback<std::unique_ptr<MemoryTracker>(
-          const GPUCreateCommandBufferConfig&)>;
+      base::RepeatingCallback<std::unique_ptr<MemoryTracker>()>;
 
   // Overrides the way CreateMemoryTracker() uses to create a MemoryTracker.
   // This is intended for mocking the MemoryTracker in tests.
@@ -146,8 +145,7 @@ class GPU_IPC_SERVICE_EXPORT CommandBufferStub
  protected:
   virtual bool HandleMessage(const IPC::Message& message) = 0;
 
-  std::unique_ptr<MemoryTracker> CreateMemoryTracker(
-      const GPUCreateCommandBufferConfig& init_params) const;
+  std::unique_ptr<MemoryTracker> CreateMemoryTracker() const;
 
   // Must be called during Initialize(). Takes ownership to co-ordinate
   // teardown in Destroy().

gpu/ipc/service/gles2_command_buffer_stub.cc

@@ -107,7 +107,7 @@ gpu::ContextResult GLES2CommandBufferStub::Initialize(
         manager->gpu_memory_buffer_factory();
     context_group_ = new gles2::ContextGroup(
         manager->gpu_preferences(), gles2::PassthroughCommandDecoderSupported(),
-        manager->mailbox_manager(), CreateMemoryTracker(init_params),
+        manager->mailbox_manager(), CreateMemoryTracker(),
         manager->shader_translator_cache(),
         manager->framebuffer_completeness_cache(), feature_info,
         init_params.attribs.bind_generates_resource, channel_->image_manager(),

gpu/ipc/service/image_decode_accelerator_stub_unittest.cc

@@ -100,8 +100,7 @@ struct ExpectedCacheEntry {
   SkISize dimensions;
 };
 
-std::unique_ptr<MemoryTracker> CreateMockMemoryTracker(
-    const GPUCreateCommandBufferConfig& init_params) {
+std::unique_ptr<MemoryTracker> CreateMockMemoryTracker() {
   return std::make_unique<NiceMock<gles2::MockMemoryTracker>>();
 }
 

gpu/ipc/service/raster_command_buffer_stub.cc

@@ -119,7 +119,7 @@ gpu::ContextResult RasterCommandBufferStub::Initialize(
   use_virtualized_gl_context_ =
       shared_context_state->use_virtualized_gl_contexts();
 
-  memory_tracker_ = CreateMemoryTracker(init_params);
+  memory_tracker_ = CreateMemoryTracker();
 
   command_buffer_ =
       std::make_unique<CommandBufferService>(this, memory_tracker_.get());

gpu/ipc/service/webgpu_command_buffer_stub.cc

@@ -106,7 +106,7 @@ gpu::ContextResult WebGPUCommandBufferStub::Initialize(
   share_group_ = manager->share_group();
   use_virtualized_gl_context_ = false;
 
-  memory_tracker_ = CreateMemoryTracker(init_params);
+  memory_tracker_ = CreateMemoryTracker();
 
   command_buffer_ =
       std::make_unique<CommandBufferService>(this, memory_tracker_.get());

tools/metrics/histograms/histograms_xml/gpu/histograms.xml

@@ -273,6 +273,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.ContextMemory" units="MB" expires_after="2020-09-13">
+  <obsolete>
+    Obsoleted since 2020/10/15. Unused and expired. Replaced by
+    Memory.Gpu.PrivateMemoryFootprint, Memory.GPU.PeakMemoryUsage, and
+    Memory.GPU.PeakMemoryAllocationSource.
+  </obsolete>
   <owner>ericrk@chromium.org</owner>
   <summary>The amount of memory used by a GL Context.</summary>
 </histogram>

tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml

@@ -6820,6 +6820,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram_suffixes>
 
 <histogram_suffixes name="GPU_ContextType" separator=".">
+  <obsolete>
+    Expired in 2020/10/15.
+  </obsolete>
   <suffix name="GLES" label="GLES Context."/>
   <suffix name="WebGL" label="WebGL Context."/>
   <affected-histogram name="GPU.ContextMemory"/>
@@ -6835,6 +6838,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram_suffixes>
 
 <histogram_suffixes name="GPU_MemorySamplingTime" separator=".">
+  <obsolete>
+    Expired in 2020/10/15.
+  </obsolete>
   <suffix name="Periodic" label="Sampled periodically."/>
   <suffix name="Pressure" label="Sampled on CRITICAL memory pressure signal."/>
   <suffix name="Shutdown" label="Sampled at shutdown."/>