X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_plots.py;h=869d2ca21e2b60d2f2fa62dd545a5fce0cab27d5;hb=688a68a8f6d8a69a85cb76421a16dff9c4105c52;hp=89eb1c6521444858d1172a5236712247282d7be5;hpb=f417795bfa70a4cfccb0036e02cef7fe8892f2d0;p=csit.git
diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index 89eb1c6521..869d2ca21e 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -27,18 +27,36 @@ import pandas as pd
import plotly.offline as ploff
import plotly.graph_objs as plgo
-from plotly.subplots import make_subplots
from plotly.exceptions import PlotlyError
from pal_utils import mean, stdev
-COLORS = [u"SkyBlue", u"Olive", u"Purple", u"Coral", u"Indigo", u"Pink",
- u"Chocolate", u"Brown", u"Magenta", u"Cyan", u"Orange", u"Black",
- u"Violet", u"Blue", u"Yellow", u"BurlyWood", u"CadetBlue", u"Crimson",
- u"DarkBlue", u"DarkCyan", u"DarkGreen", u"Green", u"GoldenRod",
- u"LightGreen", u"LightSeaGreen", u"LightSkyBlue", u"Maroon",
- u"MediumSeaGreen", u"SeaGreen", u"LightSlateGrey"]
+COLORS = (
+ u"#1A1110",
+ u"#DA2647",
+ u"#214FC6",
+ u"#01786F",
+ u"#BD8260",
+ u"#FFD12A",
+ u"#A6E7FF",
+ u"#738276",
+ u"#C95A49",
+ u"#FC5A8D",
+ u"#CEC8EF",
+ u"#391285",
+ u"#6F2DA8",
+ u"#FF878D",
+ u"#45A27D",
+ u"#FFD0B9",
+ u"#FD5240",
+ u"#DB91EF",
+ u"#44D7A8",
+ u"#4F86F7",
+ u"#84DE02",
+ u"#FFCFF1",
+ u"#614051"
+)
REGEX_NIC = re.compile(r'(\d*ge\dp\d\D*\d*[a-z]*)-')
@@ -55,12 +73,9 @@ def generate_plots(spec, data):
generator = {
u"plot_nf_reconf_box_name": plot_nf_reconf_box_name,
u"plot_perf_box_name": plot_perf_box_name,
- u"plot_lat_err_bars_name": plot_lat_err_bars_name,
u"plot_tsa_name": plot_tsa_name,
u"plot_http_server_perf_box": plot_http_server_perf_box,
u"plot_nf_heatmap": plot_nf_heatmap,
- u"plot_lat_hdrh_bar_name": plot_lat_hdrh_bar_name,
- u"plot_lat_hdrh_percentile": plot_lat_hdrh_percentile,
u"plot_hdrh_lat_by_percentile": plot_hdrh_lat_by_percentile
}
@@ -79,111 +94,6 @@ def generate_plots(spec, data):
logging.info(u"Done.")
-def plot_lat_hdrh_percentile(plot, input_data):
- """Generate the plot(s) with algorithm: plot_lat_hdrh_percentile
- 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(u"title", u"")
- logging.info(
- f" Creating the data set for the {plot.get(u'type', u'')} "
- f"{plot_title}."
- )
- data = input_data.filter_tests_by_name(
- plot, params=[u"latency", u"parent", u"tags", u"type"])
- if data is None or len(data[0][0]) == 0:
- logging.error(u"No data.")
- return
-
- fig = plgo.Figure()
-
- # Prepare the data for the plot
- directions = [u"W-E", u"E-W"]
- for color, test in enumerate(data[0][0]):
- try:
- if test[u"type"] in (u"NDRPDR",):
- if u"-pdr" in plot_title.lower():
- ttype = u"PDR"
- elif u"-ndr" in plot_title.lower():
- ttype = u"NDR"
- else:
- logging.warning(f"Invalid test type: {test[u'type']}")
- continue
- name = re.sub(REGEX_NIC, u"", test[u"parent"].
- replace(u'-ndrpdr', u'').
- replace(u'2n1l-', u''))
- for idx, direction in enumerate(
- (u"direction1", u"direction2", )):
- try:
- hdr_lat = test[u"latency"][ttype][direction][u"hdrh"]
- # TODO: Workaround, HDRH data must be aligned to 4
- # bytes, remove when not needed.
- hdr_lat += u"=" * (len(hdr_lat) % 4)
- xaxis = list()
- yaxis = list()
- hovertext = list()
- decoded = hdrh.histogram.HdrHistogram.decode(hdr_lat)
- for item in decoded.get_recorded_iterator():
- percentile = item.percentile_level_iterated_to
- if percentile != 100.0:
- xaxis.append(100.0 / (100.0 - percentile))
- yaxis.append(item.value_iterated_to)
- hovertext.append(
- f"Test: {name}
"
- f"Direction: {directions[idx]}
"
- f"Percentile: {percentile:.5f}%
"
- f"Latency: {item.value_iterated_to}uSec"
- )
- fig.add_trace(
- plgo.Scatter(
- x=xaxis,
- y=yaxis,
- name=name,
- mode=u"lines",
- legendgroup=name,
- showlegend=bool(idx),
- line=dict(
- color=COLORS[color]
- ),
- hovertext=hovertext,
- hoverinfo=u"text"
- )
- )
- except hdrh.codec.HdrLengthException as err:
- logging.warning(
- f"No or invalid data for HDRHistogram for the test "
- f"{name}\n{err}"
- )
- continue
- else:
- logging.warning(f"Invalid test type: {test[u'type']}")
- continue
- except (ValueError, KeyError) as err:
- logging.warning(repr(err))
-
- layout = deepcopy(plot[u"layout"])
-
- layout[u"title"][u"text"] = \
- f"Latency: {plot.get(u'graph-title', u'')}"
- fig[u"layout"].update(layout)
-
- # Create plot
- file_type = plot.get(u"output-file-type", u".html")
- logging.info(f" Writing file {plot[u'output-file']}{file_type}.")
- try:
- # Export Plot
- ploff.plot(fig, show_link=False, auto_open=False,
- filename=f"{plot[u'output-file']}{file_type}")
- except PlotlyError as err:
- logging.error(f" Finished with error: {repr(err)}")
-
-
def plot_hdrh_lat_by_percentile(plot, input_data):
"""Generate the plot(s) with algorithm: plot_hdrh_lat_by_percentile
specified in the specification file.
@@ -269,9 +179,16 @@ def plot_hdrh_lat_by_percentile(plot, input_data):
f"Percentile: 0.0%
"
f"Latency: 0.0uSec"
]
- decoded = hdrh.histogram.HdrHistogram.decode(
- test[u"latency"][graph][direction][u"hdrh"]
- )
+ try:
+ decoded = hdrh.histogram.HdrHistogram.decode(
+ test[u"latency"][graph][direction][u"hdrh"]
+ )
+ except hdrh.codec.HdrLengthException:
+ logging.warning(
+ f"No data for direction {(u'W-E', u'E-W')[idx % 2]}"
+ )
+ continue
+
for item in decoded.get_recorded_iterator():
percentile = item.percentile_level_iterated_to
if percentile > 99.9:
@@ -294,7 +211,7 @@ def plot_hdrh_lat_by_percentile(plot, input_data):
showlegend=bool(idx),
line=dict(
color=COLORS[color],
- dash=u"solid" if idx % 2 else u"dash"
+ dash=u"dash" if idx % 2 else u"solid"
),
hovertext=hovertext,
hoverinfo=u"text"
@@ -336,182 +253,6 @@ def plot_hdrh_lat_by_percentile(plot, input_data):
continue
-def plot_lat_hdrh_bar_name(plot, input_data):
- """Generate the plot(s) with algorithm: plot_lat_hdrh_bar_name
- 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(u"title", u"")
- logging.info(
- f" Creating the data set for the {plot.get(u'type', u'')} "
- f"{plot_title}."
- )
- data = input_data.filter_tests_by_name(
- plot, params=[u"latency", u"parent", u"tags", u"type"])
- if data is None or len(data[0][0]) == 0:
- logging.error(u"No data.")
- return
-
- # Prepare the data for the plot
- directions = [u"W-E", u"E-W"]
- tests = list()
- traces = list()
- for idx_row, test in enumerate(data[0][0]):
- try:
- if test[u"type"] in (u"NDRPDR",):
- if u"-pdr" in plot_title.lower():
- ttype = u"PDR"
- elif u"-ndr" in plot_title.lower():
- ttype = u"NDR"
- else:
- logging.warning(f"Invalid test type: {test[u'type']}")
- continue
- name = re.sub(REGEX_NIC, u"", test[u"parent"].
- replace(u'-ndrpdr', u'').
- replace(u'2n1l-', u''))
- histograms = list()
- for idx_col, direction in enumerate(
- (u"direction1", u"direction2", )):
- try:
- hdr_lat = test[u"latency"][ttype][direction][u"hdrh"]
- # TODO: Workaround, HDRH data must be aligned to 4
- # bytes, remove when not needed.
- hdr_lat += u"=" * (len(hdr_lat) % 4)
- xaxis = list()
- yaxis = list()
- hovertext = list()
- decoded = hdrh.histogram.HdrHistogram.decode(hdr_lat)
- total_count = decoded.get_total_count()
- for item in decoded.get_recorded_iterator():
- xaxis.append(item.value_iterated_to)
- prob = float(item.count_added_in_this_iter_step) / \
- total_count * 100
- yaxis.append(prob)
- hovertext.append(
- f"Test: {name}
"
- f"Direction: {directions[idx_col]}
"
- f"Latency: {item.value_iterated_to}uSec
"
- f"Probability: {prob:.2f}%
"
- f"Percentile: "
- f"{item.percentile_level_iterated_to:.2f}"
- )
- marker_color = [COLORS[idx_row], ] * len(yaxis)
- marker_color[xaxis.index(
- decoded.get_value_at_percentile(50.0))] = u"red"
- marker_color[xaxis.index(
- decoded.get_value_at_percentile(90.0))] = u"red"
- marker_color[xaxis.index(
- decoded.get_value_at_percentile(95.0))] = u"red"
- histograms.append(
- plgo.Bar(
- x=xaxis,
- y=yaxis,
- showlegend=False,
- name=name,
- marker={u"color": marker_color},
- hovertext=hovertext,
- hoverinfo=u"text"
- )
- )
- except hdrh.codec.HdrLengthException as err:
- logging.warning(
- f"No or invalid data for HDRHistogram for the test "
- f"{name}\n{err}"
- )
- continue
- if len(histograms) == 2:
- traces.append(histograms)
- tests.append(name)
- else:
- logging.warning(f"Invalid test type: {test[u'type']}")
- continue
- except (ValueError, KeyError) as err:
- logging.warning(repr(err))
-
- if not tests:
- logging.warning(f"No data for {plot_title}.")
- return
-
- fig = make_subplots(
- rows=len(tests),
- cols=2,
- specs=[
- [{u"type": u"bar"}, {u"type": u"bar"}] for _ in range(len(tests))
- ]
- )
-
- layout_axes = dict(
- gridcolor=u"rgb(220, 220, 220)",
- linecolor=u"rgb(220, 220, 220)",
- linewidth=1,
- showgrid=True,
- showline=True,
- showticklabels=True,
- tickcolor=u"rgb(220, 220, 220)",
- )
-
- for idx_row, test in enumerate(tests):
- for idx_col in range(2):
- fig.add_trace(
- traces[idx_row][idx_col],
- row=idx_row + 1,
- col=idx_col + 1
- )
- fig.update_xaxes(
- row=idx_row + 1,
- col=idx_col + 1,
- **layout_axes
- )
- fig.update_yaxes(
- row=idx_row + 1,
- col=idx_col + 1,
- **layout_axes
- )
-
- layout = deepcopy(plot[u"layout"])
-
- layout[u"title"][u"text"] = \
- f"Latency: {plot.get(u'graph-title', u'')}"
- layout[u"height"] = 250 * len(tests) + 130
-
- layout[u"annotations"][2][u"y"] = 1.06 - 0.008 * len(tests)
- layout[u"annotations"][3][u"y"] = 1.06 - 0.008 * len(tests)
-
- for idx, test in enumerate(tests):
- layout[u"annotations"].append({
- u"font": {
- u"size": 14
- },
- u"showarrow": False,
- u"text": f"{test}",
- u"textangle": 0,
- u"x": 0.5,
- u"xanchor": u"center",
- u"xref": u"paper",
- u"y": 1.0 - float(idx) * 1.06 / len(tests),
- u"yanchor": u"bottom",
- u"yref": u"paper"
- })
-
- fig[u"layout"].update(layout)
-
- # Create plot
- file_type = plot.get(u"output-file-type", u".html")
- logging.info(f" Writing file {plot[u'output-file']}{file_type}.")
- try:
- # Export Plot
- ploff.plot(fig, show_link=False, auto_open=False,
- filename=f"{plot[u'output-file']}{file_type}")
- except PlotlyError as err:
- logging.error(f" Finished with error: {repr(err)}")
-
-
def plot_nf_reconf_box_name(plot, input_data):
"""Generate the plot(s) with algorithm: plot_nf_reconf_box_name
specified in the specification file.
@@ -585,7 +326,7 @@ def plot_nf_reconf_box_name(plot, input_data):
# Create plot
layout = deepcopy(plot[u"layout"])
layout[u"title"] = f"Time Lost: {layout[u'title']}"
- layout[u"yaxis"][u"title"] = u"Implied Time Lost [s]"
+ layout[u"yaxis"][u"title"] = u"Effective Blocked Time [s]"
layout[u"legend"][u"font"][u"size"] = 14
layout[u"yaxis"].pop(u"range")
plpl = plgo.Figure(data=traces, layout=layout)
@@ -622,52 +363,83 @@ def plot_perf_box_name(plot, input_data):
f"{plot.get(u'title', u'')}."
)
data = input_data.filter_tests_by_name(
- plot, params=[u"throughput", u"result", u"parent", u"tags", u"type"])
+ plot,
+ params=[u"throughput", u"gbps", u"result", u"parent", u"tags", u"type"])
if data is None:
logging.error(u"No data.")
return
# Prepare the data for the plot
+ plot_title = plot.get(u"title", u"").lower()
+
+ 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:
- for build in job:
- for test in build:
- if y_vals.get(test[u"parent"], None) is None:
- y_vals[test[u"parent"]] = list()
- try:
- if (test[u"type"] in (u"NDRPDR", ) and
- u"-pdr" in plot.get(u"title", u"").lower()):
- y_vals[test[u"parent"]].\
- append(test[u"throughput"][u"PDR"][u"LOWER"])
- test_type = u"NDRPDR"
- elif (test[u"type"] in (u"NDRPDR", ) and
- u"-ndr" in plot.get(u"title", u"").lower()):
- y_vals[test[u"parent"]]. \
- append(test[u"throughput"][u"NDR"][u"LOWER"])
- test_type = u"NDRPDR"
- elif test[u"type"] in (u"SOAK", ):
- y_vals[test[u"parent"]].\
- append(test[u"throughput"][u"LOWER"])
- test_type = u"SOAK"
- elif test[u"type"] in (u"HOSTSTACK", ):
- if u"LDPRELOAD" in test[u"tags"]:
- y_vals[test[u"parent"]].append(
- float(test[u"result"][u"bits_per_second"]) / 1e3
- )
- elif u"VPPECHO" in test[u"tags"]:
+
+ for item in plot.get(u"include", tuple()):
+ reg_ex = re.compile(str(item).lower())
+ for job in data:
+ for build in job:
+ for test_id, test in build.iteritems():
+ if not re.match(reg_ex, str(test_id).lower()):
+ continue
+ if y_vals.get(test[u"parent"], None) is None:
+ y_vals[test[u"parent"]] = list()
+ try:
+ if test[u"type"] in (u"NDRPDR", u"CPS"):
+ test_type = test[u"type"]
+
+ 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 "
+ u"type. Add '-ndr' or '-pdr' to the test "
+ u"title."
+ )
+
y_vals[test[u"parent"]].append(
- (float(test[u"result"][u"client"][u"tx_data"])
- * 8 / 1e3) /
- ((float(test[u"result"][u"client"][u"time"]) +
- float(test[u"result"][u"server"][u"time"])) /
- 2)
+ test[value][ttype][u"LOWER"] * multiplier
)
- test_type = u"HOSTSTACK"
- else:
- continue
- except (KeyError, TypeError):
- y_vals[test[u"parent"]].append(None)
+
+ elif test[u"type"] in (u"SOAK",):
+ y_vals[test[u"parent"]]. \
+ append(test[u"throughput"][u"LOWER"])
+ test_type = u"SOAK"
+
+ elif test[u"type"] in (u"HOSTSTACK",):
+ if u"LDPRELOAD" in test[u"tags"]:
+ y_vals[test[u"parent"]].append(
+ float(
+ test[u"result"][u"bits_per_second"]
+ ) / 1e3
+ )
+ elif u"VPPECHO" in test[u"tags"]:
+ y_vals[test[u"parent"]].append(
+ (float(
+ test[u"result"][u"client"][u"tx_data"]
+ ) * 8 / 1e3) /
+ ((float(
+ test[u"result"][u"client"][u"time"]
+ ) +
+ float(
+ test[u"result"][u"server"][u"time"])
+ ) / 2)
+ )
+ test_type = u"HOSTSTACK"
+
+ else:
+ continue
+
+ except (KeyError, TypeError):
+ y_vals[test[u"parent"]].append(None)
# Add None to the lists with missing data
max_len = 0
@@ -719,6 +491,8 @@ def plot_perf_box_name(plot, input_data):
if layout.get(u"title", None):
if test_type in (u"HOSTSTACK", ):
layout[u"title"] = f"Bandwidth: {layout[u'title']}"
+ elif test_type in (u"CPS", ):
+ layout[u"title"] = f"CPS: {layout[u'title']}"
else:
layout[u"title"] = f"Throughput: {layout[u'title']}"
if y_max:
@@ -740,179 +514,6 @@ def plot_perf_box_name(plot, input_data):
return
-def plot_lat_err_bars_name(plot, input_data):
- """Generate the plot(s) with algorithm: plot_lat_err_bars_name
- 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(u"title", u"")
- logging.info(
- f" Creating data set for the {plot.get(u'type', u'')} {plot_title}."
- )
- data = input_data.filter_tests_by_name(
- plot, params=[u"latency", u"parent", u"tags", u"type"])
- if data is None:
- logging.error(u"No data.")
- return
-
- # Prepare the data for the plot
- y_tmp_vals = OrderedDict()
- for job in data:
- for build in job:
- for test in build:
- try:
- logging.debug(f"test[u'latency']: {test[u'latency']}\n")
- except ValueError as err:
- logging.warning(repr(err))
- if y_tmp_vals.get(test[u"parent"], None) is None:
- y_tmp_vals[test[u"parent"]] = [
- list(), # direction1, min
- list(), # direction1, avg
- list(), # direction1, max
- list(), # direction2, min
- list(), # direction2, avg
- list() # direction2, max
- ]
- try:
- if test[u"type"] not in (u"NDRPDR", ):
- logging.warning(f"Invalid test type: {test[u'type']}")
- continue
- if u"-pdr" in plot_title.lower():
- ttype = u"PDR"
- elif u"-ndr" in plot_title.lower():
- ttype = u"NDR"
- else:
- logging.warning(
- f"Invalid test type: {test[u'type']}"
- )
- continue
- y_tmp_vals[test[u"parent"]][0].append(
- test[u"latency"][ttype][u"direction1"][u"min"])
- y_tmp_vals[test[u"parent"]][1].append(
- test[u"latency"][ttype][u"direction1"][u"avg"])
- y_tmp_vals[test[u"parent"]][2].append(
- test[u"latency"][ttype][u"direction1"][u"max"])
- y_tmp_vals[test[u"parent"]][3].append(
- test[u"latency"][ttype][u"direction2"][u"min"])
- y_tmp_vals[test[u"parent"]][4].append(
- test[u"latency"][ttype][u"direction2"][u"avg"])
- y_tmp_vals[test[u"parent"]][5].append(
- test[u"latency"][ttype][u"direction2"][u"max"])
- except (KeyError, TypeError) as err:
- logging.warning(repr(err))
-
- x_vals = list()
- y_vals = list()
- y_mins = list()
- y_maxs = list()
- nr_of_samples = list()
- for key, val in y_tmp_vals.items():
- name = re.sub(REGEX_NIC, u"", key.replace(u'-ndrpdr', u'').
- replace(u'2n1l-', u''))
- 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)
- 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)
-
- traces = list()
- annotations = list()
-
- for idx, _ in enumerate(x_vals):
- if not bool(int(idx % 2)):
- direction = u"West-East"
- else:
- direction = u"East-West"
- hovertext = (
- f"No. of Runs: {nr_of_samples[idx]}
"
- f"Test: {x_vals[idx]}
"
- f"Direction: {direction}
"
- )
- if isinstance(y_maxs[idx], float):
- hovertext += f"Max: {y_maxs[idx]:.2f}uSec
"
- if isinstance(y_vals[idx], float):
- hovertext += f"Mean: {y_vals[idx]:.2f}uSec
"
- if isinstance(y_mins[idx], float):
- hovertext += f"Min: {y_mins[idx]:.2f}uSec"
-
- if isinstance(y_maxs[idx], float) and isinstance(y_vals[idx], float):
- array = [y_maxs[idx] - y_vals[idx], ]
- else:
- array = [None, ]
- if isinstance(y_mins[idx], float) and isinstance(y_vals[idx], float):
- arrayminus = [y_vals[idx] - y_mins[idx], ]
- else:
- arrayminus = [None, ]
- traces.append(plgo.Scatter(
- x=[idx, ],
- y=[y_vals[idx], ],
- name=x_vals[idx],
- legendgroup=x_vals[idx],
- showlegend=bool(int(idx % 2)),
- mode=u"markers",
- error_y=dict(
- type=u"data",
- symmetric=False,
- array=array,
- arrayminus=arrayminus,
- color=COLORS[int(idx / 2)]
- ),
- marker=dict(
- size=10,
- color=COLORS[int(idx / 2)],
- ),
- text=hovertext,
- hoverinfo=u"text",
- ))
- annotations.append(dict(
- x=idx,
- y=0,
- xref=u"x",
- yref=u"y",
- xanchor=u"center",
- yanchor=u"top",
- text=u"E-W" if bool(int(idx % 2)) else u"W-E",
- font=dict(
- size=16,
- ),
- align=u"center",
- showarrow=False
- ))
-
- try:
- # Create plot
- file_type = plot.get(u"output-file-type", u".html")
- logging.info(f" Writing file {plot[u'output-file']}{file_type}.")
- layout = deepcopy(plot[u"layout"])
- if layout.get(u"title", None):
- layout[u"title"] = f"Latency: {layout[u'title']}"
- layout[u"annotations"] = annotations
- plpl = plgo.Figure(data=traces, layout=layout)
-
- # Export Plot
- ploff.plot(
- plpl,
- show_link=False, auto_open=False,
- filename=f"{plot[u'output-file']}{file_type}"
- )
- except PlotlyError as err:
- logging.error(
- f" Finished with error: {repr(err)}".replace(u"\n", u" ")
- )
- return
-
-
def plot_tsa_name(plot, input_data):
"""Generate the plot(s) with algorithm:
plot_tsa_name
@@ -930,43 +531,62 @@ def plot_tsa_name(plot, input_data):
f" Creating data set for the {plot.get(u'type', u'')} {plot_title}."
)
data = input_data.filter_tests_by_name(
- plot, params=[u"throughput", u"parent", u"tags", u"type"])
+ plot,
+ params=[u"throughput", u"gbps", u"parent", u"tags", u"type"]
+ )
if data is None:
logging.error(u"No data.")
return
- y_vals = OrderedDict()
- for job in data:
- for build in job:
- for test in build:
- if y_vals.get(test[u"parent"], None) is None:
- y_vals[test[u"parent"]] = {
- u"1": list(),
- u"2": list(),
- u"4": list()
- }
- try:
- if test[u"type"] not in (u"NDRPDR",):
- continue
+ plot_title = plot_title.lower()
- if u"-pdr" in plot_title.lower():
- ttype = u"PDR"
- elif u"-ndr" in plot_title.lower():
- ttype = u"NDR"
- else:
- continue
+ 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
- if u"1C" in test[u"tags"]:
- y_vals[test[u"parent"]][u"1"]. \
- append(test[u"throughput"][ttype][u"LOWER"])
- elif u"2C" in test[u"tags"]:
- y_vals[test[u"parent"]][u"2"]. \
- append(test[u"throughput"][ttype][u"LOWER"])
- elif u"4C" in test[u"tags"]:
- y_vals[test[u"parent"]][u"4"]. \
- append(test[u"throughput"][ttype][u"LOWER"])
- except (KeyError, TypeError):
- pass
+ y_vals = OrderedDict()
+ for item in plot.get(u"include", tuple()):
+ reg_ex = re.compile(str(item).lower())
+ for job in data:
+ for build in job:
+ for test_id, test in build.iteritems():
+ if re.match(reg_ex, str(test_id).lower()):
+ if y_vals.get(test[u"parent"], None) is None:
+ y_vals[test[u"parent"]] = {
+ u"1": list(),
+ u"2": list(),
+ u"4": list()
+ }
+ try:
+ if test[u"type"] not in (u"NDRPDR", u"CPS"):
+ continue
+
+ if u"-pdr" in plot_title:
+ ttype = u"PDR"
+ elif u"-ndr" in plot_title:
+ ttype = u"NDR"
+ else:
+ continue
+
+ if u"1C" in test[u"tags"]:
+ y_vals[test[u"parent"]][u"1"].append(
+ test[value][ttype][u"LOWER"] * multiplier
+ )
+ elif u"2C" in test[u"tags"]:
+ y_vals[test[u"parent"]][u"2"].append(
+ test[value][ttype][u"LOWER"] * multiplier
+ )
+ elif u"4C" in test[u"tags"]:
+ y_vals[test[u"parent"]][u"4"].append(
+ test[value][ttype][u"LOWER"] * multiplier
+ )
+ except (KeyError, TypeError):
+ pass
if not y_vals:
logging.warning(f"No data for the plot {plot.get(u'title', u'')}")
@@ -986,7 +606,7 @@ def plot_tsa_name(plot, input_data):
y_max = list()
nic_limit = 0
lnk_limit = 0
- pci_limit = plot[u"limits"][u"pci"][u"pci-g3-x8"]
+ pci_limit = 0
for test_name, test_vals in y_vals.items():
try:
if test_vals[u"1"][1]:
@@ -1070,108 +690,110 @@ def plot_tsa_name(plot, input_data):
if limit > lnk_limit:
lnk_limit = limit
+ if u"cx556a" in test_name:
+ limit = plot[u"limits"][u"pci"][u"pci-g3-x8"]
+ else:
+ limit = plot[u"limits"][u"pci"][u"pci-g3-x16"]
+ if limit > pci_limit:
+ pci_limit = limit
+
traces = list()
annotations = list()
x_vals = [1, 2, 4]
# Limits:
- try:
- threshold = 1.1 * max(y_max) # 10%
- except ValueError as err:
- logging.error(err)
- return
- nic_limit /= 1e6
- traces.append(plgo.Scatter(
- x=x_vals,
- y=[nic_limit, ] * len(x_vals),
- name=f"NIC: {nic_limit:.2f}Mpps",
- showlegend=False,
- mode=u"lines",
- line=dict(
- dash=u"dot",
- color=COLORS[-1],
- width=1),
- hoverinfo=u"none"
- ))
- annotations.append(dict(
- x=1,
- y=nic_limit,
- xref=u"x",
- yref=u"y",
- xanchor=u"left",
- yanchor=u"bottom",
- text=f"NIC: {nic_limit:.2f}Mpps",
- font=dict(
- size=14,
- color=COLORS[-1],
- ),
- align=u"left",
- showarrow=False
- ))
- y_max.append(nic_limit)
-
- lnk_limit /= 1e6
- if lnk_limit < threshold:
- traces.append(plgo.Scatter(
- x=x_vals,
- y=[lnk_limit, ] * len(x_vals),
- name=f"Link: {lnk_limit:.2f}Mpps",
- showlegend=False,
- mode=u"lines",
- line=dict(
- dash=u"dot",
- color=COLORS[-2],
- width=1),
- hoverinfo=u"none"
- ))
- annotations.append(dict(
- x=1,
- y=lnk_limit,
- xref=u"x",
- yref=u"y",
- xanchor=u"left",
- yanchor=u"bottom",
- text=f"Link: {lnk_limit:.2f}Mpps",
- font=dict(
- size=14,
- color=COLORS[-2],
- ),
- align=u"left",
- showarrow=False
- ))
- y_max.append(lnk_limit)
-
- pci_limit /= 1e6
- 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),
- name=f"PCIe: {pci_limit:.2f}Mpps",
- showlegend=False,
- mode=u"lines",
- line=dict(
- dash=u"dot",
- color=COLORS[-3],
- width=1),
- hoverinfo=u"none"
- ))
- annotations.append(dict(
- x=1,
- y=pci_limit,
- xref=u"x",
- yref=u"y",
- xanchor=u"left",
- yanchor=u"bottom",
- text=f"PCIe: {pci_limit:.2f}Mpps",
- font=dict(
- size=14,
- color=COLORS[-3],
- ),
- align=u"left",
- showarrow=False
- ))
- y_max.append(pci_limit)
+ if u"-gbps" not in plot_title and u"-cps-" not in plot_title:
+ nic_limit /= 1e6
+ lnk_limit /= 1e6
+ pci_limit /= 1e6
+ min_limit = min((nic_limit, lnk_limit, pci_limit))
+ if nic_limit == min_limit:
+ traces.append(plgo.Scatter(
+ x=x_vals,
+ y=[nic_limit, ] * len(x_vals),
+ name=f"NIC: {nic_limit:.2f}Mpps",
+ showlegend=False,
+ mode=u"lines",
+ line=dict(
+ dash=u"dot",
+ color=COLORS[-1],
+ width=1),
+ hoverinfo=u"none"
+ ))
+ annotations.append(dict(
+ x=1,
+ y=nic_limit,
+ xref=u"x",
+ yref=u"y",
+ xanchor=u"left",
+ yanchor=u"bottom",
+ text=f"NIC: {nic_limit:.2f}Mpps",
+ font=dict(
+ size=14,
+ color=COLORS[-1],
+ ),
+ align=u"left",
+ showarrow=False
+ ))
+ y_max.append(nic_limit)
+ elif lnk_limit == min_limit:
+ traces.append(plgo.Scatter(
+ x=x_vals,
+ y=[lnk_limit, ] * len(x_vals),
+ name=f"Link: {lnk_limit:.2f}Mpps",
+ showlegend=False,
+ mode=u"lines",
+ line=dict(
+ dash=u"dot",
+ color=COLORS[-1],
+ width=1),
+ hoverinfo=u"none"
+ ))
+ annotations.append(dict(
+ x=1,
+ y=lnk_limit,
+ xref=u"x",
+ yref=u"y",
+ xanchor=u"left",
+ yanchor=u"bottom",
+ text=f"Link: {lnk_limit:.2f}Mpps",
+ font=dict(
+ size=14,
+ color=COLORS[-1],
+ ),
+ align=u"left",
+ showarrow=False
+ ))
+ y_max.append(lnk_limit)
+ elif pci_limit == min_limit:
+ traces.append(plgo.Scatter(
+ x=x_vals,
+ y=[pci_limit, ] * len(x_vals),
+ name=f"PCIe: {pci_limit:.2f}Mpps",
+ showlegend=False,
+ mode=u"lines",
+ line=dict(
+ dash=u"dot",
+ color=COLORS[-1],
+ width=1),
+ hoverinfo=u"none"
+ ))
+ annotations.append(dict(
+ x=1,
+ y=pci_limit,
+ xref=u"x",
+ yref=u"y",
+ xanchor=u"left",
+ yanchor=u"bottom",
+ text=f"PCIe: {pci_limit:.2f}Mpps",
+ font=dict(
+ size=14,
+ color=COLORS[-1],
+ ),
+ align=u"left",
+ showarrow=False
+ ))
+ y_max.append(pci_limit)
# Perfect and measured:
cidx = 0
@@ -1183,7 +805,7 @@ def plot_tsa_name(plot, input_data):
if isinstance(val[u"val"][idx], float):
htext += (
f"No. of Runs: {val[u'count'][idx]}
"
- f"Mean: {val[u'val'][idx]:.2f}Mpps
"
+ f"Mean: {val[u'val'][idx]:.2f}{h_unit}
"
)
if isinstance(val[u"diff"][idx], float):
htext += f"Diff: {round(val[u'diff'][idx]):.0f}%
"