Evicting unused cache entries before RasterCache actions

Author: ColdPaleLight

flow/frame_timings_recorder_unittests.cc

@@ -102,6 +102,7 @@ TEST(FrameTimingsRecorderTest, RecordRasterTimesWithCache) {
   cache.AddMockPicture(100, 100);
   size_t picture_bytes = cache.EstimatePictureCacheByteSize();
   EXPECT_GT(picture_bytes, 0u);
+  cache.ClearUnusedEntry();
 
   cache.CleanupAfterFrame();
 
@@ -266,7 +267,7 @@ TEST(FrameTimingsRecorderTest, ClonedHasSameRasterEndWithCache) {
   cache.AddMockPicture(100, 100);
   size_t picture_bytes = cache.EstimatePictureCacheByteSize();
   EXPECT_GT(picture_bytes, 0u);
-
+  cache.ClearUnusedEntry();
   cache.CleanupAfterFrame();
   recorder->RecordRasterEnd(&cache);
 

flow/layers/container_layer_unittests.cc

@@ -270,6 +270,7 @@ TEST_F(ContainerLayerTest, RasterCacheTest) {
     use_mock_raster_cache();
     preroll_context()->raster_cache->PrepareNewFrame();
     layer->Preroll(preroll_context(), SkMatrix::I());
+    preroll_context()->raster_cache->ClearUnusedEntry();
     // Cache the cacheable entries
     LayerTree::TryToRasterCache(*(preroll_context()->raster_cached_entries),
                                 &paint_context());
@@ -309,6 +310,7 @@ TEST_F(ContainerLayerTest, RasterCacheTest) {
     preroll_context()->raster_cached_entries->clear();
     preroll_context()->raster_cache->PrepareNewFrame();
     layer->Preroll(preroll_context(), SkMatrix::I());
+    preroll_context()->raster_cache->ClearUnusedEntry();
 
     // Cache the cacheable entries
     LayerTree::TryToRasterCache(*(preroll_context()->raster_cached_entries),
@@ -352,7 +354,7 @@ TEST_F(ContainerLayerTest, RasterCacheTest) {
     preroll_context()->raster_cache->PrepareNewFrame();
     preroll_context()->raster_cached_entries->clear();
     layer->Preroll(preroll_context(), SkMatrix::I());
-
+    preroll_context()->raster_cache->ClearUnusedEntry();
     // Cache the cacheable entries
     LayerTree::TryToRasterCache(*(preroll_context()->raster_cached_entries),
                                 &paint_context());
@@ -393,6 +395,7 @@ TEST_F(ContainerLayerTest, RasterCacheTest) {
     // frame4
     preroll_context()->raster_cached_entries->clear();
     layer->Preroll(preroll_context(), SkMatrix::I());
+    preroll_context()->raster_cache->ClearUnusedEntry();
     LayerTree::TryToRasterCache(*(preroll_context()->raster_cached_entries),
                                 &paint_context());
     preroll_context()->raster_cache->CleanupAfterFrame();

flow/layers/layer_tree.cc

@@ -150,6 +150,7 @@ void LayerTree::Paint(CompositorContext::ScopedFrame& frame,
   };
 
   if (cache) {
+    cache->ClearUnusedEntry();
     TryToRasterCache(raster_cache_items_, &context, ignore_raster_cache);
   }
 

flow/raster_cache.cc

@@ -166,14 +166,10 @@ void RasterCache::PrepareNewFrame() {
 void RasterCache::SweepOneCacheAfterFrame(RasterCacheKey::Map<Entry>& cache,
                                           RasterCacheMetrics& picture_metrics,
                                           RasterCacheMetrics& layer_metrics) {
-  std::vector<RasterCacheKey::Map<Entry>::iterator> dead;
-
   for (auto it = cache.begin(); it != cache.end(); ++it) {
     Entry& entry = it->second;
-
-    if (!entry.encountered_this_frame) {
-      dead.push_back(it);
-    } else if (entry.image) {
+    FML_CHECK(entry.encountered_this_frame);
+    if (entry.image) {
       RasterCacheKeyKind kind = it->first.kind();
       switch (kind) {
         case RasterCacheKeyKind::kDisplayListMetrics:
@@ -188,28 +184,40 @@ void RasterCache::SweepOneCacheAfterFrame(RasterCacheKey::Map<Entry>& cache,
     }
     entry.encountered_this_frame = false;
   }
+}
+
+void RasterCache::ClearUnusedEntry() {
+  picture_metrics_ = {};
+  layer_metrics_ = {};
+
+  std::vector<RasterCacheKey::Map<Entry>::iterator> dead;
+
+  for (auto it = cache_.begin(); it != cache_.end(); ++it) {
+    Entry& entry = it->second;
+    if (!entry.encountered_this_frame) {
+      dead.push_back(it);
+    }
+  }
 
   for (auto it : dead) {
     if (it->second.image) {
       RasterCacheKeyKind kind = it->first.kind();
       switch (kind) {
         case RasterCacheKeyKind::kDisplayListMetrics:
-          picture_metrics.eviction_count++;
-          picture_metrics.eviction_bytes += it->second.image->image_bytes();
+          picture_metrics_.eviction_count++;
+          picture_metrics_.eviction_bytes += it->second.image->image_bytes();
           break;
         case RasterCacheKeyKind::kLayerMetrics:
-          layer_metrics.eviction_count++;
-          layer_metrics.eviction_bytes += it->second.image->image_bytes();
+          layer_metrics_.eviction_count++;
+          layer_metrics_.eviction_bytes += it->second.image->image_bytes();
           break;
       }
     }
-    cache.erase(it);
+    cache_.erase(it);
   }
 }
 
 void RasterCache::CleanupAfterFrame() {
-  picture_metrics_ = {};
-  layer_metrics_ = {};
   SweepOneCacheAfterFrame(cache_, picture_metrics_, layer_metrics_);
   TraceStatsToTimeline();
 }

flow/raster_cache.h

@@ -127,6 +127,8 @@ class RasterCache {
 
   void PrepareNewFrame();
 
+  void ClearUnusedEntry();
+
   void CleanupAfterFrame();
 
   void Clear();

flow/raster_cache_unittests.cc

@@ -275,6 +275,7 @@ TEST(RasterCache, SweepsRemoveUnusedSkPictures) {
   cache.CleanupAfterFrame();
 
   cache.PrepareNewFrame();
+  cache.ClearUnusedEntry();
   cache.CleanupAfterFrame();  // Extra frame without a Get image access.
 
   cache.PrepareNewFrame();
@@ -319,6 +320,7 @@ TEST(RasterCache, SweepsRemoveUnusedDisplayLists) {
   cache.CleanupAfterFrame();
 
   cache.PrepareNewFrame();
+  cache.ClearUnusedEntry();
   cache.CleanupAfterFrame();  // Extra frame without a Get image access.
 
   cache.PrepareNewFrame();