diff options
Diffstat (limited to 'chromium/cc/raster')
-rw-r--r-- | chromium/cc/raster/raster_buffer_provider.cc | 2 | ||||
-rw-r--r-- | chromium/cc/raster/raster_buffer_provider_perftest.cc | 39 | ||||
-rw-r--r-- | chromium/cc/raster/task_graph_runner_perftest.cc | 51 |
3 files changed, 56 insertions, 36 deletions
diff --git a/chromium/cc/raster/raster_buffer_provider.cc b/chromium/cc/raster/raster_buffer_provider.cc index c4fa5a9be41..86bd980aba1 100644 --- a/chromium/cc/raster/raster_buffer_provider.cc +++ b/chromium/cc/raster/raster_buffer_provider.cc @@ -45,7 +45,6 @@ bool IsSupportedPlaybackToMemoryFormat(viz::ResourceFormat format) { case viz::BGRX_1010102: case viz::YVU_420: case viz::YUV_420_BIPLANAR: - case viz::UYVY_422: case viz::P010: return false; } @@ -145,7 +144,6 @@ void RasterBufferProvider::PlaybackToMemory( case viz::BGRX_1010102: case viz::YVU_420: case viz::YUV_420_BIPLANAR: - case viz::UYVY_422: case viz::P010: NOTREACHED(); return; diff --git a/chromium/cc/raster/raster_buffer_provider_perftest.cc b/chromium/cc/raster/raster_buffer_provider_perftest.cc index 541b22df9a8..66391be769d 100644 --- a/chromium/cc/raster/raster_buffer_provider_perftest.cc +++ b/chromium/cc/raster/raster_buffer_provider_perftest.cc @@ -29,7 +29,7 @@ #include "gpu/command_buffer/common/sync_token.h" #include "gpu/config/gpu_feature_info.h" #include "testing/gtest/include/gtest/gtest.h" -#include "testing/perf/perf_test.h" +#include "testing/perf/perf_result_reporter.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/skia/include/gpu/GrContext.h" @@ -435,8 +435,8 @@ class RasterBufferProviderPerfTest RunMessageLoopUntilAllTasksHaveCompleted(); tile_task_manager_->CheckForCompletedTasks(); - perf_test::PrintResult("schedule_tasks", TestModifierString(), test_name, - timer_.LapsPerSecond(), "runs/s", true); + perf_test::PerfResultReporter reporter = SetUpReporter(test_name); + reporter.AddResult("_tasks" + TestModifierString(), timer_.LapsPerSecond()); } void RunScheduleAlternateTasksTest(const std::string& test_name, @@ -472,8 +472,9 @@ class RasterBufferProviderPerfTest RunMessageLoopUntilAllTasksHaveCompleted(); tile_task_manager_->CheckForCompletedTasks(); - perf_test::PrintResult("schedule_alternate_tasks", TestModifierString(), - test_name, timer_.LapsPerSecond(), "runs/s", true); + perf_test::PerfResultReporter reporter = SetUpReporter(test_name); + reporter.AddResult("_alternate_tasks" + TestModifierString(), + timer_.LapsPerSecond()); } void RunScheduleAndExecuteTasksTest(const std::string& test_name, @@ -501,8 +502,20 @@ class RasterBufferProviderPerfTest tile_task_manager_->ScheduleTasks(&empty); RunMessageLoopUntilAllTasksHaveCompleted(); - perf_test::PrintResult("schedule_and_execute_tasks", TestModifierString(), - test_name, timer_.LapsPerSecond(), "runs/s", true); + perf_test::PerfResultReporter reporter = SetUpReporter(test_name); + reporter.AddResult("_and_execute_tasks" + TestModifierString(), + timer_.LapsPerSecond()); + } + + protected: + perf_test::PerfResultReporter SetUpReporter(const std::string& story_name) { + perf_test::PerfResultReporter reporter("schedule", story_name); + reporter.RegisterImportantMetric("_tasks" + TestModifierString(), "runs/s"); + reporter.RegisterImportantMetric("_alternate_tasks" + TestModifierString(), + "runs/s"); + reporter.RegisterImportantMetric( + "_and_execute_tasks" + TestModifierString(), "runs/s"); + return reporter; } private: @@ -606,8 +619,16 @@ class RasterBufferProviderCommonPerfTest for (auto& task : raster_tasks) task->OnTaskCompleted(); - perf_test::PrintResult("build_raster_task_graph", "", test_name, - timer_.LapsPerSecond(), "runs/s", true); + perf_test::PerfResultReporter reporter = SetUpReporter(test_name); + reporter.AddResult("", timer_.LapsPerSecond()); + } + + protected: + perf_test::PerfResultReporter SetUpReporter(const std::string& story_name) { + perf_test::PerfResultReporter reporter("build_raster_test_graph", + story_name); + reporter.RegisterImportantMetric("", "runs/s"); + return reporter; } }; diff --git a/chromium/cc/raster/task_graph_runner_perftest.cc b/chromium/cc/raster/task_graph_runner_perftest.cc index d7f35a0b738..c6119f0f29f 100644 --- a/chromium/cc/raster/task_graph_runner_perftest.cc +++ b/chromium/cc/raster/task_graph_runner_perftest.cc @@ -14,7 +14,7 @@ #include "cc/base/completion_event.h" #include "cc/raster/synchronous_task_graph_runner.h" #include "testing/gtest/include/gtest/gtest.h" -#include "testing/perf/perf_test.h" +#include "testing/perf/perf_result_reporter.h" namespace cc { namespace { @@ -79,12 +79,9 @@ class TaskGraphRunnerPerfTest : public testing::Test { CancelTasks(tasks); CancelTasks(top_level_tasks); - perf_test::PrintResult("build_task_graph", - TestModifierString(), - test_name, - timer_.LapsPerSecond(), - "runs/s", - true); + perf_test::PerfResultReporter reporter = SetUpReporter(test_name); + reporter.AddResult("build_task_graph" + TestModifierString(), + timer_.LapsPerSecond()); } void RunScheduleTasksTest(const std::string& test_name, @@ -118,12 +115,9 @@ class TaskGraphRunnerPerfTest : public testing::Test { task_graph_runner_->ScheduleTasks(namespace_token_, &empty); CollectCompletedTasks(&completed_tasks); - perf_test::PrintResult("schedule_tasks", - TestModifierString(), - test_name, - timer_.LapsPerSecond(), - "runs/s", - true); + perf_test::PerfResultReporter reporter = SetUpReporter(test_name); + reporter.AddResult("schedule_tasks" + TestModifierString(), + timer_.LapsPerSecond()); } void RunScheduleAlternateTasksTest(const std::string& test_name, @@ -168,12 +162,9 @@ class TaskGraphRunnerPerfTest : public testing::Test { task_graph_runner_->ScheduleTasks(namespace_token_, &empty); CollectCompletedTasks(&completed_tasks); - perf_test::PrintResult("schedule_alternate_tasks", - TestModifierString(), - test_name, - timer_.LapsPerSecond(), - "runs/s", - true); + perf_test::PerfResultReporter reporter = SetUpReporter(test_name); + reporter.AddResult("schedule_alternate_tasks" + TestModifierString(), + timer_.LapsPerSecond()); } void RunScheduleAndExecuteTasksTest(const std::string& test_name, @@ -208,12 +199,9 @@ class TaskGraphRunnerPerfTest : public testing::Test { timer_.NextLap(); } while (!timer_.HasTimeLimitExpired()); - perf_test::PrintResult("execute_tasks", - TestModifierString(), - test_name, - timer_.LapsPerSecond(), - "runs/s", - true); + perf_test::PerfResultReporter reporter = SetUpReporter(test_name); + reporter.AddResult("execute_tasks" + TestModifierString(), + timer_.LapsPerSecond()); } private: @@ -269,6 +257,19 @@ class TaskGraphRunnerPerfTest : public testing::Test { return completed_tasks->size(); } + perf_test::PerfResultReporter SetUpReporter(const std::string& story_name) { + perf_test::PerfResultReporter reporter("", story_name); + reporter.RegisterImportantMetric("build_task_graph" + TestModifierString(), + "runs/s"); + reporter.RegisterImportantMetric("schedule_tasks" + TestModifierString(), + "runs/s"); + reporter.RegisterImportantMetric( + "schedule_alternate_tasks" + TestModifierString(), "runs/s"); + reporter.RegisterImportantMetric("execute_tasks" + TestModifierString(), + "runs/s"); + return reporter; + } + // Test uses SynchronousTaskGraphRunner, as this implementation introduces // minimal additional complexity over the TaskGraphWorkQueue helpers. std::unique_ptr<SynchronousTaskGraphRunner> task_graph_runner_; |