X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_plots.py;h=d77ac7bab5acf08c95f638b8dbaa505115e5b890;hb=3969bc368a73f12ab3550b87ef6102c209c66676;hp=0889d2461e2209a63feb06f3502d2ad75653154a;hpb=2ea8039cf6a400e7c13219c7c2f826921aa64dfa;p=csit.git
diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index 0889d2461e..d77ac7bab5 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@ -15,6 +15,7 @@
"""
+import re
import logging
import pandas as pd
import plotly.offline as ploff
@@ -24,7 +25,7 @@ from plotly.exceptions import PlotlyError
from collections import OrderedDict
from copy import deepcopy
-from utils import mean
+from utils import mean, stdev
COLORS = ["SkyBlue", "Olive", "Purple", "Coral", "Indigo", "Pink",
@@ -34,6 +35,8 @@ COLORS = ["SkyBlue", "Olive", "Purple", "Coral", "Indigo", "Pink",
"LightGreen", "LightSeaGreen", "LightSkyBlue", "Maroon",
"MediumSeaGreen", "SeaGreen", "LightSlateGrey"]
+REGEX_NIC = re.compile(r'\d*ge\dp\d\D*\d*-')
+
def generate_plots(spec, data):
"""Generate all plots specified in the specification file.
@@ -107,7 +110,7 @@ def plot_performance_box(plot, input_data):
y_sorted = OrderedDict()
y_tags_l = {s: [t.lower() for t in ts] for s, ts in y_tags.items()}
for tag in order:
- logging.info(tag)
+ logging.debug(tag)
for suite, tags in y_tags_l.items():
if "not " in tag:
tag = tag.split(" ")[-1]
@@ -119,9 +122,9 @@ def plot_performance_box(plot, input_data):
try:
y_sorted[suite] = y_vals.pop(suite)
y_tags_l.pop(suite)
- logging.info(suite)
+ logging.debug(suite)
except KeyError as err:
- logging.error("Not found: {0}".format(err))
+ logging.error("Not found: {0}".format(repr(err)))
finally:
break
else:
@@ -129,9 +132,11 @@ def plot_performance_box(plot, input_data):
# Add None to the lists with missing data
max_len = 0
+ nr_of_samples = list()
for val in y_sorted.values():
if len(val) > max_len:
max_len = len(val)
+ nr_of_samples.append(len(val))
for key, val in y_sorted.items():
if len(val) < max_len:
val.extend([None for _ in range(max_len - len(val))])
@@ -142,9 +147,16 @@ def plot_performance_box(plot, input_data):
df.head()
y_max = list()
for i, col in enumerate(df.columns):
- name = "{0}. {1}".format(i + 1, col.lower().replace('-ndrpdrdisc', '').
- replace('-ndrpdr', ''))
- logging.info(name)
+ tst_name = re.sub(REGEX_NIC, "",
+ col.lower().replace('-ndrpdr', '').
+ replace('2n1l-', ''))
+ name = "{nr}. ({samples:02d} run{plural}) {name}".\
+ format(nr=(i + 1),
+ samples=nr_of_samples[i],
+ plural='s' if nr_of_samples[i] > 1 else '',
+ name=tst_name)
+
+ logging.debug(name)
traces.append(plgo.Box(x=[str(i + 1) + '.'] * len(df[col]),
y=[y / 1000000 if y else None for y in df[col]],
name=name,
@@ -152,7 +164,7 @@ def plot_performance_box(plot, input_data):
try:
val_max = max(df[col])
except ValueError as err:
- logging.error(err)
+ logging.error(repr(err))
continue
if val_max:
y_max.append(int(val_max / 1000000) + 1)
@@ -161,7 +173,7 @@ def plot_performance_box(plot, input_data):
# Create plot
layout = deepcopy(plot["layout"])
if layout.get("title", None):
- layout["title"] = "Packet Throughput: {0}". \
+ layout["title"] = "Throughput: {0}". \
format(layout["title"])
if y_max:
layout["yaxis"]["range"] = [0, max(y_max)]
@@ -175,7 +187,248 @@ def plot_performance_box(plot, input_data):
plot["output-file-type"]))
except PlotlyError as err:
logging.error(" Finished with error: {}".
- format(str(err).replace("\n", " ")))
+ format(repr(err).replace("\n", " ")))
+ return
+
+
+def plot_soak_bars(plot, input_data):
+ """Generate the plot(s) with algorithm: plot_soak_bars
+ specified in the specification file.
+
+ :param plot: Plot to generate.
+ :param input_data: Data to process.
+ :type plot: pandas.Series
+ :type input_data: InputData
+ """
+
+ # Transform the data
+ plot_title = plot.get("title", "")
+ logging.info(" Creating the data set for the {0} '{1}'.".
+ format(plot.get("type", ""), plot_title))
+ data = input_data.filter_data(plot)
+ if data is None:
+ logging.error("No data.")
+ return
+
+ # Prepare the data for the plot
+ y_vals = dict()
+ y_tags = dict()
+ for job in data:
+ for build in job:
+ for test in build:
+ if y_vals.get(test["parent"], None) is None:
+ y_tags[test["parent"]] = test.get("tags", None)
+ try:
+ if test["type"] in ("SOAK", ):
+ y_vals[test["parent"]] = test["throughput"]
+ else:
+ continue
+ except (KeyError, TypeError):
+ y_vals[test["parent"]] = dict()
+
+ # Sort the tests
+ order = plot.get("sort", None)
+ if order and y_tags:
+ y_sorted = OrderedDict()
+ y_tags_l = {s: [t.lower() for t in ts] for s, ts in y_tags.items()}
+ for tag in order:
+ logging.debug(tag)
+ for suite, tags in y_tags_l.items():
+ if "not " in tag:
+ tag = tag.split(" ")[-1]
+ if tag.lower() in tags:
+ continue
+ else:
+ if tag.lower() not in tags:
+ continue
+ try:
+ y_sorted[suite] = y_vals.pop(suite)
+ y_tags_l.pop(suite)
+ logging.debug(suite)
+ except KeyError as err:
+ logging.error("Not found: {0}".format(repr(err)))
+ finally:
+ break
+ else:
+ y_sorted = y_vals
+
+ idx = 0
+ y_max = 0
+ traces = list()
+ for test_name, test_data in y_sorted.items():
+ idx += 1
+ name = "{nr}. {name}".\
+ format(nr=idx, name=test_name.lower().replace('-soak', ''))
+ if len(name) > 50:
+ name_lst = name.split('-')
+ name = ""
+ split_name = True
+ for segment in name_lst:
+ if (len(name) + len(segment) + 1) > 50 and split_name:
+ name += "
"
+ split_name = False
+ name += segment + '-'
+ name = name[:-1]
+
+ y_val = test_data.get("LOWER", None)
+ if y_val:
+ y_val /= 1000000
+ if y_val > y_max:
+ y_max = y_val
+
+ time = "No Information"
+ result = "No Information"
+ hovertext = ("{name}
"
+ "Packet Throughput: {val:.2f}Mpps
"
+ "Final Duration: {time}
"
+ "Result: {result}".format(name=name,
+ val=y_val,
+ time=time,
+ result=result))
+ traces.append(plgo.Bar(x=[str(idx) + '.', ],
+ y=[y_val, ],
+ name=name,
+ text=hovertext,
+ hoverinfo="text"))
+ try:
+ # Create plot
+ layout = deepcopy(plot["layout"])
+ if layout.get("title", None):
+ layout["title"] = "Packet Throughput: {0}". \
+ format(layout["title"])
+ if y_max:
+ layout["yaxis"]["range"] = [0, y_max + 1]
+ plpl = plgo.Figure(data=traces, layout=layout)
+ # Export Plot
+ logging.info(" Writing file '{0}{1}'.".
+ format(plot["output-file"], plot["output-file-type"]))
+ ploff.plot(plpl, show_link=False, auto_open=False,
+ filename='{0}{1}'.format(plot["output-file"],
+ plot["output-file-type"]))
+ except PlotlyError as err:
+ logging.error(" Finished with error: {}".
+ format(repr(err).replace("\n", " ")))
+ return
+
+
+def plot_soak_boxes(plot, input_data):
+ """Generate the plot(s) with algorithm: plot_soak_boxes
+ specified in the specification file.
+
+ :param plot: Plot to generate.
+ :param input_data: Data to process.
+ :type plot: pandas.Series
+ :type input_data: InputData
+ """
+
+ # Transform the data
+ plot_title = plot.get("title", "")
+ logging.info(" Creating the data set for the {0} '{1}'.".
+ format(plot.get("type", ""), plot_title))
+ data = input_data.filter_data(plot)
+ if data is None:
+ logging.error("No data.")
+ return
+
+ # Prepare the data for the plot
+ y_vals = dict()
+ y_tags = dict()
+ for job in data:
+ for build in job:
+ for test in build:
+ if y_vals.get(test["parent"], None) is None:
+ y_tags[test["parent"]] = test.get("tags", None)
+ try:
+ if test["type"] in ("SOAK", ):
+ y_vals[test["parent"]] = test["throughput"]
+ else:
+ continue
+ except (KeyError, TypeError):
+ y_vals[test["parent"]] = dict()
+
+ # Sort the tests
+ order = plot.get("sort", None)
+ if order and y_tags:
+ y_sorted = OrderedDict()
+ y_tags_l = {s: [t.lower() for t in ts] for s, ts in y_tags.items()}
+ for tag in order:
+ logging.debug(tag)
+ for suite, tags in y_tags_l.items():
+ if "not " in tag:
+ tag = tag.split(" ")[-1]
+ if tag.lower() in tags:
+ continue
+ else:
+ if tag.lower() not in tags:
+ continue
+ try:
+ y_sorted[suite] = y_vals.pop(suite)
+ y_tags_l.pop(suite)
+ logging.debug(suite)
+ except KeyError as err:
+ logging.error("Not found: {0}".format(repr(err)))
+ finally:
+ break
+ else:
+ y_sorted = y_vals
+
+ idx = 0
+ y_max = 0
+ traces = list()
+ for test_name, test_data in y_sorted.items():
+ idx += 1
+ name = "{nr}. {name}".\
+ format(nr=idx, name=test_name.lower().replace('-soak', '').
+ replace('2n1l-', ''))
+ if len(name) > 55:
+ name_lst = name.split('-')
+ name = ""
+ split_name = True
+ for segment in name_lst:
+ if (len(name) + len(segment) + 1) > 55 and split_name:
+ name += "
"
+ split_name = False
+ name += segment + '-'
+ name = name[:-1]
+
+ y_val = test_data.get("UPPER", None)
+ if y_val:
+ y_val /= 1000000
+ if y_val > y_max:
+ y_max = y_val
+
+ y_base = test_data.get("LOWER", None)
+ if y_base:
+ y_base /= 1000000
+
+ hovertext = ("Upper bound: {upper:.2f}
"
+ "Lower bound: {lower:.2f}".format(upper=y_val,
+ lower=y_base))
+ traces.append(plgo.Bar(x=[str(idx) + '.', ],
+ # +0.05 to see the value in case lower == upper
+ y=[y_val - y_base + 0.05, ],
+ base=y_base,
+ name=name,
+ text=hovertext,
+ hoverinfo="text"))
+ try:
+ # Create plot
+ layout = deepcopy(plot["layout"])
+ if layout.get("title", None):
+ layout["title"] = "Throughput: {0}". \
+ format(layout["title"])
+ if y_max:
+ layout["yaxis"]["range"] = [0, y_max + 1]
+ plpl = plgo.Figure(data=traces, layout=layout)
+ # Export Plot
+ logging.info(" Writing file '{0}{1}'.".
+ format(plot["output-file"], plot["output-file-type"]))
+ ploff.plot(plpl, show_link=False, auto_open=False,
+ filename='{0}{1}'.format(plot["output-file"],
+ plot["output-file-type"]))
+ except PlotlyError as err:
+ logging.error(" Finished with error: {}".
+ format(repr(err).replace("\n", " ")))
return
@@ -204,6 +457,11 @@ def plot_latency_error_bars(plot, input_data):
for job in data:
for build in job:
for test in build:
+ try:
+ logging.debug("test['latency']: {0}\n".
+ format(test["latency"]))
+ except ValueError as err:
+ logging.warning(repr(err))
if y_tmp_vals.get(test["parent"], None) is None:
y_tmp_vals[test["parent"]] = [
list(), # direction1, min
@@ -221,6 +479,8 @@ def plot_latency_error_bars(plot, input_data):
elif "-ndr" in plot_title.lower():
ttype = "NDR"
else:
+ logging.warning("Invalid test type: {0}".
+ format(test["type"]))
continue
y_tmp_vals[test["parent"]][0].append(
test["latency"][ttype]["direction1"]["min"])
@@ -235,9 +495,12 @@ def plot_latency_error_bars(plot, input_data):
y_tmp_vals[test["parent"]][5].append(
test["latency"][ttype]["direction2"]["max"])
else:
+ logging.warning("Invalid test type: {0}".
+ format(test["type"]))
continue
- except (KeyError, TypeError):
- pass
+ except (KeyError, TypeError) as err:
+ logging.warning(repr(err))
+ logging.debug("y_tmp_vals: {0}\n".format(y_tmp_vals))
# Sort the tests
order = plot.get("sort", None)
@@ -245,48 +508,68 @@ def plot_latency_error_bars(plot, input_data):
y_sorted = OrderedDict()
y_tags_l = {s: [t.lower() for t in ts] for s, ts in y_tags.items()}
for tag in order:
+ logging.debug(tag)
for suite, tags in y_tags_l.items():
- if tag.lower() in tags:
- try:
- y_sorted[suite] = y_tmp_vals.pop(suite)
- y_tags_l.pop(suite)
- except KeyError as err:
- logging.error("Not found: {0}".format(err))
- finally:
- break
+ if "not " in tag:
+ tag = tag.split(" ")[-1]
+ if tag.lower() in tags:
+ continue
+ else:
+ if tag.lower() not in tags:
+ continue
+ try:
+ y_sorted[suite] = y_tmp_vals.pop(suite)
+ y_tags_l.pop(suite)
+ logging.debug(suite)
+ except KeyError as err:
+ logging.error("Not found: {0}".format(repr(err)))
+ finally:
+ break
else:
y_sorted = y_tmp_vals
+ logging.debug("y_sorted: {0}\n".format(y_sorted))
x_vals = list()
y_vals = list()
y_mins = list()
y_maxs = list()
+ nr_of_samples = list()
for key, val in y_sorted.items():
- key = "-".join(key.split("-")[1:-1])
- x_vals.append(key) # dir 1
+ name = re.sub(REGEX_NIC, "", key.replace('-ndrpdr', '').
+ replace('2n1l-', ''))
+ x_vals.append(name) # dir 1
y_vals.append(mean(val[1]) if val[1] else None)
y_mins.append(mean(val[0]) if val[0] else None)
y_maxs.append(mean(val[2]) if val[2] else None)
- x_vals.append(key) # dir 2
+ nr_of_samples.append(len(val[1]) if val[1] else 0)
+ x_vals.append(name) # dir 2
y_vals.append(mean(val[4]) if val[4] else None)
y_mins.append(mean(val[3]) if val[3] else None)
y_maxs.append(mean(val[5]) if val[5] else None)
+ nr_of_samples.append(len(val[3]) if val[3] else 0)
+ logging.debug("x_vals :{0}\n".format(x_vals))
+ logging.debug("y_vals :{0}\n".format(y_vals))
+ logging.debug("y_mins :{0}\n".format(y_mins))
+ logging.debug("y_maxs :{0}\n".format(y_maxs))
+ logging.debug("nr_of_samples :{0}\n".format(nr_of_samples))
traces = list()
annotations = list()
for idx in range(len(x_vals)):
if not bool(int(idx % 2)):
- direction = "West - East"
+ direction = "West-East"
else:
- direction = "East - West"
- hovertext = ("Test: {test}
"
+ direction = "East-West"
+ hovertext = ("No. of Runs: {nr}
"
+ "Test: {test}
"
"Direction: {dir}
".format(test=x_vals[idx],
- dir=direction))
+ dir=direction,
+ nr=nr_of_samples[idx]))
if isinstance(y_maxs[idx], float):
hovertext += "Max: {max:.2f}uSec
".format(max=y_maxs[idx])
if isinstance(y_vals[idx], float):
- hovertext += "Avg: {avg:.2f}uSec
".format(avg=y_vals[idx])
+ hovertext += "Mean: {avg:.2f}uSec
".format(avg=y_vals[idx])
if isinstance(y_mins[idx], float):
hovertext += "Min: {min:.2f}uSec".format(min=y_mins[idx])
@@ -298,6 +581,9 @@ def plot_latency_error_bars(plot, input_data):
arrayminus = [y_vals[idx] - y_mins[idx], ]
else:
arrayminus = [None, ]
+ logging.debug("y_vals[{1}] :{0}\n".format(y_vals[idx], idx))
+ logging.debug("array :{0}\n".format(array))
+ logging.debug("arrayminus :{0}\n".format(arrayminus))
traces.append(plgo.Scatter(
x=[idx, ],
y=[y_vals[idx], ],
@@ -340,7 +626,7 @@ def plot_latency_error_bars(plot, input_data):
format(plot["output-file"], plot["output-file-type"]))
layout = deepcopy(plot["layout"])
if layout.get("title", None):
- layout["title"] = "Packet Latency: {0}".\
+ layout["title"] = "Latency: {0}".\
format(layout["title"])
layout["annotations"] = annotations
plpl = plgo.Figure(data=traces, layout=layout)
@@ -415,9 +701,11 @@ def plot_throughput_speedup_analysis(plot, input_data):
for test_name, test_vals in y_vals.items():
for key, test_val in test_vals.items():
if test_val:
- y_vals[test_name][key] = sum(test_val) / len(test_val)
- if key == "1":
- y_1c_max[test_name] = max(test_val) / 1000000.0
+ avg_val = sum(test_val) / len(test_val)
+ y_vals[test_name][key] = (avg_val, len(test_val))
+ ideal = avg_val / (int(key) * 1000000.0)
+ if test_name not in y_1c_max or ideal > y_1c_max[test_name]:
+ y_1c_max[test_name] = ideal
vals = dict()
y_max = list()
@@ -425,38 +713,49 @@ def plot_throughput_speedup_analysis(plot, input_data):
lnk_limit = 0
pci_limit = plot["limits"]["pci"]["pci-g3-x8"]
for test_name, test_vals in y_vals.items():
- if test_vals["1"]:
- name = "-".join(test_name.split('-')[1:-1])
-
- vals[name] = dict()
- y_val_1 = test_vals["1"] / 1000000.0
- y_val_2 = test_vals["2"] / 1000000.0 if test_vals["2"] else None
- y_val_4 = test_vals["4"] / 1000000.0 if test_vals["4"] else None
-
- vals[name]["val"] = [y_val_1, y_val_2, y_val_4]
- vals[name]["rel"] = [1.0, None, None]
- vals[name]["ideal"] = [y_1c_max[test_name],
- y_1c_max[test_name] * 2,
- y_1c_max[test_name] * 4]
- vals[name]["diff"] = \
- [(y_val_1 - y_1c_max[test_name]) * 100 / y_val_1, None, None]
+ try:
+ if test_vals["1"][1]:
+ name = re.sub(REGEX_NIC, "", test_name.replace('-ndrpdr', '').
+ replace('2n1l-', ''))
+ vals[name] = dict()
+ y_val_1 = test_vals["1"][0] / 1000000.0
+ y_val_2 = test_vals["2"][0] / 1000000.0 if test_vals["2"][0] \
+ else None
+ y_val_4 = test_vals["4"][0] / 1000000.0 if test_vals["4"][0] \
+ else None
- try:
- val_max = max(max(vals[name]["val"], vals[name]["ideal"]))
- except ValueError as err:
- logging.error(err)
- continue
- if val_max:
- y_max.append(int((val_max / 10) + 1) * 10)
-
- if y_val_2:
- vals[name]["rel"][1] = round(y_val_2 / y_val_1, 2)
- vals[name]["diff"][1] = \
- (y_val_2 - vals[name]["ideal"][1]) * 100 / y_val_2
- if y_val_4:
- vals[name]["rel"][2] = round(y_val_4 / y_val_1, 2)
- vals[name]["diff"][2] = \
- (y_val_4 - vals[name]["ideal"][2]) * 100 / y_val_4
+ vals[name]["val"] = [y_val_1, y_val_2, y_val_4]
+ vals[name]["rel"] = [1.0, None, None]
+ vals[name]["ideal"] = [y_1c_max[test_name],
+ y_1c_max[test_name] * 2,
+ y_1c_max[test_name] * 4]
+ vals[name]["diff"] = [(y_val_1 - y_1c_max[test_name]) * 100 /
+ y_val_1, None, None]
+ vals[name]["count"] = [test_vals["1"][1],
+ test_vals["2"][1],
+ test_vals["4"][1]]
+
+ try:
+ # val_max = max(max(vals[name]["val"], vals[name]["ideal"]))
+ val_max = max(vals[name]["val"])
+ except ValueError as err:
+ logging.error(err)
+ continue
+ if val_max:
+ # y_max.append(int((val_max / 10) + 1) * 10)
+ y_max.append(val_max)
+
+ if y_val_2:
+ vals[name]["rel"][1] = round(y_val_2 / y_val_1, 2)
+ vals[name]["diff"][1] = \
+ (y_val_2 - vals[name]["ideal"][1]) * 100 / y_val_2
+ if y_val_4:
+ vals[name]["rel"][2] = round(y_val_4 / y_val_1, 2)
+ vals[name]["diff"][2] = \
+ (y_val_4 - vals[name]["ideal"][2]) * 100 / y_val_4
+ except IndexError as err:
+ logging.warning("No data for '{0}'".format(test_name))
+ logging.warning(repr(err))
# Limits:
if "x520" in test_name:
@@ -467,6 +766,8 @@ def plot_throughput_speedup_analysis(plot, input_data):
limit = plot["limits"]["nic"]["xxv710"]
elif "xl710" in test_name:
limit = plot["limits"]["nic"]["xl710"]
+ elif "x553" in test_name:
+ limit = plot["limits"]["nic"]["x553"]
else:
limit = 0
if limit > nic_limit:
@@ -494,7 +795,9 @@ def plot_throughput_speedup_analysis(plot, input_data):
for tag in order:
for test, tags in y_tags_l.items():
if tag.lower() in tags:
- name = "-".join(test.split('-')[1:-1])
+ name = re.sub(REGEX_NIC, "",
+ test.replace('-ndrpdr', '').
+ replace('2n1l-', ''))
try:
y_sorted[name] = vals.pop(name)
y_tags_l.pop(test)
@@ -516,35 +819,36 @@ def plot_throughput_speedup_analysis(plot, input_data):
logging.error(err)
return
nic_limit /= 1000000.0
- if nic_limit < threshold:
- traces.append(plgo.Scatter(
- x=x_vals,
- y=[nic_limit, ] * len(x_vals),
- name="NIC: {0:.2f}Mpps".format(nic_limit),
- showlegend=False,
- mode="lines",
- line=dict(
- dash="dot",
- color=COLORS[-1],
- width=1),
- hoverinfo="none"
- ))
- annotations.append(dict(
- x=1,
- y=nic_limit,
- xref="x",
- yref="y",
- xanchor="left",
- yanchor="bottom",
- text="NIC: {0:.2f}Mpps".format(nic_limit),
- font=dict(
- size=14,
- color=COLORS[-1],
- ),
- align="left",
- showarrow=False
- ))
- y_max.append(int((nic_limit / 10) + 1) * 10)
+ # if nic_limit < threshold:
+ traces.append(plgo.Scatter(
+ x=x_vals,
+ y=[nic_limit, ] * len(x_vals),
+ name="NIC: {0:.2f}Mpps".format(nic_limit),
+ showlegend=False,
+ mode="lines",
+ line=dict(
+ dash="dot",
+ color=COLORS[-1],
+ width=1),
+ hoverinfo="none"
+ ))
+ annotations.append(dict(
+ x=1,
+ y=nic_limit,
+ xref="x",
+ yref="y",
+ xanchor="left",
+ yanchor="bottom",
+ text="NIC: {0:.2f}Mpps".format(nic_limit),
+ font=dict(
+ size=14,
+ color=COLORS[-1],
+ ),
+ align="left",
+ showarrow=False
+ ))
+ # y_max.append(int((nic_limit / 10) + 1) * 10)
+ y_max.append(nic_limit)
lnk_limit /= 1000000.0
if lnk_limit < threshold:
@@ -575,10 +879,12 @@ def plot_throughput_speedup_analysis(plot, input_data):
align="left",
showarrow=False
))
- y_max.append(int((lnk_limit / 10) + 1) * 10)
+ # y_max.append(int((lnk_limit / 10) + 1) * 10)
+ y_max.append(lnk_limit)
pci_limit /= 1000000.0
- if pci_limit < threshold:
+ if (pci_limit < threshold and
+ (pci_limit < lnk_limit * 0.95 or lnk_limit > lnk_limit * 1.05)):
traces.append(plgo.Scatter(
x=x_vals,
y=[pci_limit, ] * len(x_vals),
@@ -606,51 +912,58 @@ def plot_throughput_speedup_analysis(plot, input_data):
align="left",
showarrow=False
))
- y_max.append(int((pci_limit / 10) + 1) * 10)
+ # y_max.append(int((pci_limit / 10) + 1) * 10)
+ y_max.append(pci_limit)
# Perfect and measured:
cidx = 0
for name, val in y_sorted.iteritems():
hovertext = list()
- for idx in range(len(val["val"])):
- htext = ""
- if isinstance(val["val"][idx], float):
- htext += "value: {0:.2f}Mpps
".format(val["val"][idx])
- if isinstance(val["diff"][idx], float):
- htext += "diff: {0:.0f}%
".format(round(val["diff"][idx]))
- if isinstance(val["rel"][idx], float):
- htext += "speedup: {0:.2f}".format(val["rel"][idx])
- hovertext.append(htext)
- traces.append(plgo.Scatter(x=x_vals,
- y=val["val"],
- name=name,
- legendgroup=name,
- mode="lines+markers",
- line=dict(
- color=COLORS[cidx],
- width=2),
- marker=dict(
- symbol="circle",
- size=10
- ),
- text=hovertext,
- hoverinfo="text+name"
- ))
- traces.append(plgo.Scatter(x=x_vals,
- y=val["ideal"],
- name="{0} perfect".format(name),
- legendgroup=name,
- showlegend=False,
- mode="lines",
- line=dict(
- color=COLORS[cidx],
- width=2,
- dash="dash"),
- text=["perfect: {0:.2f}Mpps".format(y)
- for y in val["ideal"]],
- hoverinfo="text"
- ))
- cidx += 1
+ try:
+ for idx in range(len(val["val"])):
+ htext = ""
+ if isinstance(val["val"][idx], float):
+ htext += "No. of Runs: {1}
" \
+ "Mean: {0:.2f}Mpps
".format(val["val"][idx],
+ val["count"][idx])
+ if isinstance(val["diff"][idx], float):
+ htext += "Diff: {0:.0f}%
".format(round(val["diff"][idx]))
+ if isinstance(val["rel"][idx], float):
+ htext += "Speedup: {0:.2f}".format(val["rel"][idx])
+ hovertext.append(htext)
+ traces.append(plgo.Scatter(x=x_vals,
+ y=val["val"],
+ name=name,
+ legendgroup=name,
+ mode="lines+markers",
+ line=dict(
+ color=COLORS[cidx],
+ width=2),
+ marker=dict(
+ symbol="circle",
+ size=10
+ ),
+ text=hovertext,
+ hoverinfo="text+name"
+ ))
+ traces.append(plgo.Scatter(x=x_vals,
+ y=val["ideal"],
+ name="{0} perfect".format(name),
+ legendgroup=name,
+ showlegend=False,
+ mode="lines",
+ line=dict(
+ color=COLORS[cidx],
+ width=2,
+ dash="dash"),
+ text=["Perfect: {0:.2f}Mpps".format(y)
+ for y in val["ideal"]],
+ hoverinfo="text"
+ ))
+ cidx += 1
+ except (IndexError, ValueError, KeyError) as err:
+ logging.warning("No data for '{0}'".format(name))
+ logging.warning(repr(err))
try:
# Create plot
@@ -660,6 +973,8 @@ def plot_throughput_speedup_analysis(plot, input_data):
if layout.get("title", None):
layout["title"] = "Speedup Multi-core: {0}". \
format(layout["title"])
+ # layout["yaxis"]["range"] = [0, int((max(y_max) / 10) + 1) * 10]
+ layout["yaxis"]["range"] = [0, int(max(y_max) * 1.1)]
layout["annotations"].extend(annotations)
plpl = plgo.Figure(data=traces, layout=layout)
@@ -706,9 +1021,11 @@ def plot_http_server_performance_box(plot, input_data):
# Add None to the lists with missing data
max_len = 0
+ nr_of_samples = list()
for val in y_vals.values():
if len(val) > max_len:
max_len = len(val)
+ nr_of_samples.append(len(val))
for key, val in y_vals.items():
if len(val) < max_len:
val.extend([None for _ in range(max_len - len(val))])
@@ -718,8 +1035,22 @@ def plot_http_server_performance_box(plot, input_data):
df = pd.DataFrame(y_vals)
df.head()
for i, col in enumerate(df.columns):
- name = "{0}. {1}".format(i + 1, col.lower().replace('-cps', '').
- replace('-rps', ''))
+ name = "{nr}. ({samples:02d} run{plural}) {name}".\
+ format(nr=(i + 1),
+ samples=nr_of_samples[i],
+ plural='s' if nr_of_samples[i] > 1 else '',
+ name=col.lower().replace('-ndrpdr', ''))
+ if len(name) > 50:
+ name_lst = name.split('-')
+ name = ""
+ split_name = True
+ for segment in name_lst:
+ if (len(name) + len(segment) + 1) > 50 and split_name:
+ name += "
"
+ split_name = False
+ name += segment + '-'
+ name = name[:-1]
+
traces.append(plgo.Box(x=[str(i + 1) + '.'] * len(df[col]),
y=df[col],
name=name,
@@ -738,3 +1069,286 @@ def plot_http_server_performance_box(plot, input_data):
logging.error(" Finished with error: {}".
format(str(err).replace("\n", " ")))
return
+
+
+def plot_service_density_heatmap(plot, input_data):
+ """Generate the plot(s) with algorithm: plot_service_density_heatmap
+ specified in the specification file.
+
+ :param plot: Plot to generate.
+ :param input_data: Data to process.
+ :type plot: pandas.Series
+ :type input_data: InputData
+ """
+
+ REGEX_CN = re.compile(r'^(\d*)R(\d*)C$')
+ REGEX_TEST_NAME = re.compile(r'^.*-(\d+vhost|\d+memif)-'
+ r'(\d+chain|\d+pipe)-'
+ r'(\d+vm|\d+dcr|\d+drc).*$')
+
+ txt_chains = list()
+ txt_nodes = list()
+ vals = dict()
+
+ # Transform the data
+ logging.info(" Creating the data set for the {0} '{1}'.".
+ format(plot.get("type", ""), plot.get("title", "")))
+ data = input_data.filter_data(plot, continue_on_error=True)
+ if data is None or data.empty:
+ logging.error("No data.")
+ return
+
+ for job in data:
+ for build in job:
+ for test in build:
+ for tag in test['tags']:
+ groups = re.search(REGEX_CN, tag)
+ if groups:
+ c = str(groups.group(1))
+ n = str(groups.group(2))
+ break
+ else:
+ continue
+ groups = re.search(REGEX_TEST_NAME, test["name"])
+ if groups and len(groups.groups()) == 3:
+ hover_name = "{vhost}-{chain}-{vm}".format(
+ vhost=str(groups.group(1)),
+ chain=str(groups.group(2)),
+ vm=str(groups.group(3)))
+ else:
+ hover_name = ""
+ if vals.get(c, None) is None:
+ vals[c] = dict()
+ if vals[c].get(n, None) is None:
+ vals[c][n] = dict(name=hover_name,
+ vals=list(),
+ nr=None,
+ mean=None,
+ stdev=None)
+ try:
+ if plot["include-tests"] == "MRR":
+ result = test["result"]["receive-rate"].avg
+ elif plot["include-tests"] == "PDR":
+ result = test["throughput"]["PDR"]["LOWER"]
+ elif plot["include-tests"] == "NDR":
+ result = test["throughput"]["NDR"]["LOWER"]
+ else:
+ result = None
+ except TypeError:
+ result = None
+
+ if result:
+ vals[c][n]["vals"].append(result)
+
+ if not vals:
+ logging.error("No data.")
+ return
+
+ for key_c in vals.keys():
+ txt_chains.append(key_c)
+ for key_n in vals[key_c].keys():
+ txt_nodes.append(key_n)
+ if vals[key_c][key_n]["vals"]:
+ vals[key_c][key_n]["nr"] = len(vals[key_c][key_n]["vals"])
+ vals[key_c][key_n]["mean"] = \
+ round(mean(vals[key_c][key_n]["vals"]) / 1000000, 1)
+ vals[key_c][key_n]["stdev"] = \
+ round(stdev(vals[key_c][key_n]["vals"]) / 1000000, 1)
+ txt_nodes = list(set(txt_nodes))
+
+ txt_chains = sorted(txt_chains, key=lambda chain: int(chain))
+ txt_nodes = sorted(txt_nodes, key=lambda node: int(node))
+
+ chains = [i + 1 for i in range(len(txt_chains))]
+ nodes = [i + 1 for i in range(len(txt_nodes))]
+
+ data = [list() for _ in range(len(chains))]
+ for c in chains:
+ for n in nodes:
+ try:
+ val = vals[txt_chains[c - 1]][txt_nodes[n - 1]]["mean"]
+ except (KeyError, IndexError):
+ val = None
+ data[c - 1].append(val)
+
+ # Colorscales:
+ my_green = [[0.0, 'rgb(235, 249, 242)'],
+ [1.0, 'rgb(45, 134, 89)']]
+
+ my_blue = [[0.0, 'rgb(236, 242, 248)'],
+ [1.0, 'rgb(57, 115, 172)']]
+
+ my_grey = [[0.0, 'rgb(230, 230, 230)'],
+ [1.0, 'rgb(102, 102, 102)']]
+
+ hovertext = list()
+ annotations = list()
+
+ text = ("Test: {name}
"
+ "Runs: {nr}
"
+ "Thput: {val}
"
+ "StDev: {stdev}")
+
+ for c in range(len(txt_chains)):
+ hover_line = list()
+ for n in range(len(txt_nodes)):
+ if data[c][n] is not None:
+ annotations.append(dict(
+ x=n+1,
+ y=c+1,
+ xref="x",
+ yref="y",
+ xanchor="center",
+ yanchor="middle",
+ text=str(data[c][n]),
+ font=dict(
+ size=14,
+ ),
+ align="center",
+ showarrow=False
+ ))
+ hover_line.append(text.format(
+ name=vals[txt_chains[c]][txt_nodes[n]]["name"],
+ nr=vals[txt_chains[c]][txt_nodes[n]]["nr"],
+ val=data[c][n],
+ stdev=vals[txt_chains[c]][txt_nodes[n]]["stdev"]))
+ hovertext.append(hover_line)
+
+ traces = [
+ plgo.Heatmap(x=nodes,
+ y=chains,
+ z=data,
+ colorbar=dict(
+ title=plot.get("z-axis", ""),
+ titleside="right",
+ titlefont=dict(
+ size=16
+ ),
+ tickfont=dict(
+ size=16,
+ ),
+ tickformat=".1f",
+ yanchor="bottom",
+ y=-0.02,
+ len=0.925,
+ ),
+ showscale=True,
+ colorscale=my_green,
+ text=hovertext,
+ hoverinfo="text")
+ ]
+
+ for idx, item in enumerate(txt_nodes):
+ # X-axis, numbers:
+ annotations.append(dict(
+ x=idx+1,
+ y=0.05,
+ xref="x",
+ yref="y",
+ xanchor="center",
+ yanchor="top",
+ text=item,
+ font=dict(
+ size=16,
+ ),
+ align="center",
+ showarrow=False
+ ))
+ for idx, item in enumerate(txt_chains):
+ # Y-axis, numbers:
+ annotations.append(dict(
+ x=0.35,
+ y=idx+1,
+ xref="x",
+ yref="y",
+ xanchor="right",
+ yanchor="middle",
+ text=item,
+ font=dict(
+ size=16,
+ ),
+ align="center",
+ showarrow=False
+ ))
+ # X-axis, title:
+ annotations.append(dict(
+ x=0.55,
+ y=-0.15,
+ xref="paper",
+ yref="y",
+ xanchor="center",
+ yanchor="bottom",
+ text=plot.get("x-axis", ""),
+ font=dict(
+ size=16,
+ ),
+ align="center",
+ showarrow=False
+ ))
+ # Y-axis, title:
+ annotations.append(dict(
+ x=-0.1,
+ y=0.5,
+ xref="x",
+ yref="paper",
+ xanchor="center",
+ yanchor="middle",
+ text=plot.get("y-axis", ""),
+ font=dict(
+ size=16,
+ ),
+ align="center",
+ textangle=270,
+ showarrow=False
+ ))
+ updatemenus = list([
+ dict(
+ x=1.0,
+ y=0.0,
+ xanchor='right',
+ yanchor='bottom',
+ direction='up',
+ buttons=list([
+ dict(
+ args=[{"colorscale": [my_green, ], "reversescale": False}],
+ label="Green",
+ method="update"
+ ),
+ dict(
+ args=[{"colorscale": [my_blue, ], "reversescale": False}],
+ label="Blue",
+ method="update"
+ ),
+ dict(
+ args=[{"colorscale": [my_grey, ], "reversescale": False}],
+ label="Grey",
+ method="update"
+ )
+ ])
+ )
+ ])
+
+ try:
+ layout = deepcopy(plot["layout"])
+ except KeyError as err:
+ logging.error("Finished with error: No layout defined")
+ logging.error(repr(err))
+ return
+
+ layout["annotations"] = annotations
+ layout['updatemenus'] = updatemenus
+
+ try:
+ # Create plot
+ plpl = plgo.Figure(data=traces, layout=layout)
+
+ # Export Plot
+ logging.info(" Writing file '{0}{1}'.".
+ format(plot["output-file"], plot["output-file-type"]))
+ ploff.plot(plpl, show_link=False, auto_open=False,
+ filename='{0}{1}'.format(plot["output-file"],
+ plot["output-file-type"]))
+ except PlotlyError as err:
+ logging.error(" Finished with error: {}".
+ format(str(err).replace("\n", " ")))
+ return