X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_plots.py;h=2fb4159a1f2150f2714158a0e651fc02ec74c5b4;hb=ed648e7c1f6493fd3bd01213ed0692a5b2e1a020;hp=8af9a945d12d92d06dbd6085d4361e7830368175;hpb=af940b4664f4778ac4857cbdea6eed16ab2722f7;p=csit.git
diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index 8af9a945d1..2fb4159a1f 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 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:
@@ -40,7 +40,7 @@ COLORS = [u"SkyBlue", u"Olive", u"Purple", u"Coral", u"Indigo", u"Pink",
u"LightGreen", u"LightSeaGreen", u"LightSkyBlue", u"Maroon",
u"MediumSeaGreen", u"SeaGreen", u"LightSlateGrey"]
-REGEX_NIC = re.compile(r'\d*ge\dp\d\D*\d*-')
+REGEX_NIC = re.compile(r'(\d*ge\dp\d\D*\d*[a-z]*)-')
def generate_plots(spec, data):
@@ -60,7 +60,8 @@ def generate_plots(spec, data):
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_lat_hdrh_percentile": plot_lat_hdrh_percentile,
+ u"plot_hdrh_lat_by_percentile": plot_hdrh_lat_by_percentile
}
logging.info(u"Generating the plots ...")
@@ -104,7 +105,7 @@ def plot_lat_hdrh_percentile(plot, input_data):
# Prepare the data for the plot
directions = [u"W-E", u"E-W"]
- for test in data[0][0]:
+ for color, test in enumerate(data[0][0]):
try:
if test[u"type"] in (u"NDRPDR",):
if u"-pdr" in plot_title.lower():
@@ -116,8 +117,7 @@ def plot_lat_hdrh_percentile(plot, input_data):
continue
name = re.sub(REGEX_NIC, u"", test[u"parent"].
replace(u'-ndrpdr', u'').
- replace(u'2n1l-', u'').
- replace(u'avf-', u''))
+ replace(u'2n1l-', u''))
for idx, direction in enumerate(
(u"direction1", u"direction2", )):
try:
@@ -137,7 +137,7 @@ def plot_lat_hdrh_percentile(plot, input_data):
hovertext.append(
f"Test: {name}
"
f"Direction: {directions[idx]}
"
- f"Percentile: {percentile:.5f}
%"
+ f"Percentile: {percentile:.5f}%
"
f"Latency: {item.value_iterated_to}uSec"
)
fig.add_trace(
@@ -146,6 +146,11 @@ def plot_lat_hdrh_percentile(plot, input_data):
y=yaxis,
name=name,
mode=u"lines",
+ legendgroup=name,
+ showlegend=bool(idx),
+ line=dict(
+ color=COLORS[color]
+ ),
hovertext=hovertext,
hoverinfo=u"text"
)
@@ -179,6 +184,158 @@ def plot_lat_hdrh_percentile(plot, input_data):
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.
+
+ :param plot: Plot to generate.
+ :param input_data: Data to process.
+ :type plot: pandas.Series
+ :type input_data: InputData
+ """
+
+ # Transform the data
+ logging.info(
+ f" Creating the data set for the {plot.get(u'type', u'')} "
+ f"{plot.get(u'title', u'')}."
+ )
+ if plot.get(u"include", None):
+ data = input_data.filter_tests_by_name(
+ plot,
+ params=[u"name", u"latency", u"parent", u"tags", u"type"]
+ )[0][0]
+ elif plot.get(u"filter", None):
+ data = input_data.filter_data(
+ plot,
+ params=[u"name", u"latency", u"parent", u"tags", u"type"],
+ continue_on_error=True
+ )[0][0]
+ else:
+ job = list(plot[u"data"].keys())[0]
+ build = str(plot[u"data"][job][0])
+ data = input_data.tests(job, build)
+
+ if data is None or len(data) == 0:
+ logging.error(u"No data.")
+ return
+
+ desc = {
+ u"LAT0": u"No-load.",
+ u"PDR10": u"Low-load, 10% PDR.",
+ u"PDR50": u"Mid-load, 50% PDR.",
+ u"PDR90": u"High-load, 90% PDR.",
+ u"PDR": u"Full-load, 100% PDR.",
+ u"NDR10": u"Low-load, 10% NDR.",
+ u"NDR50": u"Mid-load, 50% NDR.",
+ u"NDR90": u"High-load, 90% NDR.",
+ u"NDR": u"Full-load, 100% NDR."
+ }
+
+ graphs = [
+ u"LAT0",
+ u"PDR10",
+ u"PDR50",
+ u"PDR90"
+ ]
+
+ file_links = plot.get(u"output-file-links", None)
+ target_links = plot.get(u"target-links", None)
+
+ for test in data:
+ try:
+ if test[u"type"] not in (u"NDRPDR",):
+ 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''))
+ try:
+ nic = re.search(REGEX_NIC, test[u"parent"]).group(1)
+ except (IndexError, AttributeError, KeyError, ValueError):
+ nic = u""
+ name_link = f"{nic}-{test[u'name']}".replace(u'-ndrpdr', u'')
+
+ logging.info(f" Generating the graph: {name_link}")
+
+ fig = plgo.Figure()
+ layout = deepcopy(plot[u"layout"])
+
+ for color, graph in enumerate(graphs):
+ for idx, direction in enumerate((u"direction1", u"direction2")):
+ xaxis = [0.0, ]
+ yaxis = [0.0, ]
+ hovertext = [
+ f"{desc[graph]}
"
+ f"Direction: {(u'W-E', u'E-W')[idx % 2]}
"
+ f"Percentile: 0.0%
"
+ f"Latency: 0.0uSec"
+ ]
+ decoded = hdrh.histogram.HdrHistogram.decode(
+ test[u"latency"][graph][direction][u"hdrh"]
+ )
+ for item in decoded.get_recorded_iterator():
+ percentile = item.percentile_level_iterated_to
+ if percentile > 99.9:
+ continue
+ xaxis.append(percentile)
+ yaxis.append(item.value_iterated_to)
+ hovertext.append(
+ f"{desc[graph]}
"
+ f"Direction: {(u'W-E', u'E-W')[idx % 2]}
"
+ f"Percentile: {percentile:.5f}%
"
+ f"Latency: {item.value_iterated_to}uSec"
+ )
+ fig.add_trace(
+ plgo.Scatter(
+ x=xaxis,
+ y=yaxis,
+ name=desc[graph],
+ mode=u"lines",
+ legendgroup=desc[graph],
+ showlegend=bool(idx),
+ line=dict(
+ color=COLORS[color],
+ dash=u"solid" if idx % 2 else u"dash"
+ ),
+ hovertext=hovertext,
+ hoverinfo=u"text"
+ )
+ )
+
+ layout[u"title"][u"text"] = f"Latency: {name}"
+ fig.update_layout(layout)
+
+ # Create plot
+ file_name = f"{plot[u'output-file']}-{name_link}.html"
+ logging.info(f" Writing file {file_name}")
+
+ try:
+ # Export Plot
+ ploff.plot(fig, show_link=False, auto_open=False,
+ filename=file_name)
+ # Add link to the file:
+ if file_links and target_links:
+ with open(file_links, u"a") as fw:
+ fw.write(
+ f"- `{name_link} "
+ f"<{target_links}/{file_name.split(u'/')[-1]}>`_\n"
+ )
+ except FileNotFoundError as err:
+ logging.error(
+ f"Not possible to write the link to the file "
+ f"{file_links}\n{err}"
+ )
+ except PlotlyError as err:
+ logging.error(f" Finished with error: {repr(err)}")
+
+ except hdrh.codec.HdrLengthException as err:
+ logging.warning(repr(err))
+ continue
+
+ except (ValueError, KeyError) as err:
+ logging.warning(repr(err))
+ 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.
@@ -1173,7 +1330,7 @@ def plot_nf_heatmap(plot, input_data):
regex_cn = re.compile(r'^(\d*)R(\d*)C$')
regex_test_name = re.compile(r'^.*-(\d+ch|\d+pl)-'
r'(\d+mif|\d+vh)-'
- r'(\d+vm\d+t|\d+dcr\d+t).*$')
+ r'(\d+vm\d+t|\d+dcr\d+t|\d+dcr\d+c).*$')
vals = dict()
# Transform the data
@@ -1472,15 +1629,12 @@ def plot_nf_heatmap(plot, input_data):
plpl = plgo.Figure(data=traces, layout=layout)
# Export Plot
- logging.info(
- f" Writing file {plot[u'output-file']}"
- f"{plot[u'output-file-type']}."
- )
+ logging.info(f" Writing file {plot[u'output-file']}.html")
ploff.plot(
plpl,
show_link=False,
auto_open=False,
- filename=f"{plot[u'output-file']}{plot[u'output-file-type']}"
+ filename=f"{plot[u'output-file']}.html"
)
except PlotlyError as err:
logging.error(