X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=74e33c10feac95ddc6478526d631e63c316bd646;hp=1ab1ea78afe94a5b4a9f3d9917149fa1cae7a944;hb=b659ab3d2638652de0357d29be1ec7704df97555;hpb=c1356fb4855e23d6c939c14045a63483eba01628
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 1ab1ea78af..74e33c10fe 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -241,6 +241,8 @@
- 60 # NFV NDRPDR 64b
- 65 # NFV NDRPDR 64b
- 68 # NFV NDRPDR 64b
+ - 80 # NFV MRR NDRPDR 64b IMIX
+ - 81 # NFV MRR NDRPDR 64b IMIX
plot-vpp-nfv-2n-skx-ndrpdr-imix:
# TODO: Add 1904 data
@@ -248,6 +250,8 @@
- 66 # NFV NDRPDR IMIX
- 67 # NFV NDRPDR IMIX
- 69 # NFV NDRPDR IMIX
+ - 80 # NFV MRR NDRPDR 64b IMIX
+ - 81 # NFV MRR NDRPDR 64b IMIX
plot-vpp-nfv-2n-skx-mrr-64b:
csit-vpp-perf-verify-1904-2n-skx:
@@ -256,6 +260,8 @@
- 42 # NFV MRR 64b
- 47 # NFV MRR 64b
- 48 # NFV MRR 64b
+ - 80 # NFV MRR NDRPDR 64b IMIX
+ - 81 # NFV MRR NDRPDR 64b IMIX
plot-vpp-nfv-2n-skx-mrr-imix:
csit-vpp-perf-verify-1904-2n-skx:
@@ -264,6 +270,8 @@
- 51 # NFV MRR IMIX
- 54 # NFV MRR IMIX
- 55 # NFV MRR IMIX
+ - 80 # NFV MRR NDRPDR 64b IMIX
+ - 81 # NFV MRR NDRPDR 64b IMIX
plot-dpdk-throughput-latency-2n-skx:
csit-dpdk-perf-verify-1904-2n-skx:
@@ -346,9 +354,10 @@
# Results
vpp-perf-results-3n-hsw:
- # TODO: Replace with FULL 1904 data
+ # TODO: Add FULL 1904 data
csit-vpp-perf-verify-1904-3n-hsw:
- - 12 # NDRPDR sel
+ - 32 # NDRPDR full
+ - 33 # NDRPDR full
vpp-perf-results-3n-skx:
csit-vpp-perf-verify-1904-3n-skx:
@@ -952,8 +961,8 @@
titlefont:
size: 16
gridcolor: "rgb(230, 230, 230)"
- hoverformat: ".4s"
- tickformat: ".3s"
+ hoverformat: ".4r"
+ tickformat: ".3r"
linecolor: "rgb(220, 220, 220)"
linewidth: 1
showgrid: True
@@ -1137,8 +1146,8 @@
titlefont:
size: 16
gridcolor: "rgb(230, 230, 230)"
- hoverformat: ".4s"
- tickformat: ".3s"
+ hoverformat: ".4r"
+ tickformat: ".3r"
linecolor: "rgb(220, 220, 220)"
linewidth: 1
showgrid: True
@@ -1383,6 +1392,8 @@
# TODO: Add 1904 Data
csit-vpp-perf-verify-1904-3n-hsw:
- 9 # MRR sel
+ - 32 # NDRPDR full
+ - 33 # NDRPDR full
- 11 # NDRPDR sel
- 12 # NDRPDR sel
- 20 # NDRPDR sel
@@ -1510,6 +1521,8 @@
- 66 # NFV NDRPDR IMIX
- 67 # NFV NDRPDR IMIX
- 69 # NFV NDRPDR IMIX
+ - 80 # NFV MRR NDRPDR 64b IMIX
+ - 81 # NFV MRR NDRPDR 64b IMIX
- 70 # SOAK
- 71 # SOAK
@@ -1650,8 +1663,8 @@
format:
html:
- full
-# pdf:
-# - minimal
+ pdf:
+ - minimal
################################################################################
### T A B L E S ###
@@ -1659,51 +1672,24 @@
# VPP SOAK vs NDR
- type: "table"
- title: "VPP SOAK vs NDR 2n-skx"
+ title: "VPP Soak vs NDR 2n-skx"
algorithm: "table_soak_vs_ndr"
output-file: "{DIR[STATIC,VPP]}/soak-vs-ndr-2n-skx"
reference:
title: "NDR"
data: "vpp-soak-vs-ndr-2n-skx-ref"
compare:
- title: "SOAK"
+ title: "Soak"
data: "vpp-soak-vs-ndr-2n-skx-cmp"
data: "vpp-soak-vs-ndr-2n-skx"
- include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+ include-tests: "NDR"
filter: "('NDRPDR' or 'SOAK')"
parameters:
- "throughput"
+ - "name"
+ - "parent"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+################################################################################
# VPP Compare NICs 3n-hsw 1t1c ndr
- type: "table"
@@ -3042,7 +3028,7 @@
data: "data msg"
rows: "generated"
data: "vpp-perf-results-3n-skx"
- filter: "not 'NDRCHK' and not 'PDRCHK'"
+ filter: "not 'CFS_OPT'"
parameters:
- "name"
- "parent"
@@ -3061,7 +3047,7 @@
data: "data msg"
rows: "generated"
data: "vpp-perf-results-2n-skx"
- filter: "not 'NDRCHK' and not 'PDRCHK'"
+ filter: "not 'CFS_OPT'"
parameters:
- "name"
- "parent"
@@ -3118,7 +3104,7 @@
data: "data conf-history"
rows: "generated"
data: "vpp-perf-results-3n-skx"
- filter: "not 'NDRCHK' and not 'PDRCHK'"
+ filter: "not 'CFS_OPT'"
parameters:
- "parent"
- "name"
@@ -3137,7 +3123,7 @@
data: "data conf-history"
rows: "generated"
data: "vpp-perf-results-2n-skx"
- filter: "not 'NDRCHK' and not 'PDRCHK'"
+ filter: "not 'CFS_OPT'"
parameters:
- "parent"
- "name"
@@ -3194,7 +3180,7 @@
data: "data show-run"
rows: "generated"
data: "vpp-perf-results-3n-skx"
- filter: "not 'NDRCHK' and not 'PDRCHK'"
+ filter: "not 'CFS_OPT'"
parameters:
- "parent"
- "name"
@@ -3213,7 +3199,7 @@
data: "data show-run"
rows: "generated"
data: "vpp-perf-results-2n-skx"
- filter: "not 'NDRCHK' and not 'PDRCHK'"
+ filter: "not 'CFS_OPT'"
parameters:
- "parent"
- "name"
@@ -4039,7 +4025,7 @@
file-header: "\n.. |br| raw:: html\n\n
\n\n\n.. |prein| raw:: html\n\n
\n\n\n.. |preout| raw:: html\n\n\n\n" dir-tables: "{DIR[DTR,PERF,VPP,3N,SKX]}" data: "vpp-perf-results-3n-skx" - filter: "not 'NDRCHK' and not 'PDRCHK'" + filter: "not 'CFS_OPT'" parameters: - "name" - "doc" @@ -4056,7 +4042,7 @@ file-header: "\n.. |br| raw:: html\n\n
\n\n\n.. |preout| raw:: html\n\n\n\n" dir-tables: "{DIR[DTR,PERF,VPP,2N,SKX]}" data: "vpp-perf-results-2n-skx" - filter: "not 'NDRCHK' and not 'PDRCHK'" + filter: "not 'CFS_OPT'" parameters: - "name" - "doc" @@ -4107,7 +4093,7 @@ file-header: "\n.. |br| raw:: html\n\n
\n\n\n.. |preout| raw:: html\n\n\n\n" dir-tables: "{DIR[DTC,PERF,VPP,3N,SKX]}" data: "vpp-perf-results-3n-skx" - filter: "not 'NDRCHK' and not 'PDRCHK'" + filter: "not 'CFS_OPT'" parameters: - "name" - "doc" @@ -4124,7 +4110,7 @@ file-header: "\n.. |br| raw:: html\n\n
\n\n\n.. |preout| raw:: html\n\n\n\n" dir-tables: "{DIR[DTC,PERF,VPP,2N,SKX]}" data: "vpp-perf-results-2n-skx" - filter: "not 'NDRCHK' and not 'PDRCHK'" + filter: "not 'CFS_OPT'" parameters: - "name" - "doc" @@ -4175,7 +4161,7 @@ file-header: "\n.. |br| raw:: html\n\n
\n\n\n.. |preout| raw:: html\n\n\n\n" dir-tables: "{DIR[DTO,PERF,VPP,3N,SKX]}" data: "vpp-perf-results-3n-skx" - filter: "not 'NDRCHK' and not 'PDRCHK'" + filter: "not 'CFS_OPT'" parameters: - "name" - "doc" @@ -4192,7 +4178,7 @@ file-header: "\n.. |br| raw:: html\n\n
\n\n\n.. |preout| raw:: html\n\n\n\n" dir-tables: "{DIR[DTO,PERF,VPP,2N,SKX]}" data: "vpp-perf-results-2n-skx" - filter: "not 'NDRCHK' and not 'PDRCHK'" + filter: "not 'CFS_OPT'" parameters: - "name" - "doc" @@ -4587,45 +4573,51 @@ # Soak test - 30min Soak Test (PLRsearch), boxes - type: "plot" title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes" - algorithm: "plot_soak_boxes" + algorithm: "plot_performance_box" output-file-type: ".html" - output-file: "{DIR[STATIC,VPP]}/example-soak-boxes" + output-file: "{DIR[STATIC,VPP]}/soak-test-1" data: "plot-vpp-soak-2n-skx" - filter: "'SOAK'" + filter: "('L2BDMACLRN' or 'L2PATCH' or 'L2XCBASE') and not 'VHOST' and not 'MEMIF'" parameters: - - "throughput" - - "parent" - - "tags" -# sort: -# - "L2PATCH" -# - "L2XCBASE" -# - "L2BDMACLRN" -# - "IP4FWD" -# - "IP6FWD" - - "VHOST" + - "throughput" + - "parent" + - "tags" + sort: + - "DRV_AVF" + - "DRV_AVF" + - "DRV_AVF" + - "L2BDMACLRN" + - "L2XCBASE" + - "L2PATCH" + traces: + hoverinfo: "x+y" + boxpoints: "all" + whiskerwidth: 0 layout: title: "30min Soak Test (PLRsearch)" layout: "plot-soak-throughput" -# Soak test - example, not used +# Soak test - 30min Soak Test (PLRsearch), boxes - type: "plot" - title: "VPP Throughput: 30min Soak Test (PLRsearch) bars" - algorithm: "plot_soak_bars" + title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes" + algorithm: "plot_performance_box" output-file-type: ".html" - output-file: "{DIR[STATIC,VPP]}/example-soak-bars" + output-file: "{DIR[STATIC,VPP]}/soak-test-2" data: "plot-vpp-soak-2n-skx" - filter: "'SOAK'" + filter: "'L2BDMACLRN' and ('VHOST' or 'MEMIF') or 'IP4BASE' or 'IP6BASE'" parameters: - - "throughput" - - "parent" - - "tags" -# sort: -# - "L2PATCH" -# - "L2XCBASE" -# - "L2BDMACLRN" -# - "IP4FWD" -# - "IP6FWD" - - "VHOST" + - "throughput" + - "parent" + - "tags" + sort: + - "VHOST" + - "MEMIF" + - "IP4FWD" + - "IP6FWD" + traces: + hoverinfo: "x+y" + boxpoints: "all" + whiskerwidth: 0 layout: title: "30min Soak Test (PLRsearch)" layout: "plot-soak-throughput" @@ -14337,7 +14329,6 @@ 'BASE' and '1T1C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14364,7 +14355,6 @@ 'BASE' and '1T1C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14391,7 +14381,6 @@ 'BASE' and '2T2C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14418,7 +14407,6 @@ 'BASE' and '2T2C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14446,7 +14434,6 @@ 'SCALE' and '1T1C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14473,7 +14460,6 @@ 'SCALE' and '1T1C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14500,7 +14486,6 @@ 'SCALE' and '2T2C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14527,7 +14512,6 @@ 'SCALE' and '2T2C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14554,7 +14538,6 @@ 'NDRPDR' and '1T1C' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14580,7 +14563,6 @@ 'NDRPDR' and '1T1C' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14606,7 +14588,6 @@ 'NDRPDR' and '2T2C' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14632,7 +14613,6 @@ 'NDRPDR' and '2T2C' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -21499,7 +21479,6 @@ 'BASE' and '1T1C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "latency" @@ -21522,7 +21501,6 @@ 'BASE' and '2T2C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "latency" @@ -21546,7 +21524,6 @@ 'SCALE' and '1T1C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "latency" @@ -21569,7 +21546,6 @@ 'SCALE' and '2T2C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "latency" @@ -21592,7 +21568,6 @@ 'NDRPDR' and '1T1C' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "latency" @@ -21614,7 +21589,6 @@ 'NDRPDR' and '2T2C' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "latency" @@ -25781,7 +25755,6 @@ 'NDRPDR' and 'BASE' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -25803,7 +25776,6 @@ 'NDRPDR' and 'BASE' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -25826,7 +25798,6 @@ 'NDRPDR' and 'SCALE' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -25848,7 +25819,6 @@ 'NDRPDR' and 'SCALE' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -25870,7 +25840,6 @@ 'IP4FWD' and 'NDRPDR' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -25891,7 +25860,6 @@ 'IP4FWD' and 'NDRPDR' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput"