diff options
| author | ernstm@chromium.org <ernstm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-16 11:49:43 +0000 |
|---|---|---|
| committer | ernstm@chromium.org <ernstm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-16 11:49:43 +0000 |
| commit | bb82d679961b5c4ca2d938af15bd0b38d3e72d22 (patch) | |
| tree | 495928688f666122496604501837bc8133668aac /tools/perf | |
| parent | 86e4fa6746b34bbdd84901debb64d6de511699fc (diff) | |
| download | chromium_src-bb82d679961b5c4ca2d938af15bd0b38d3e72d22.zip chromium_src-bb82d679961b5c4ca2d938af15bd0b38d3e72d22.tar.gz chromium_src-bb82d679961b5c4ca2d938af15bd0b38d3e72d22.tar.bz2 | |
Made trace profiler work with trace-based benchmarks.
R=tonyg
BUG=282712
Review URL: https://chromiumcodereview.appspot.com/23902027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223330 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/measurements/rasterize_and_record.py | 5 | ||||
| -rw-r--r-- | tools/perf/measurements/smoothness.py | 11 | ||||
| -rw-r--r-- | tools/perf/metrics/timeline.py | 4 |
3 files changed, 8 insertions, 12 deletions
diff --git a/tools/perf/measurements/rasterize_and_record.py b/tools/perf/measurements/rasterize_and_record.py index 4ed5a09..b5bc613 100644 --- a/tools/perf/measurements/rasterize_and_record.py +++ b/tools/perf/measurements/rasterize_and_record.py @@ -148,7 +148,7 @@ class RasterizeAndRecord(page_measurement.PageMeasurement): }); """) - tab.browser.StartTracing('webkit,webkit.console,benchmark', 60) + tab.browser.StartTracing('webkit.console,benchmark', 60) self._metrics.Start() tab.ExecuteJavaScript(""" @@ -166,10 +166,9 @@ class RasterizeAndRecord(page_measurement.PageMeasurement): time.sleep(float(self.options.stop_wait_time)) tab.ExecuteJavaScript('console.timeEnd("measureNextFrame")') - tab.browser.StopTracing() self._metrics.Stop() + timeline = tab.browser.StopTracing().AsTimelineModel() - timeline = tab.browser.GetTraceResultAndReset().AsTimelineModel() collector = StatsCollector(timeline) collector.GatherRenderingStats() diff --git a/tools/perf/measurements/smoothness.py b/tools/perf/measurements/smoothness.py index a26ba68..f44feef 100644 --- a/tools/perf/measurements/smoothness.py +++ b/tools/perf/measurements/smoothness.py @@ -28,6 +28,7 @@ class Smoothness(page_measurement.PageMeasurement): super(Smoothness, self).__init__('smoothness') self.force_enable_threaded_compositing = False self._metrics = None + self._trace_result = None def AddCommandLineOptions(self, parser): parser.add_option('--report-all-results', dest='report_all_results', @@ -43,9 +44,7 @@ class Smoothness(page_measurement.PageMeasurement): return hasattr(page, 'smoothness') def WillRunAction(self, page, tab, action): - # TODO(ernstm): remove 'webkit' category when - # https://codereview.chromium.org/23848006/ has landed. - tab.browser.StartTracing('webkit,webkit.console,benchmark', 60) + tab.browser.StartTracing('webkit.console,benchmark', 60) if tab.browser.platform.IsRawDisplayFrameRateSupported(): tab.browser.platform.StartRawDisplayFrameRateMeasurement() self._metrics = smoothness.SmoothnessMetrics(tab) @@ -59,7 +58,7 @@ class Smoothness(page_measurement.PageMeasurement): tab.browser.platform.StopRawDisplayFrameRateMeasurement() if not action.CanBeBound(): self._metrics.Stop() - tab.browser.StopTracing() + self._trace_result = tab.browser.StopTracing() def FindTimelineMarker(self, timeline): events = [s for @@ -80,8 +79,8 @@ class Smoothness(page_measurement.PageMeasurement): smoothness.CalcFirstPaintTimeResults(results, tab) - timeline = tab.browser.GetTraceResultAndReset().AsTimelineModel() - timeline_marker = self.FindTimelineMarker(timeline) + timeline_marker = self.FindTimelineMarker( + self._trace_result.AsTimelineModel()) benchmark_stats = GpuRenderingStats(timeline_marker, rendering_stats_deltas, self._metrics.is_using_gpu_benchmarking) diff --git a/tools/perf/metrics/timeline.py b/tools/perf/metrics/timeline.py index 6462646..6d9ef26 100644 --- a/tools/perf/metrics/timeline.py +++ b/tools/perf/metrics/timeline.py @@ -38,8 +38,7 @@ class TimelineMetric(Metric): console.timeEnd("__loading_measurement_was_here__"); """) - tab.browser.StopTracing() - trace_result = tab.browser.GetTraceResultAndReset() + trace_result = tab.browser.StopTracing() self._model = trace_result.AsTimelineModel() events = [s for s in self._model.GetAllEventsOfName( @@ -68,4 +67,3 @@ class TimelineMetric(Metric): results.Add(event_name, 'ms', total) results.Add(event_name + '_max', 'ms', biggest_jank) results.Add(event_name + '_avg', 'ms', total / len(times)) - |