| Index: tools/perf/measurements/rasterize_and_record_micro.py
|
| diff --git a/tools/perf/measurements/rasterize_and_record_micro.py b/tools/perf/measurements/rasterize_and_record_micro.py
|
| index 1eb6426c76787e65c070162e36084b4f0145c3b0..35f506929a895fd800b757e72223b6ea9e1d904a 100644
|
| --- a/tools/perf/measurements/rasterize_and_record_micro.py
|
| +++ b/tools/perf/measurements/rasterize_and_record_micro.py
|
| @@ -9,10 +9,19 @@ from telemetry.value import scalar
|
|
|
| import py_utils
|
|
|
| +COUNTERS = [
|
| + "lo_all",
|
| + "lo_floatLayerBug1",
|
| + "lo_floatLayerBug2",
|
| + "lo_svgForeignBug",
|
| +]
|
| +
|
| +# assert len(COUNTERS) == 55 + 9 + 7
|
| +
|
| class RasterizeAndRecordMicro(legacy_page_test.LegacyPageTest):
|
|
|
| def __init__(self, start_wait_time=2, rasterize_repeat=100, record_repeat=100,
|
| - timeout=120, report_detailed_results=False):
|
| + timeout=9999, report_detailed_results=False):
|
| super(RasterizeAndRecordMicro, self).__init__()
|
| self._chrome_branch_number = None
|
| self._start_wait_time = start_wait_time
|
| @@ -64,85 +73,7 @@ class RasterizeAndRecordMicro(legacy_page_test.LegacyPageTest):
|
|
|
| data = tab.EvaluateJavaScript('window.benchmark_results.results')
|
|
|
| - pixels_recorded = data['pixels_recorded']
|
| - record_time = data['record_time_ms']
|
| - pixels_rasterized = data['pixels_rasterized']
|
| - rasterize_time = data['rasterize_time_ms']
|
| - picture_memory_usage = data['picture_memory_usage']
|
| -
|
| - results.AddValue(scalar.ScalarValue(
|
| - results.current_page, 'pixels_recorded', 'pixels', pixels_recorded))
|
| - results.AddValue(scalar.ScalarValue(
|
| - results.current_page, 'pixels_rasterized', 'pixels', pixels_rasterized))
|
| - results.AddValue(scalar.ScalarValue(
|
| - results.current_page, 'rasterize_time', 'ms', rasterize_time))
|
| - results.AddValue(scalar.ScalarValue(
|
| - results.current_page, 'viewport_picture_size', 'bytes',
|
| - picture_memory_usage))
|
| - results.AddValue(scalar.ScalarValue(
|
| - results.current_page, 'record_time', 'ms', record_time))
|
| -
|
| - record_time_painting_disabled = data['record_time_painting_disabled_ms']
|
| - record_time_caching_disabled = data['record_time_caching_disabled_ms']
|
| - record_time_construction_disabled = \
|
| - data['record_time_construction_disabled_ms']
|
| - # TODO(wangxianzhu): Remove this workaround when reference builds get past
|
| - # r367465.
|
| - record_time_subsequence_caching_disabled = \
|
| - data.get('record_time_subsequence_caching_disabled_ms', 0)
|
| - # TODO(wkorman): Remove the default-to-zero workaround below when
|
| - # reference builds get past the change that adds this comment.
|
| - record_time_partial_invalidation = \
|
| - data.get('record_time_partial_invalidation_ms', 0)
|
| - results.AddValue(scalar.ScalarValue(
|
| - results.current_page, 'record_time_painting_disabled', 'ms',
|
| - record_time_painting_disabled))
|
| - results.AddValue(scalar.ScalarValue(
|
| - results.current_page, 'record_time_caching_disabled', 'ms',
|
| - record_time_caching_disabled))
|
| - results.AddValue(scalar.ScalarValue(
|
| - results.current_page, 'record_time_construction_disabled', 'ms',
|
| - record_time_construction_disabled))
|
| - results.AddValue(scalar.ScalarValue(
|
| - results.current_page, 'record_time_subsequence_caching_disabled', 'ms',
|
| - record_time_subsequence_caching_disabled))
|
| - results.AddValue(scalar.ScalarValue(
|
| - results.current_page, 'record_time_partial_invalidation_ms', 'ms',
|
| - record_time_partial_invalidation))
|
| -
|
| - if self._report_detailed_results:
|
| - pixels_rasterized_with_non_solid_color = \
|
| - data['pixels_rasterized_with_non_solid_color']
|
| - pixels_rasterized_as_opaque = \
|
| - data['pixels_rasterized_as_opaque']
|
| - total_layers = data['total_layers']
|
| - total_picture_layers = data['total_picture_layers']
|
| - total_picture_layers_with_no_content = \
|
| - data['total_picture_layers_with_no_content']
|
| - total_picture_layers_off_screen = \
|
| - data['total_picture_layers_off_screen']
|
| - # TODO(wkorman): Why are we storing rasterize_results_.total_memory_usage
|
| - # in a field called |total_pictures_in_pile_size|? Did we just repurpose
|
| - # that field to avoid having to rename/create another?
|
| - total_pictures_in_pile_size = data['total_pictures_in_pile_size']
|
| -
|
| - results.AddValue(scalar.ScalarValue(
|
| - results.current_page, 'total_size_of_pictures_in_piles', 'bytes',
|
| - total_pictures_in_pile_size))
|
| - results.AddValue(scalar.ScalarValue(
|
| - results.current_page, 'pixels_rasterized_with_non_solid_color',
|
| - 'pixels', pixels_rasterized_with_non_solid_color))
|
| - results.AddValue(scalar.ScalarValue(
|
| - results.current_page, 'pixels_rasterized_as_opaque', 'pixels',
|
| - pixels_rasterized_as_opaque))
|
| - results.AddValue(scalar.ScalarValue(
|
| - results.current_page, 'total_layers', 'count', total_layers))
|
| - results.AddValue(scalar.ScalarValue(
|
| - results.current_page, 'total_picture_layers', 'count',
|
| - total_picture_layers))
|
| - results.AddValue(scalar.ScalarValue(
|
| - results.current_page, 'total_picture_layers_with_no_content', 'count',
|
| - total_picture_layers_with_no_content))
|
| - results.AddValue(scalar.ScalarValue(
|
| - results.current_page, 'total_picture_layers_off_screen', 'count',
|
| - total_picture_layers_off_screen))
|
| + for c in COUNTERS:
|
| + count = data.get(c, 0)
|
| + results.AddValue(scalar.ScalarValue(results.current_page,
|
| + c, 'count', count))
|
|
|