diff options
| -rw-r--r-- | cc/trees/layer_tree_host_common_perftest.cc | 6 | ||||
| -rw-r--r-- | cc/trees/layer_tree_host_perftest.cc | 4 | ||||
| -rw-r--r-- | testing/perf/perf_test.cc | 16 | ||||
| -rw-r--r-- | testing/perf/perf_test.h | 6 |
4 files changed, 22 insertions, 10 deletions
diff --git a/cc/trees/layer_tree_host_common_perftest.cc b/cc/trees/layer_tree_host_common_perftest.cc index d940709..756a5ea 100644 --- a/cc/trees/layer_tree_host_common_perftest.cc +++ b/cc/trees/layer_tree_host_common_perftest.cc @@ -56,12 +56,6 @@ class LayerTreeHostCommonPerfTest : public LayerTreeTest { virtual void AfterTest() OVERRIDE { CHECK(!test_name_.empty()) << "Must SetTestName() before TearDown()."; - perf_test::PrintResult("calc_draw_props_count", - "", - test_name_, - timer_.NumLaps(), - "count", - true); perf_test::PrintResult("calc_draw_props_time", "", test_name_, diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc index 79ee46b..5f15ca6 100644 --- a/cc/trees/layer_tree_host_perftest.cc +++ b/cc/trees/layer_tree_host_perftest.cc @@ -88,13 +88,9 @@ class LayerTreeHostPerfTest : public LayerTreeTest { virtual void AfterTest() OVERRIDE { CHECK(!test_name_.empty()) << "Must SetTestName() before AfterTest()."; - perf_test::PrintResult("layer_tree_host_frame_count", "", test_name_, - draw_timer_.NumLaps(), "frame_count", true); perf_test::PrintResult("layer_tree_host_frame_time", "", test_name_, 1000 * draw_timer_.MsPerLap(), "us", true); if (measure_commit_cost_) { - perf_test::PrintResult("layer_tree_host_commit_count", "", test_name_, - commit_timer_.NumLaps(), "commit_count", true); perf_test::PrintResult("layer_tree_host_commit_time", "", test_name_, 1000 * commit_timer_.MsPerLap(), "us", true); } diff --git a/testing/perf/perf_test.cc b/testing/perf/perf_test.cc index fd39f87..0d5abc0 100644 --- a/testing/perf/perf_test.cc +++ b/testing/perf/perf_test.cc @@ -63,6 +63,22 @@ void PrintResult(const std::string& measurement, important); } +void PrintResult(const std::string& measurement, + const std::string& modifier, + const std::string& trace, + double value, + const std::string& units, + bool important) { + PrintResultsImpl(measurement, + modifier, + trace, + base::DoubleToString(value), + std::string(), + std::string(), + units, + important); +} + void AppendResult(std::string& output, const std::string& measurement, const std::string& modifier, diff --git a/testing/perf/perf_test.h b/testing/perf/perf_test.h index 4505202..36e2916 100644 --- a/testing/perf/perf_test.h +++ b/testing/perf/perf_test.h @@ -28,6 +28,12 @@ void PrintResult(const std::string& measurement, size_t value, const std::string& units, bool important); +void PrintResult(const std::string& measurement, + const std::string& modifier, + const std::string& trace, + double value, + const std::string& units, + bool important); void AppendResult(std::string& output, const std::string& measurement, |