[LNT] r343465 - Use unit_abbrev of Fields in reports.
Martin Liska via llvm-commits
llvm-commits at lists.llvm.org
Mon Oct 1 05:31:20 PDT 2018
Author: marxin
Date: Mon Oct 1 05:31:20 2018
New Revision: 343465
URL: http://llvm.org/viewvc/llvm-project?rev=343465&view=rev
Log:
Use unit_abbrev of Fields in reports.
Differential Revision: https://reviews.llvm.org/D51916
Modified:
lnt/trunk/lnt/server/ui/filters.py
lnt/trunk/lnt/server/ui/templates/reporting/daily_report.html
lnt/trunk/lnt/server/ui/templates/reporting/runs.html
lnt/trunk/lnt/server/ui/templates/v4_run.html
lnt/trunk/tests/server/ui/V4Pages.py
Modified: lnt/trunk/lnt/server/ui/filters.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/filters.py?rev=343465&r1=343464&r2=343465&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/filters.py (original)
+++ lnt/trunk/lnt/server/ui/filters.py Mon Oct 1 05:31:20 2018
@@ -54,6 +54,22 @@ def filter_shortname(test_name):
return util.guess_test_short_name(test_name)
+def filter_filesize(value):
+ for unit in ['', 'K', 'M', 'G', 'T', 'P', 'E', 'Z']:
+ if abs(value) < 1024.0:
+ return "%3.2f %sB" % (value, unit)
+ value /= 1024.0
+ return "%.2f%sB" % (value, 'Yi')
+
+def filter_print_value(value, field_unit, field_unit_abbrev, default = '-'):
+ if value == None:
+ return default
+
+ if field_unit == 'bytes' and field_unit_abbrev == 'B':
+ return filter_filesize(value)
+ else:
+ return '%.3f' % value
+
def register(env):
for name, object in globals().items():
if name.startswith('filter_'):
Modified: lnt/trunk/lnt/server/ui/templates/reporting/daily_report.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/reporting/daily_report.html?rev=343465&r1=343464&r2=343465&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/reporting/daily_report.html (original)
+++ lnt/trunk/lnt/server/ui/templates/reporting/daily_report.html Mon Oct 1 05:31:20 2018
@@ -159,7 +159,7 @@
{{ reportutils.get_cell_value(day_result, analysis, styles) }}
{%- else -%}
{%- set first_result_shown = true -%}
- {{ reportutils.get_initial_cell_value(day_result, analysis, styles) }}
+{{ reportutils.get_initial_cell_value(day_result, field, analysis, styles) }}
{%- endif -%}
{%- endif -%}
{%- endfor %}
Modified: lnt/trunk/lnt/server/ui/templates/reporting/runs.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/reporting/runs.html?rev=343465&r1=343464&r2=343465&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/reporting/runs.html (original)
+++ lnt/trunk/lnt/server/ui/templates/reporting/runs.html Mon Oct 1 05:31:20 2018
@@ -5,7 +5,7 @@
#}
{%
macro add_report_changes_detail_for_field_and_bucket(
- compare_to, field, show_perf, run_url, field_index, field_display_name, bucket_name, bucket, test_names,
+ compare_to, field, show_perf, run_url, field_index, field_display_name, field_unit, field_unit_abbrev, bucket_name, bucket, test_names,
metric_name, metric_field_suffix, secondary_field_suffix, secondary_info, styles, classes
)
%}
@@ -55,13 +55,13 @@
{{ utils.render_profile_link(cr.cur_profile, cr.prev_profile, run.id, compare_to_id, test_id) }}
</td>
{{ cr.pct_delta|aspctcell(style=styles['td'] + 'text-align: right;',reverse=cr.bigger_is_better)|safe }}
- <td class="right" style="{{ styles['td'] }}">{{ "%.4f" | format(cr.previous) }}</td>
- <td class="right" style="{{ styles['td'] }}">{{ "%.4f" | format(cr.current) }}</td>
- <td class="right" style="{{ styles['td'] }}">{{ "%.4f" | format_or_default(cr.stddev, '-') }}</td>
+ <td class="right" style="{{ styles['td'] }}">{{ cr.previous | print_value(field_unit, field_unit_abbrev) }}</td>
+ <td class="right" style="{{ styles['td'] }}">{{ cr.current | print_value(field_unit, field_unit_abbrev) }}</td>
+ <td class="right" style="{{ styles['td'] }}">{{ cr.stddev | print_value(field_unit, field_unit_abbrev) }}</td>
{% if secondary_info %}
{% set a_cr = secondary_info[(name, field)] %}
{{ a_cr.pct_delta|aspctcell(style=styles['td'] + 'text-align: right;',reverse=cr.bigger_is_better)|safe }}
- <td class="right" style="{{ styles['td'] }}">{{ "%.4f" | format_or_default(a_cr.stddev, '-') }}</td>
+ <td class="right" style="{{ styles['td'] }}">{{ a_cr.stddev | print_value(field_unit, field_unit_abbrev) }}</td>
{% endif %}
</tr>
{% endfor %}
@@ -169,7 +169,7 @@
{% set field_index = ts.get_field_index(field) %}
{{
add_report_changes_detail_for_field_and_bucket(compare_to, field, show_perf, run_url, field_index, field.display_name,
- bucket_name, sorted_bucket, test_names,
+ field.unit, field.unit_abbrev, bucket_name, sorted_bucket, test_names,
'Previous', '', ' (B)', run_to_baseline_info, styles, classes)
}}
{% endfor %}
@@ -185,8 +185,8 @@
{% for _, field, bucket_name, sorted_bucket, test_names, show_perf in prioritized_buckets_run_over_baseline %}
{% set field_index = ts.get_field_index(field) %}
{{
- add_report_changes_detail_for_field_and_bucket(baseline, field, show_perf, run_url, field_index, field.display_name,
- bucket_name, sorted_bucket, test_names,
+ add_report_changes_detail_for_field_and_bucket(baseline, field, show_perf, run_url, field_index, field.display_name, field.unit,
+ field.unit_abbrev, bucket_name, sorted_bucket, test_names,
'Baseline', '(B)', '', run_to_run_info, styles, classes)
}}
{% endfor %}
Modified: lnt/trunk/lnt/server/ui/templates/v4_run.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/v4_run.html?rev=343465&r1=343464&r2=343465&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/v4_run.html (original)
+++ lnt/trunk/lnt/server/ui/templates/v4_run.html Mon Oct 1 05:31:20 2018
@@ -36,10 +36,10 @@ $('.profile-prev-only').tooltip();
{% block title %}Run Results{% endblock %}
-{% macro get_cell_value(cr) %}
+{% macro get_cell_value(cr, field) %}
{% set test_status = cr.get_test_status() %}
{% set value_status = cr.get_value_status(ignore_small=not options.show_small_diff) %}
- {% set run_cell_value = "-" if cr.current is none else "%.4f" % cr.current %}
+ {% set run_cell_value = cr.current|print_value(field.unit, field.unit_abbrev) %}
{% set run_cell_value = "-" if test_status in [analysis.REGRESSED, analysis.UNCHANGED_FAIL] else run_cell_value %}
{% if options.show_previous %}
@@ -352,7 +352,7 @@ $('.profile-prev-only').tooltip();
</a>
{{ utils.render_profile_link(cr.cur_profile, cr.prev_profile, run.id, compare_to.id, test_id) }}
</td>
- {{ get_cell_value(cr) }}
+ {{ get_cell_value(cr, field) }}
</tr>
{% endfor %}
</tbody>
@@ -362,7 +362,7 @@ $('.profile-prev-only').tooltip();
run, compare_to, field, tests) %}
<td><input type="checkbox" name="mean" value="{{machine.id}}.{{field_index}}"/></td>
<td><a href="{{graph_base}}&mean={{machine.id}}.{{field_index}}">Geometric Mean</a></td>
- {{ get_cell_value(cr) }}
+ {{ get_cell_value(cr, field) }}
</tr>
</tfoot>
</table>
Modified: lnt/trunk/tests/server/ui/V4Pages.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/server/ui/V4Pages.py?rev=343465&r1=343464&r2=343465&view=diff
==============================================================================
--- lnt/trunk/tests/server/ui/V4Pages.py (original)
+++ lnt/trunk/tests/server/ui/V4Pages.py Mon Oct 1 05:31:20 2018
@@ -446,7 +446,7 @@ def main():
client, '/v4/nts/daily_report/2012/5/04', "Execution Time")
check_table_content(result_table_20120504,
[["test1", ""],
- ["", "machine2", "1.0000", "-", "900.00%", ""],
+ ["", "machine2", "1.000", "-", "900.00%", ""],
["test2", ""],
["", "machine2", "FAIL", "-", "PASS", ""]])
check_table_links(result_table_20120504,
@@ -465,13 +465,13 @@ def main():
client, '/v4/nts/daily_report/2012/5/13?num_days=3', "Execution Time")
check_table_content(result_table_20120513,
[["test6", ""],
- ["", "machine2", "1.0000", "FAIL", "PASS", ""],
+ ["", "machine2", "1.000", "FAIL", "PASS", ""],
["test_hash1", ""],
- ["", "machine2", "1.0000", '-', '20.00%', ""],
+ ["", "machine2", "1.000", '-', '20.00%', ""],
["test_hash2", ""],
- ["", "machine2", "1.0000", '-', '20.00%', ""],
+ ["", "machine2", "1.000", '-', '20.00%', ""],
["test_mhash_on_run", ""],
- ["", "machine2", "1.0000", '-', '20.00%', ""], ])
+ ["", "machine2", "1.000", '-', '20.00%', ""], ])
check_table_links(result_table_20120513,
[[],
['/db_default/v4/nts/graph?plot.0=2.6.3&highlight_run=9'],
More information about the llvm-commits
mailing list