Move BSP tree perf test to cc/output/.

It's weird to have a perf test for BSP tree stuff in the same file
as perf tests for CalcDrawProps.

R=enne
BUG=606056
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel

Review-Url: https://codereview.chromium.org/2320883002
Cr-Commit-Position: refs/heads/master@{#417357}

cc/BUILD.gn

@@ -998,6 +998,7 @@ test("cc_perftests") {
     "ipc/cc_serialization_perftest.cc",
     "layers/layer_perftest.cc",
     "layers/picture_layer_impl_perftest.cc",
+    "output/bsp_tree_perftest.cc",
     "quads/draw_quad_perftest.cc",
     "raster/raster_buffer_provider_perftest.cc",
     "raster/task_graph_runner_perftest.cc",

cc/output/bsp_tree_perftest.cc

+// Copyright 2016 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 <stddef.h>
+
+#include <deque>
+#include <memory>
+#include <sstream>
+
+#include "base/files/file_path.h"
+#include "base/files/file_util.h"
+#include "base/path_service.h"
+#include "base/strings/string_piece.h"
+#include "base/threading/thread.h"
+#include "base/time/time.h"
+#include "cc/debug/lap_timer.h"
+#include "cc/layers/layer.h"
+#include "cc/output/bsp_tree.h"
+#include "cc/quads/draw_polygon.h"
+#include "cc/quads/draw_quad.h"
+#include "cc/test/fake_content_layer_client.h"
+#include "cc/test/fake_layer_tree_host_client.h"
+#include "cc/test/layer_tree_json_parser.h"
+#include "cc/test/layer_tree_test.h"
+#include "cc/test/paths.h"
+#include "cc/trees/layer_tree_host_common.h"
+#include "cc/trees/layer_tree_impl.h"
+#include "testing/perf/perf_test.h"
+
+namespace cc {
+namespace {
+
+static const int kTimeLimitMillis = 2000;
+static const int kWarmupRuns = 5;
+static const int kTimeCheckInterval = 10;
+
+class BspTreePerfTest : public LayerTreeTest {
+ public:
+  BspTreePerfTest()
+      : timer_(kWarmupRuns,
+               base::TimeDelta::FromMilliseconds(kTimeLimitMillis),
+               kTimeCheckInterval) {}
+
+  void SetupTree() override {
+    gfx::Size viewport = gfx::Size(720, 1038);
+    layer_tree()->SetViewportSize(viewport);
+    scoped_refptr<Layer> root =
+        ParseTreeFromJson(json_, &content_layer_client_);
+    ASSERT_TRUE(root.get());
+    layer_tree()->SetRootLayer(root);
+    content_layer_client_.set_bounds(viewport);
+  }
+
+  void SetTestName(const std::string& name) { test_name_ = name; }
+
+  void SetNumberOfDuplicates(int num_duplicates) {
+    num_duplicates_ = num_duplicates;
+  }
+
+  void ReadTestFile(const std::string& name) {
+    base::FilePath test_data_dir;
+    ASSERT_TRUE(PathService::Get(CCPaths::DIR_TEST_DATA, &test_data_dir));
+    base::FilePath json_file = test_data_dir.AppendASCII(name + ".json");
+    ASSERT_TRUE(base::ReadFileToString(json_file, &json_));
+  }
+
+  void BeginTest() override { PostSetNeedsCommitToMainThread(); }
+
+  void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override {
+    LayerTreeImpl* active_tree = host_impl->active_tree();
+    // First build the tree and then we'll start running tests on layersorter
+    // itself
+    bool can_render_to_separate_surface = true;
+    int max_texture_size = 8096;
+    DoCalcDrawPropertiesImpl(can_render_to_separate_surface, max_texture_size,
+                             active_tree, host_impl);
+
+    LayerImplList base_list;
+    BuildLayerImplList(active_tree->root_layer_for_testing(), &base_list);
+
+    int polygon_counter = 0;
+    std::vector<std::unique_ptr<DrawPolygon>> polygon_list;
+    for (LayerImplList::iterator it = base_list.begin(); it != base_list.end();
+         ++it) {
+      DrawPolygon* draw_polygon = new DrawPolygon(
+          NULL, gfx::RectF(gfx::SizeF((*it)->bounds())),
+          (*it)->draw_properties().target_space_transform, polygon_counter++);
+      polygon_list.push_back(std::unique_ptr<DrawPolygon>(draw_polygon));
+    }
+
+    timer_.Reset();
+    do {
+      std::deque<std::unique_ptr<DrawPolygon>> test_list;
+      for (int i = 0; i < num_duplicates_; i++) {
+        for (size_t i = 0; i < polygon_list.size(); i++) {
+          test_list.push_back(polygon_list[i]->CreateCopy());
+        }
+      }
+      BspTree bsp_tree(&test_list);
+      timer_.NextLap();
+    } while (!timer_.HasTimeLimitExpired());
+
+    EndTest();
+  }
+
+  void DoCalcDrawPropertiesImpl(bool can_render_to_separate_surface,
+                                int max_texture_size,
+                                LayerTreeImpl* active_tree,
+                                LayerTreeHostImpl* host_impl) {
+    LayerImplList update_list;
+    LayerTreeHostCommon::CalcDrawPropsImplInputs inputs(
+        active_tree->root_layer_for_testing(), active_tree->DrawViewportSize(),
+        host_impl->DrawTransform(), active_tree->device_scale_factor(),
+        active_tree->current_page_scale_factor(),
+        active_tree->InnerViewportContainerLayer(),
+        active_tree->InnerViewportScrollLayer(),
+        active_tree->OuterViewportScrollLayer(),
+        active_tree->elastic_overscroll()->Current(active_tree->IsActiveTree()),
+        active_tree->OverscrollElasticityLayer(), max_texture_size,
+        can_render_to_separate_surface,
+        host_impl->settings().layer_transforms_should_scale_layer_contents,
+        false,  // do not verify_clip_tree_calculation for perf tests
+        false,  // do not verify_transform_tree_calculation for perf tests
+        &update_list, active_tree->property_trees());
+    LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+  }
+
+  void BuildLayerImplList(LayerImpl* layer, LayerImplList* list) {
+    for (auto* layer_impl : *layer->layer_tree_impl()) {
+      if (layer_impl->Is3dSorted() && !layer_impl->bounds().IsEmpty()) {
+        list->push_back(layer_impl);
+      }
+    }
+  }
+
+  void AfterTest() override {
+    CHECK(!test_name_.empty()) << "Must SetTestName() before TearDown().";
+    perf_test::PrintResult("calc_draw_props_time", "", test_name_,
+                           1000 * timer_.MsPerLap(), "us", true);
+  }
+
+ private:
+  FakeContentLayerClient content_layer_client_;
+  LapTimer timer_;
+  std::string test_name_;
+  std::string json_;
+  LayerImplList base_list_;
+  int num_duplicates_ = 1;
+};
+
+TEST_F(BspTreePerfTest, LayerSorterCubes) {
+  SetTestName("layer_sort_cubes");
+  ReadTestFile("layer_sort_cubes");
+  RunTest(CompositorMode::SINGLE_THREADED);
+}
+
+TEST_F(BspTreePerfTest, LayerSorterRubik) {
+  SetTestName("layer_sort_rubik");
+  ReadTestFile("layer_sort_rubik");
+  RunTest(CompositorMode::SINGLE_THREADED);
+}
+
+TEST_F(BspTreePerfTest, BspTreeCubes) {
+  SetTestName("bsp_tree_cubes");
+  SetNumberOfDuplicates(1);
+  ReadTestFile("layer_sort_cubes");
+  RunTest(CompositorMode::SINGLE_THREADED);
+}
+
+TEST_F(BspTreePerfTest, BspTreeRubik) {
+  SetTestName("bsp_tree_rubik");
+  SetNumberOfDuplicates(1);
+  ReadTestFile("layer_sort_rubik");
+  RunTest(CompositorMode::SINGLE_THREADED);
+}
+
+TEST_F(BspTreePerfTest, BspTreeCubes_2) {
+  SetTestName("bsp_tree_cubes_2");
+  SetNumberOfDuplicates(2);
+  ReadTestFile("layer_sort_cubes");
+  RunTest(CompositorMode::SINGLE_THREADED);
+}
+
+TEST_F(BspTreePerfTest, BspTreeCubes_4) {
+  SetTestName("bsp_tree_cubes_4");
+  SetNumberOfDuplicates(4);
+  ReadTestFile("layer_sort_cubes");
+  RunTest(CompositorMode::SINGLE_THREADED);
+}
+
+}  // namespace
+}  // namespace cc

cc/trees/layer_tree_host_common_perftest.cc

@@ -16,9 +16,6 @@
 #include "base/time/time.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/layers/layer.h"
-#include "cc/output/bsp_tree.h"
-#include "cc/quads/draw_polygon.h"
-#include "cc/quads/draw_quad.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/layer_tree_json_parser.h"
@@ -125,69 +122,6 @@ class CalcDrawPropsTest : public LayerTreeHostCommonPerfTest {
   }
 };
 
-class BspTreePerfTest : public CalcDrawPropsTest {
- public:
-  BspTreePerfTest() : num_duplicates_(1) {}
-  void RunSortLayers() { RunTest(CompositorMode::SINGLE_THREADED); }
-
-  void SetNumberOfDuplicates(int num_duplicates) {
-    num_duplicates_ = num_duplicates;
-  }
-
-  void BeginTest() override { PostSetNeedsCommitToMainThread(); }
-
-  void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override {
-    LayerTreeImpl* active_tree = host_impl->active_tree();
-    // First build the tree and then we'll start running tests on layersorter
-    // itself
-    bool can_render_to_separate_surface = true;
-    int max_texture_size = 8096;
-    DoCalcDrawPropertiesImpl(can_render_to_separate_surface,
-                             max_texture_size,
-                             active_tree,
-                             host_impl);
-
-    LayerImplList base_list;
-    BuildLayerImplList(active_tree->root_layer_for_testing(), &base_list);
-
-    int polygon_counter = 0;
-    std::vector<std::unique_ptr<DrawPolygon>> polygon_list;
-    for (LayerImplList::iterator it = base_list.begin(); it != base_list.end();
-         ++it) {
-      DrawPolygon* draw_polygon = new DrawPolygon(
-          NULL, gfx::RectF(gfx::SizeF((*it)->bounds())),
-          (*it)->draw_properties().target_space_transform, polygon_counter++);
-      polygon_list.push_back(std::unique_ptr<DrawPolygon>(draw_polygon));
-    }
-
-    timer_.Reset();
-    do {
-      std::deque<std::unique_ptr<DrawPolygon>> test_list;
-      for (int i = 0; i < num_duplicates_; i++) {
-        for (size_t i = 0; i < polygon_list.size(); i++) {
-          test_list.push_back(polygon_list[i]->CreateCopy());
-        }
-      }
-      BspTree bsp_tree(&test_list);
-      timer_.NextLap();
-    } while (!timer_.HasTimeLimitExpired());
-
-    EndTest();
-  }
-
-  void BuildLayerImplList(LayerImpl* layer, LayerImplList* list) {
-    for (auto* layer_impl : *layer->layer_tree_impl()) {
-      if (layer_impl->Is3dSorted() && !layer_impl->bounds().IsEmpty()) {
-        list->push_back(layer_impl);
-      }
-    }
-  }
-
- private:
-  LayerImplList base_list_;
-  int num_duplicates_;
-};
-
 TEST_F(CalcDrawPropsTest, TenTen) {
   SetTestName("10_10");
   ReadTestFile("10_10_layer_tree");
@@ -212,45 +146,5 @@ TEST_F(CalcDrawPropsTest, TouchRegionHeavy) {
   RunCalcDrawProps();
 }
 
-TEST_F(BspTreePerfTest, LayerSorterCubes) {
-  SetTestName("layer_sort_cubes");
-  ReadTestFile("layer_sort_cubes");
-  RunSortLayers();
-}
-
-TEST_F(BspTreePerfTest, LayerSorterRubik) {
-  SetTestName("layer_sort_rubik");
-  ReadTestFile("layer_sort_rubik");
-  RunSortLayers();
-}
-
-TEST_F(BspTreePerfTest, BspTreeCubes) {
-  SetTestName("bsp_tree_cubes");
-  SetNumberOfDuplicates(1);
-  ReadTestFile("layer_sort_cubes");
-  RunSortLayers();
-}
-
-TEST_F(BspTreePerfTest, BspTreeRubik) {
-  SetTestName("bsp_tree_rubik");
-  SetNumberOfDuplicates(1);
-  ReadTestFile("layer_sort_rubik");
-  RunSortLayers();
-}
-
-TEST_F(BspTreePerfTest, BspTreeCubes_2) {
-  SetTestName("bsp_tree_cubes_2");
-  SetNumberOfDuplicates(2);
-  ReadTestFile("layer_sort_cubes");
-  RunSortLayers();
-}
-
-TEST_F(BspTreePerfTest, BspTreeCubes_4) {
-  SetTestName("bsp_tree_cubes_4");
-  SetNumberOfDuplicates(4);
-  ReadTestFile("layer_sort_cubes");
-  RunSortLayers();
-}
-
 }  // namespace
 }  // namespace cc