cc: Add raster tile priority queue construct perftest.

cc/resources/tile_manager_perftest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/time/time.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/resources/tile.h"
 #include "cc/resources/tile_priority.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
@@ skipping 157 matching lines @@
   }
 
   void CreateHighLowResAndSetAllTilesVisible() {
     // Active layer must get updated first so pending layer can share from it.
     active_root_layer_->CreateDefaultTilingsAndTiles();
     active_root_layer_->SetAllTilesVisible();
     pending_root_layer_->CreateDefaultTilingsAndTiles();
     pending_root_layer_->SetAllTilesVisible();
   }
 
-  void RunRasterIteratorTest(const std::string& test_name,
-                             unsigned tile_count) {
+  void RunRasterQueueConstructAndIterateTest(const std::string& test_name,
+                                             unsigned tile_count) {
+    TreePriority priorities[] = {SAME_PRIORITY_FOR_BOTH_TREES,
+                                 SMOOTHNESS_TAKES_PRIORITY,
+                                 NEW_CONTENT_TAKES_PRIORITY};
+    int priority_count = 0;
     timer_.Reset();
     do {
       int count = tile_count;
       RasterTilePriorityQueue queue;
-      host_impl_.BuildRasterQueue(&queue, SAME_PRIORITY_FOR_BOTH_TREES);
+      host_impl_.BuildRasterQueue(&queue, priorities[priority_count]);
       while (count--) {
         ASSERT_FALSE(queue.IsEmpty());
         ASSERT_TRUE(queue.Top() != NULL);
         queue.Pop();
       }
+      priority_count = (priority_count + 1) % arraysize(priorities);
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
-    perf_test::PrintResult("tile_manager_raster_tile_iterator",
+    perf_test::PrintResult(
+        "tile_manager_raster_tile_queue_construct_and_iterate",
+        "",
+        test_name,
+        timer_.LapsPerSecond(),
+        "runs/s",
+        true);
+  }
+
+  void RunRasterQueueConstructTest(const std::string& test_name) {
+    TreePriority priorities[] = {SAME_PRIORITY_FOR_BOTH_TREES,
+                                 SMOOTHNESS_TAKES_PRIORITY,
+                                 NEW_CONTENT_TAKES_PRIORITY};
+    int priority_count = 0;
+    timer_.Reset();
+    do {
+      RasterTilePriorityQueue queue;
+      host_impl_.BuildRasterQueue(&queue, priorities[priority_count]);
+      priority_count = (priority_count + 1) % arraysize(priorities);
+      timer_.NextLap();
+    } while (!timer_.HasTimeLimitExpired());
+
+    perf_test::PrintResult("tile_manager_raster_tile_queue_construct",
                            "",
                            test_name,
                            timer_.LapsPerSecond(),
                            "runs/s",
                            true);
   }
 
   std::vector<LayerImpl*> CreateLayers(int layer_count,
                                        int tiles_per_layer_count) {
     // Compute the width/height required for high res to get
@@ skipping 112 matching lines @@
   RunManageTilesTest("5_500", 5, 500);
   RunManageTilesTest("5_1000", 5, 1000);
   RunManageTilesTest("10_100", 10, 100);
   RunManageTilesTest("10_500", 10, 500);
   RunManageTilesTest("10_1000", 10, 1000);
   RunManageTilesTest("100_100", 100, 100);
   RunManageTilesTest("100_500", 100, 500);
   RunManageTilesTest("100_1000", 100, 1000);
 }
 
-TEST_F(TileManagerPerfTest, RasterTileIterator) {
+TEST_F(TileManagerPerfTest, RasterTileQueueConstructAndIterate) {
   SetupDefaultTrees(gfx::Size(10000, 10000));
   active_root_layer_->CreateDefaultTilingsAndTiles();
   pending_root_layer_->CreateDefaultTilingsAndTiles();
 
-  RunRasterIteratorTest("2_16", 16);
-  RunRasterIteratorTest("2_32", 32);
-  RunRasterIteratorTest("2_64", 64);
-  RunRasterIteratorTest("2_128", 128);
+  RunRasterQueueConstructAndIterateTest("2_16", 16);
+  RunRasterQueueConstructAndIterateTest("2_32", 32);
+  RunRasterQueueConstructAndIterateTest("2_64", 64);
+  RunRasterQueueConstructAndIterateTest("2_128", 128);
+}
+
+TEST_F(TileManagerPerfTest, RasterTileQueueConstruct) {

[reveman, 2014/07/21 19:17:00]

nit: not sure how you did this in other tests but it would be nice if
"Construct" test and code came before "ConstructAndIterate". if that's the case
for other tests please make this consistent, otherwise your call.

[vmpstr, 2014/07/21 19:29:27]

Done.

+  SetupDefaultTrees(gfx::Size(10000, 10000));
+  active_root_layer_->CreateDefaultTilingsAndTiles();
+  pending_root_layer_->CreateDefaultTilingsAndTiles();
+
+  RunRasterQueueConstructTest("2");
+
+  for (int i = 0; i < 8; ++i) {
+    PictureLayerTiling* tiling = active_root_layer_->AddTiling(i * 0.3f);
+    tiling->CreateAllTilesForTesting();
+  }
+
+  RunRasterQueueConstructTest("10");
+
+  for (int i = 0; i < 90; ++i) {
+    PictureLayerTiling* tiling =
+        active_root_layer_->AddTiling(1.0f + i * 0.03f);
+    tiling->CreateAllTilesForTesting();
+  }
+
+  RunRasterQueueConstructTest("100");
 }
 
 }  // namespace
 
 }  // namespace cc