[LNT] Use unit_abbrev of Fields in reports.

[marxin]

Summary

The patch changes usage of Field

Example:: '120168106.0000' into
'114.60 MB'. I believe it's much more readable.

The revision depends on: https://reviews.llvm.org/D51405

[MatzeB]

lnt/server/ui/filters.py

68–69 ↗

(On Diff #164819)

Wouldn't this produce "kilo seconds"? Should we guard this on something like field_unit == "bytes"?

[marxin]

Updated to check for 'bytes' to be field.unit and field.unit_abbrev == 'B'.

lnt/server/ui/filters.py

68–69 ↗

(On Diff #164819)

Fixed.

[MatzeB]

LGTM
We may consider adding something like a tooltip in the future with the fully expanded value...

lnt/trunk/lnt/server/ui/filters.py

if not producer:
         return ""
     return util.renderProducerAsHTML(producer)
 
 
 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_'):
             env.filters[name[7:]] = object

lnt/trunk/lnt/server/ui/templates/reporting/daily_report.html

 {%-    for day_result in day_results|reverse -%}
 {%-      if day_result is none %}
     <td style="{{ styles.td }}">-</td>
 {%-      else -%}
 {%-        if first_result_shown -%}
     {{ 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 %}
     <td>{{ reportutils.spark_plot(day_results) }}</td>
   </tr>
 {%-  endfor %}
 {{ "</tbody></table><p>" if report.for_mail }}
 {%- endfor %}

lnt/trunk/lnt/server/ui/templates/reporting/runs.html

 {% import "utils.html" as utils %}
 
 {#
   Macro for rendering the report for either a run-to-run display or a run-to-baseline display.
 #}
 {%
   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
   )
 %}
 
 {% if bucket and bucket_name != 'Unchanged Tests' %}
     {% set small_column_width = 'width: 7%;' %}
    <p>
      <table style="{{ styles['table'] }}; width: 1000px;" class="{{ classes['table'] }}">
<table style="{{ styles['table'] }}; width: 1000px;" class="{{ classes['table'] }}">
              {% if compare_to %}
              {% set compare_to_id = compare_to.id %}
              {% else %}
              {% set compare_to_id = None %}
              {% endif %}
              {{ 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 %}
          </tbody>
        {% endif %}
      </table>
    </p>
 {% endif %}

 
 <section id="run_over_run">
   {{ utils.render_popup_begin('run_over_run', 'Run-Over-Run Changes Detail', false, 'h3') }}
     <p>
     {% for _, field, bucket_name, sorted_bucket, test_names, show_perf in prioritized_buckets_run_over_run %}
       {% 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 %}
     </p>
   {{ utils.render_popup_end() }}
 </section>
 
 
 <section id="run_over_baseline">
   {{ utils.render_popup_begin('run_over_baseline', 'Run-Over-Baseline Changes Detail', false, 'h3') }}
     <p>
 {% if baseline %}
 {% 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 %}
 {% endif %}
     </p>
   {{ utils.render_popup_end() }}
 </section>
 
 <hr/>
 <b>Report Time</b>: {{ start_time | timedelta }}

lnt/trunk/lnt/server/ui/templates/v4_run.html

 
 {% block onload %}
 $('.profile-but-no-prev').tooltip();
 $('.profile-prev-only').tooltip();
 {% endblock %}
   
 {% 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 %}
     {% set prev_cell_value = "-" if cr.previous is none else "%.4f" % cr.previous %}
     {% set prev_cell_value = "-" if test_status in [analysis.IMPROVED, analysis.UNCHANGED_FAIL] else prev_cell_value %}
     <td>{{prev_cell_value}}</td>
   {% endif %}
 
<form id="graph_selection_form" method="GET" action="{{ graph_base }}">
             <tr>
               <td><input type="checkbox" name="plot.{{test_id}}" value="{{machine.id}}.{{test_id}}.{{field_index}}"/></td>
               <td class="benchmark-name">
                 <a href="{{graph_base}}&amp;plot.{{test_id}}={{ machine.id}}.{{test_id}}.{{field_index}}">
                   {{ test_name }}
                 </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>
         <tfoot>
           <tr>
             {% set cr = request_info.sri.get_geomean_comparison_result(
                         run, compare_to, field, tests) %}
             <td><input type="checkbox" name="mean" value="{{machine.id}}.{{field_index}}"/></td>
             <td><a href="{{graph_base}}&amp;mean={{machine.id}}.{{field_index}}">Geometric Mean</a></td>
-            {{ get_cell_value(cr) }}
+            {{ get_cell_value(cr, field) }}
           </tr>
         </tfoot>
       </table>
       {{ utils.render_popup_end() }}
         {% else %}
             <script>$('#link_{{ field.name }}').hide();</script>
         {% endif %}
       </section>

lnt/trunk/tests/server/ui/V4Pages.py

def main():
     check_nr_machines_reported(client, '/v4/nts/daily_report/2012/4/12?filter-machine-regex=?', 3)
 
     # check that a regression seen between 2 consecutive runs that are
     # more than a day apart gets reported
     result_table_20120504 = get_results_table(
         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,
                       [[],
                        ["/db_default/v4/nts/graph?plot.0=2.4.3&highlight_run=6"],
                        [],
                        ["/db_default/v4/nts/graph?plot.0=2.5.3&highlight_run=6"]])
 
     check_body_nr_tests_table(
         client, '/v4/nts/daily_report/2012/5/04',
         [['machine2', '2', '0', '1']])
 
     # Check that a failing result does not show up in the spark line
     # as a dot with value 0.
     result_table_20120513 = get_results_table(
         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'],
                        [],
                        ['/db_default/v4/nts/graph?plot.0=2.7.3&highlight_run=9'],
                        [],
                        ['/db_default/v4/nts/graph?plot.0=2.8.3&highlight_run=9'],
                        [],