diff options
| -rw-r--r-- | tools/perf/perf_tools/histogram_measurement.py | 3 | ||||
| -rw-r--r-- | tools/telemetry/telemetry/page/page_benchmark_results.py | 8 | ||||
| -rw-r--r-- | tools/telemetry/telemetry/page/page_benchmark_value.py | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/tools/perf/perf_tools/histogram_measurement.py b/tools/perf/perf_tools/histogram_measurement.py index 507800c..267329a 100644 --- a/tools/perf/perf_tools/histogram_measurement.py +++ b/tools/perf/perf_tools/histogram_measurement.py @@ -26,7 +26,8 @@ class HistogramMeasurement(object): return new_histogram = histogram_module.SubtractHistogram( data, self._start_values[page.url + self.name]) - results.Add(self.name, self.units, new_histogram, data_type='histogram') + results.Add(self.name, self.units, new_histogram, + data_type='unimportant-histogram') @property def histogram_function(self): diff --git a/tools/telemetry/telemetry/page/page_benchmark_results.py b/tools/telemetry/telemetry/page/page_benchmark_results.py index 89949cb..4086c9a 100644 --- a/tools/telemetry/telemetry/page/page_benchmark_results.py +++ b/tools/telemetry/telemetry/page/page_benchmark_results.py @@ -128,11 +128,9 @@ class PageBenchmarkResults(page_test.PageTestResults): results_summary.iteritems()): measurement, units, data_type = measurement_units_type - if data_type == 'histogram': - # For histograms, the _by_url data is important. - by_url_data_type = 'histogram' + if 'histogram' in data_type: + by_url_data_type = 'unimportant-histogram' else: - # For non-histograms, the _by_url data is unimportant. by_url_data_type = 'unimportant' if '.' in measurement: measurement, trace = measurement.split('.', 1) @@ -147,6 +145,6 @@ class PageBenchmarkResults(page_test.PageTestResults): # For histograms, we don't print the average data, only the _by_url, # unless there is only 1 page in which case the _by_urls are omitted. - if data_type != 'histogram' or len(value_url_list) == 1: + if 'histogram' not in data_type or len(value_url_list) == 1: values = [i[0] for i in value_url_list] self._PrintPerfResult(measurement, trace, values, units, data_type) diff --git a/tools/telemetry/telemetry/page/page_benchmark_value.py b/tools/telemetry/telemetry/page/page_benchmark_value.py index 74a6d171..0977125 100644 --- a/tools/telemetry/telemetry/page/page_benchmark_value.py +++ b/tools/telemetry/telemetry/page/page_benchmark_value.py @@ -23,7 +23,7 @@ class PageBenchmarkValue(object): @property def output_value(self): - if self.data_type == 'histogram': + if 'histogram' in self.data_type: (mean, _) = perf_tests_helper.GeomMeanAndStdDevFromHistogram(self.value) return mean elif isinstance(self.value, list): |