Use unit_abbrev of Fields in reports.

Differential Revision: https://reviews.llvm.org/D51916


git-svn-id: https://llvm.org/svn/llvm-project/lnt/trunk@343465 91177308-0d34-0410-b5e6-96231b3b80d8

4 files changed, 29 insertions, 13 deletions

diff --git a/lnt/server/ui/filters.py b/lnt/server/ui/filters.py
index bb74053..f1c4d6f 100644
--- a/lnt/server/ui/filters.py
+++ b/lnt/server/ui/filters.py
@@ -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_'):
diff --git a/lnt/server/ui/templates/reporting/daily_report.html b/lnt/server/ui/templates/reporting/daily_report.html
index 931254c..ebe9083 100644
--- a/lnt/server/ui/templates/reporting/daily_report.html
+++ b/lnt/server/ui/templates/reporting/daily_report.html
@@ -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 %}
diff --git a/lnt/server/ui/templates/reporting/runs.html b/lnt/server/ui/templates/reporting/runs.html
index 4d7bfc6..5899a77 100644
--- a/lnt/server/ui/templates/reporting/runs.html
+++ b/lnt/server/ui/templates/reporting/runs.html
@@ -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 %}
diff --git a/lnt/server/ui/templates/v4_run.html b/lnt/server/ui/templates/v4_run.html
index 5e27001..7350de8 100644
--- a/lnt/server/ui/templates/v4_run.html
+++ b/lnt/server/ui/templates/v4_run.html
@@ -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}}&amp;mean={{machine.id}}.{{field_index}}">Geometric Mean</a></td>
-            {{ get_cell_value(cr) }}
+            {{ get_cell_value(cr, field) }}
           </tr>
         </tfoot>
       </table>