From b61bb756579eaa22c35f54d3b2f8d0dffc682bbe Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Wed, 16 Sep 2020 09:35:40 +0200
Subject: Report: Fix units in speedup graphs

Change-Id: I6e0dc888d00df03e3fbd8cac62d6db19ef6507cf
Signed-off-by: Tibor Frank <tifrank@cisco.com>
---
 resources/tools/presentation/generator_plots.py | 49 +++++++++++++------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index e79e4de38b..30e2710d87 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -370,6 +370,22 @@ def plot_perf_box_name(plot, input_data):
         return
 
     # Prepare the data for the plot
+    plot_title = plot.get(u"title", u"").lower()
+
+    if u"-pdr" in plot_title:
+        ttype = u"PDR"
+    elif u"-ndr" in plot_title:
+        ttype = u"NDR"
+    else:
+        raise RuntimeError(u"Wrong title. No information about test type. Add"
+                           u"'-ndr' or '-pdr' to the test title.")
+
+    if u"-gbps" in plot_title:
+        value = u"gbps"
+        multiplier = 1e6
+    else:
+        value = u"throughput"
+        multiplier = 1.0
     y_vals = OrderedDict()
     test_type = u""
     for job in data:
@@ -380,21 +396,6 @@ def plot_perf_box_name(plot, input_data):
                 try:
                     if test[u"type"] in (u"NDRPDR", ):
                         test_type = u"NDRPDR"
-                        plot_title = plot.get(u"title", u"").lower()
-
-                        if u"-pdr" in plot_title:
-                            ttype = u"PDR"
-                        elif u"-ndr" in plot_title:
-                            ttype = u"NDR"
-                        else:
-                            continue
-
-                        if u"-gbps" in plot_title:
-                            value = u"gbps"
-                            multiplier = 1e6
-                        else:
-                            value = u"throughput"
-                            multiplier = 1.0
 
                         y_vals[test[u"parent"]].append(
                             test[value][ttype][u"LOWER"] * multiplier
@@ -523,6 +524,15 @@ def plot_tsa_name(plot, input_data):
 
     plot_title = plot_title.lower()
 
+    if u"-gbps" in plot_title:
+        value = u"gbps"
+        h_unit = u"Gbps"
+        multiplier = 1e6
+    else:
+        value = u"throughput"
+        h_unit = u"Mpps"
+        multiplier = 1.0
+
     y_vals = OrderedDict()
     for job in data:
         for build in job:
@@ -544,13 +554,6 @@ def plot_tsa_name(plot, input_data):
                     else:
                         continue
 
-                    if u"-gbps" in plot_title:
-                        value = u"gbps"
-                        multiplier = 1e6
-                    else:
-                        value = u"throughput"
-                        multiplier = 1.0
-
                     if u"1C" in test[u"tags"]:
                         y_vals[test[u"parent"]][u"1"]. \
                             append(test[value][ttype][u"LOWER"] * multiplier)
@@ -779,7 +782,7 @@ def plot_tsa_name(plot, input_data):
                 if isinstance(val[u"val"][idx], float):
                     htext += (
                         f"No. of Runs: {val[u'count'][idx]}<br>"
-                        f"Mean: {val[u'val'][idx]:.2f}Mpps<br>"
+                        f"Mean: {val[u'val'][idx]:.2f}{h_unit}<br>"
                     )
                 if isinstance(val[u"diff"][idx], float):
                     htext += f"Diff: {round(val[u'diff'][idx]):.0f}%<br>"
-- 
cgit 1.2.3-korg