diff options
10 files changed, 21 insertions, 1 deletions
diff --git a/resources/libraries/robot/performance/performance_utils.robot b/resources/libraries/robot/performance/performance_utils.robot index d820d5c187..34c8c997a1 100644 --- a/resources/libraries/robot/performance/performance_utils.robot +++ b/resources/libraries/robot/performance/performance_utils.robot @@ -30,6 +30,10 @@ | ${trial_duration}= | ${PERF_TRIAL_DURATION} | ${trial_multiplicity}= | ${PERF_TRIAL_MULTIPLICITY} | ${extended_debug}= | ${EXTENDED_DEBUG} +| # Variable holding multiplicator of main heap size. By default it is set to 1 +| # that means the main heap size will be set to 2G. Some tests may require more +| # memory for IP FIB (e.g. nat44det tests with 4M or 16M sessions). +| ${heap_size_mult}= | ${1} | # Variable holding trial duration extension [s] used in pre_stats action | # clear-show-runtime-with-traffic. By default it is set to 0 but some | # tests (e.g. NAT) needs this duration extension in ramp up phase (e.g. to diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index f3d7ed47dd..4f83d1c193 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -151,7 +151,7 @@ | | | Run Keyword | ${dut}.Add Unix Nodaemon | | | Run Keyword | ${dut}.Add Unix Coredump | | | Run Keyword | ${dut}.Add Socksvr | ${SOCKSVR_PATH} -| | | Run Keyword | ${dut}.Add Main Heap Size | 6G +| | | Run Keyword | ${dut}.Add Main Heap Size | ${${heap_size_mult}*${2}}G | | | Run Keyword | ${dut}.Add Main Heap Page Size | 2M | | | Run Keyword | ${dut}.Add Statseg Size | 2G | | | Run Keyword | ${dut}.Add Statseg Page Size | 2M diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot index 2595f2d89b..a993e571dc 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot @@ -88,6 +88,8 @@ # Trial data overwrite | ${trial_duration}= | ${1.1} | ${trial_multiplicity}= | ${1} +# Main heap size multiplicator +| ${heap_size_mult}= | ${3} *** Keywords *** | Local Template diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot index 7f9ac68dbf..8ee1aca4cd 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot @@ -88,6 +88,8 @@ # Trial data overwrite | ${trial_duration}= | ${1.1} | ${trial_multiplicity}= | ${1} +# Main heap size multiplicator +| ${heap_size_mult}= | ${2} *** Keywords *** | Local Template diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.robot index 9400336cb3..91f658ab50 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.robot @@ -81,6 +81,8 @@ | ${n_sessions}= | ${${n_hosts} * ${n_ports}} # Traffic profile | ${traffic_profile}= | trex-stl-ethip4udp-262144u63p +# Main heap size multiplicator +| ${heap_size_mult}= | ${3} *** Keywords *** | Local Template diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.robot index 983afe96e8..6dea5567b4 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.robot @@ -81,6 +81,8 @@ | ${n_sessions}= | ${${n_hosts} * ${n_ports}} # Traffic profile | ${traffic_profile}= | trex-stl-ethip4udp-65536u63p +# Main heap size multiplicator +| ${heap_size_mult}= | ${2} *** Keywords *** | Local Template diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot index 87af2992c5..37495539f6 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot @@ -88,6 +88,8 @@ # Trial data overwrite | ${trial_duration}= | ${1.1} | ${trial_multiplicity}= | ${1} +# Main heap size multiplicator +| ${heap_size_mult}= | ${3} *** Keywords *** | Local Template diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.robot index 22e4cabe7d..023604e511 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.robot @@ -82,6 +82,8 @@ | ${out_mask}= | ${24} # Traffic profile: | ${traffic_profile}= | trex-stl-ethip4udp-262144u63p-udir +# Main heap size multiplicator +| ${heap_size_mult}= | ${3} *** Keywords *** | Local Template diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot index f0017e96f4..4e2b0bf7f8 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot @@ -88,6 +88,8 @@ # Trial data overwrite | ${trial_duration}= | ${1.1} | ${trial_multiplicity}= | ${1} +# Main heap size multiplicator +| ${heap_size_mult}= | ${2} *** Keywords *** | Local Template diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.robot index c2a67ca0c6..b98c2d02fe 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.robot @@ -82,6 +82,8 @@ | ${out_mask}= | ${26} # Traffic profile: | ${traffic_profile}= | trex-stl-ethip4udp-65536u63p-udir +# Main heap size multiplicator +| ${heap_size_mult}= | ${2} *** Keywords *** | Local Template |