diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/libraries/bash/function/common.sh | 3 | ||||
| -rw-r--r-- | resources/libraries/python/Constants.py | 12 | ||||
| -rw-r--r-- | resources/libraries/python/DUTSetup.py | 6 | ||||
| -rw-r--r-- | resources/libraries/python/HoststackUtil.py | 2 | ||||
| -rw-r--r-- | resources/libraries/python/TrafficGenerator.py | 4 | ||||
| -rw-r--r-- | resources/libraries/robot/performance/performance_actions.robot | 32 | ||||
| -rw-r--r-- | resources/libraries/robot/performance/performance_utils.robot | 103 | ||||
| -rw-r--r-- | resources/libraries/robot/performance/performance_vars.robot | 75 |
8 files changed, 177 insertions, 60 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index c68620b8ce..438a8c0288 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -1384,6 +1384,9 @@ function set_environment_variables () { *"-x-2n"* | *"-x-3n"* ) export TREX_CORE_COUNT=14 export TREX_PORT_MTU=9000 + # Be gentle on infra. + export INFRA_WARMUP_DURATION=5 + export INFRA_WARMUP_RATE=253 # Settings to prevent duration stretching. export PERF_TRIAL_STL_DELAY=0.12 ;; diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index 443bdfc646..f2191a9211 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -269,6 +269,18 @@ class Constants: # Whether to use latency streams in main search trials. PERF_USE_LATENCY = get_pessimistic_bool_from_env("PERF_USE_LATENCY") + # Whether to apply low-load trial to avoid flooding other machines. + INFRA_WARMUP_DURATION = get_float_from_env("INFRA_WARMUP_DURATION", 0) + + # Load just high enough to show all MAC addresses. + INFRA_WARMUP_RATE = get_float_from_env("INFRA_WARMUP_RATE", 300.0) + + # Whether to warm-up the traffic generator with high load. + TG_WARMUP_DURATION = get_float_from_env("TG_WARMUP_DURATION", 1.0) + + ## TG warmup load tweaking should not be needed, default max rate is best. + #TG_WARMUP_RATE = get_float_from_env("TG_WARMUP_RATE") + # Duration of one latency-specific trial in NDRPDR test. PERF_TRIAL_LATENCY_DURATION = get_float_from_env( "PERF_TRIAL_LATENCY_DURATION", 5.0 diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py index 8c240d9735..1f5a48aeda 100644 --- a/resources/libraries/python/DUTSetup.py +++ b/resources/libraries/python/DUTSetup.py @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Cisco and/or its affiliates. +# Copyright (c) 2025 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: @@ -392,7 +392,9 @@ class DUTSetup: :type pci_addrs: list """ for pci_addr in pci_addrs: - DUTSetup.pci_driver_unbind(node, pci_addr) + cur_driver = DUTSetup.get_pci_dev_driver(node, pci_addr) + if cur_driver: + DUTSetup.pci_driver_unbind(node, pci_addr) DUTSetup.pci_driver_bind(node, pci_addr, driver) @staticmethod diff --git a/resources/libraries/python/HoststackUtil.py b/resources/libraries/python/HoststackUtil.py index 3ada07b2a4..c5ab0924ab 100644 --- a/resources/libraries/python/HoststackUtil.py +++ b/resources/libraries/python/HoststackUtil.py @@ -285,7 +285,7 @@ class HoststackUtil(): # NGINX used `worker_cpu_affinity` in configuration file taskset_cmd = u"" if program_name == u"nginx" else \ f"taskset --cpu-list {core_list}" - cmd = f"nohup {shell_cmd} \'{env_vars}{taskset_cmd} " \ + cmd = f"nohup {taskset_cmd} {shell_cmd} \'{env_vars} " \ f"{program_path}{program_name} {args} >/tmp/{program_name}_" \ f"stdout.log 2>/tmp/{program_name}_stderr.log &\'" try: diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index ae01f8d3a6..fe9db3cb72 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Cisco and/or its affiliates. +# Copyright (c) 2025 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: @@ -1590,7 +1590,7 @@ class OptimizedSearch: config.min_load = min_load config.max_load = max_load config.search_duration_max = search_duration_max - config.warmup_duration = 1.0 + config.warmup_duration = 0.0 algorithm = MultipleLossRatioSearch(config) results = algorithm.search(measurer=tg_instance, debug=logger.debug) return [results[goal] for goal in goals] diff --git a/resources/libraries/robot/performance/performance_actions.robot b/resources/libraries/robot/performance/performance_actions.robot index c7d7776292..36f126b9ec 100644 --- a/resources/libraries/robot/performance/performance_actions.robot +++ b/resources/libraries/robot/performance/performance_actions.robot @@ -63,38 +63,6 @@ | | ... | rate=${telemetry_rate} | export=${False} | | Stop traffic on tg -| Additional Statistics Action For infra-warmup -| | [Documentation] -| | ... | Additional Statistics Action for infra warmup. -| | -| | ... | See documentation of the called keyword for required test variables. -| | -| | ${ppta} = | Get Packets Per Transaction Aggregated -| | ${ramp_up_duration} = | Get Ramp Up Duration -| | ${ramp_up_rate} = | Get Ramp Up Rate -| | ${runtime_duration} = | Get Runtime Duration -| | ${runtime_rate} = | Get Runtime Rate -| | ${traffic_directions} = | Get Traffic Directions -| | ${transaction_duration} = | Get Transaction Duration -| | ${transaction_scale} = | Get Transaction Scale -| | ${transaction_type} = | Get Transaction Type -| | ${use_latency} = | Get Use Latency -| | Send traffic on tg -| | ... | duration=${5} -| | ... | rate=${253} -| | ... | frame_size=${frame_size} -| | ... | traffic_profile=${traffic_profile} -| | ... | async_call=${False} -| | ... | ppta=${ppta} -| | ... | use_latency=${False} -| | ... | traffic_directions=${traffic_directions} -| | ... | transaction_duration=${transaction_duration} -| | ... | transaction_scale=${transaction_scale} -| | ... | transaction_type=${transaction_type} -| | ... | duration_limit=${0.0} -| | ... | ramp_up_duration=${ramp_up_duration} -| | ... | ramp_up_rate=${ramp_up_rate} - | Additional Statistics Action For noop | | [Documentation] | | ... | Additional Statistics Action for no operation. diff --git a/resources/libraries/robot/performance/performance_utils.robot b/resources/libraries/robot/performance/performance_utils.robot index 4211486a19..899bbb54b5 100644 --- a/resources/libraries/robot/performance/performance_utils.robot +++ b/resources/libraries/robot/performance/performance_utils.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2025 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: @@ -31,6 +31,9 @@ | Documentation | ... | Performance suite keywords - utilities to find and verify NDR and PDR. | ... | See performance_vars.robot for values accessed via there. +| ... | All top-level keywords call infra warmup, all except MRR (and iperf) +| ... | also call TG warmup. MRR has early runtime trial at max rate, +| ... | so it does not need separate TG warmup. *** Variables *** | # Variable holding multiplicator of main heap size. By default it is set to 1 @@ -39,6 +42,76 @@ | ${heap_size_mult}= | ${1} *** Keywords *** +| Perform Infra Warmup +| | [Documentation] +| | ... | Optional trial at low load, needed to prevent flooding in some labs. +| | ... | This is skipped if duration is zero, default for isolated labs. +| | +| | ... | See documentation of the called keyword for required test variables. +| | +| | ${duration} = | Get Infra Warm Up Duration +| | Return From Keyword If | not ${duration} +| | ${rate} = | Get Infra Warm Up Rate +| | ${ppta} = | Get Packets Per Transaction Aggregated +| | ${traffic_directions} = | Get Traffic Directions +| | ${transaction_duration} = | Get Transaction Duration +| | ${transaction_scale} = | Get Transaction Scale +| | ${transaction_type} = | Get Transaction Type +| | Send traffic on tg +| | ... | duration=${duration} +| | ... | rate=${rate} +| | ... | frame_size=${frame_size} +| | ... | traffic_profile=${traffic_profile} +| | ... | async_call=${False} +| | ... | ppta=${ppta} +| | ... | use_latency=${False} +| | ... | traffic_directions=${traffic_directions} +| | ... | transaction_duration=${transaction_duration} +| | ... | transaction_scale=${transaction_scale} +| | ... | transaction_type=${transaction_type} +| | ... | duration_limit=${0.0} +| | ... | ramp_up_duration=${0} +| | ... | ramp_up_rate=${0} + +| Perform Tg Warmup +| | [Documentation] +| | ... | Warmup trial at high load, needed by tests where telemetry is late. +| | +| | ... | Some traffic generators need additional warmup at high load, +| | ... | otherwise they suffer from too much unsent packets, +| | ... | destabilizing the tests (soak) sensitive to first search trial result. +| | ... | This is skipped if duration is zero, useful for traffic generators +| | ... | that are known to never need such a warmup. +| | +| | ... | See documentation of the called keyword for required test variables. +| | +| | # TODO: Check if low-rate is enough to avoid unsent packets. +| | # TODO: If it is, figure out how to skip tg warmup if infra warmup happened. +| | +| | ${duration} = | Get Tg Warm Up Duration +| | Return From Keyword If | not ${duration} +| | ${rate} = | Get Tg Warm Up Rate +| | ${ppta} = | Get Packets Per Transaction Aggregated +| | ${traffic_directions} = | Get Traffic Directions +| | ${transaction_duration} = | Get Transaction Duration +| | ${transaction_scale} = | Get Transaction Scale +| | ${transaction_type} = | Get Transaction Type +| | Send traffic on tg +| | ... | duration=${duration} +| | ... | rate=${rate} +| | ... | frame_size=${frame_size} +| | ... | traffic_profile=${traffic_profile} +| | ... | async_call=${False} +| | ... | ppta=${ppta} +| | ... | use_latency=${False} +| | ... | traffic_directions=${traffic_directions} +| | ... | transaction_duration=${transaction_duration} +| | ... | transaction_scale=${transaction_scale} +| | ... | transaction_type=${transaction_type} +| | ... | duration_limit=${0.0} +| | ... | ramp_up_duration=${0} +| | ... | ramp_up_rate=${0} + | Find critical load using PLRsearch | | [Documentation] | | ... | Find boundaries for troughput (of hardcoded target loss ratio) @@ -73,22 +146,8 @@ | | ${transaction_scale} = | Get Transaction Scale | | ${transaction_type} = | Get Transaction Type | | ${use_latency} = | Get Use Latency -| | # TRex needs a warmup to avoid unsent packets at half-max rate. -| | Send traffic on tg -| | ... | duration=1.0 -| | ... | rate=${max_rate} -| | ... | frame_size=${frame_size} -| | ... | traffic_profile=${traffic_profile} -| | ... | async_call=${False} -| | ... | duration_limit=${1.0} -| | ... | ppta=${ppta} -| | ... | traffic_directions=${traffic_directions} -| | ... | transaction_duration=${transaction_duration} -| | ... | transaction_scale=${transaction_scale} -| | ... | transaction_type=${transaction_type} -| | ... | use_latency=False -| | ... | ramp_up_duration=${0.0} -| | ... | ramp_up_rate=${0.0} +| | Perform Infra Warmup +| | Perform Tg Warmup | | # Ready for main search. | | ${average} | ${stdev} = | Perform soak search | | ... | frame_size=${frame_size} @@ -170,6 +229,8 @@ | | ${transaction_scale} = | Get Transaction Scale | | ${transaction_type} = | Get Transaction Type | | ${use_latency} = | Get Use Latency +| | Perform Infra Warmup +| | Perform Tg Warmup | | ${result} = | Perform MLR Search | | ... | frame_size=${frame_size} | | ... | traffic_profile=${traffic_profile} @@ -257,6 +318,8 @@ | | ${transaction_scale} = | Get Transaction Scale | | ${transaction_type} = | Get Transaction Type | | ${use_latency} = | Get Use Latency +| | Perform Infra Warmup +| | Perform Tg Warmup | | ${result} = | Perform MLR Search | | ... | frame_size=${frame_size} | | ... | traffic_profile=${traffic_profile} @@ -383,7 +446,7 @@ | Send traffic at specified rate | | [Documentation] -| | ... | Perform a warmup, show runtime counters during it. +| | ... | Perform telemetry trials, read results during traffic. | | ... | Then send traffic at specified rate, possibly multiple trials. | | ... | Show various DUT stats, optionally also packet trace. | | ... | Return list of measured receive rates. @@ -480,6 +543,7 @@ | | | | Set Test Variable | ${telemetry_rate} | mrr | | Set Test Variable | ${telemetry_export} | ${True} +| | Perform Infra Warmup | | ${results}= | Send iPerf3 traffic at specified rate | | ... | ${trial_duration} | ${None} | ${None} | | ... | ${trial_multiplicity} | ${traffic_directions} @@ -490,7 +554,7 @@ | Send iPerf3 traffic at specified rate | | [Documentation] -| | ... | Perform a warmup, show runtime counters during it. +| | ... | Perform telemetry trials, read results during traffic. | | ... | Then send traffic at specified rate, possibly multiple trials. | | ... | Show various DUT stats, optionally also packet trace. | | ... | Return list of measured receive rates. @@ -683,6 +747,7 @@ | | ${use_latency} = | Get Use Latency | | ${unit} = | Set Variable If | """_cps""" in """${transaction_type}""" | | ... | cps | pps +| | Perform Infra Warmup | | ${results} = | Send traffic at specified rate | | ... | rate=${max_rate} | | ... | trial_duration=${trial_duration} diff --git a/resources/libraries/robot/performance/performance_vars.robot b/resources/libraries/robot/performance/performance_vars.robot index 1bab1071b7..5eacb43977 100644 --- a/resources/libraries/robot/performance/performance_vars.robot +++ b/resources/libraries/robot/performance/performance_vars.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Cisco and/or its affiliates. +# Copyright (c) 2025 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: @@ -41,6 +41,40 @@ | | ${disable_latency} = | Get Variable Value | \${disable_latency} | ${False} | | Return From Keyword | ${disable_latency} +| Get Infra Warmup Duration +| | [Documentation] +| | ... | Return value of \${infra_warmup_duration} variable, +| | ... | if not defined, return ${0.0}, which implies no infra warmup trial. +| | ... | Note that scale traffic profiles may need higher values than base. +| | +| | ... | The return value controls the duration of optional infra warmup trial, +| | ... | zero means the trial is skipped. +| | ... | Return type: float. +| | +| | ... | *Example:* +| | +| | ... | \| \${infra_warmup_duration} = \| Get Infra Warmup Duration \| +| | +| | ${duration} = | Get Variable Value | \${infra_warmup_duration} | ${0.0} +| | Return From Keyword | ${duration} + +| Get Infra Warmup Rate +| | [Documentation] +| | ... | Return value of \${infra_warmup_rate} variable, +| | ... | if not defined, return ${300.0}. +| | ... | Note that scale traffic profiles may need higher values than base. +| | +| | ... | The return value controls the rate (TPS unidir) of infra warmup trial, +| | ... | Return type: float. +| | +| | ... | *Example:* +| | +| | ... | \| \${infra_warmup_rate} = \| Get Infra Warmup Rate \| +| | +| | ${rate} = | Get Variable Value | \${infra_warmup_rate} | ${0.0} +| | Return From Keyword If | ${rate} | ${rate} +| | Return From Keyword | ${300.0} + | Get Max Rate | | [Documentation] | | ... | Return value of \${max_rate} variable, @@ -268,7 +302,7 @@ | Get Runtime Duration | | [Documentation] | | ... | Return value of \${runtime_duration} variable, -| | ... | if not defined return ${1.0}. +| | ... | if not defined, return ${1.0}. | | | | ... | The return value controls the duration of runtime trial, | | ... | which also acts as a warmup. Usually one second is enough, @@ -285,7 +319,7 @@ | Get Runtime Rate | | [Documentation] | | ... | Return value of \${runtime_rate} variable, -| | ... | if not defined return the max rate. +| | ... | if not defined, return the max rate. | | | | ... | The return value controls the rate (TPS unidir) of runtime trial, | | ... | which also acts as a warmup. No plans to ever use a different rate, @@ -300,6 +334,39 @@ | | Return From Keyword If | ${runtime_rate} | ${runtime_rate} | | Run Keyword And Return | Get Max Rate +| Get Tg Warmup Duration +| | [Documentation] +| | ... | Return value of \${tg_warmup_duration} variable, +| | ... | if not defined, return ${1.0}, which implies short tg warmup trial. +| | ... | Note that even scale traffic profiles do not need longer trial. +| | +| | ... | The return value controls the duration of tg warmup trial, +| | ... | zero means the trial is skipped. +| | ... | Return type: float. +| | +| | ... | *Example:* +| | +| | ... | \| \${tg_warmup_duration} = \| Get Tg Warmup Duration \| +| | +| | ${duration} = | Get Variable Value | \${tg_warmup_duration} | ${1.0} +| | Return From Keyword | ${duration} + +| Get Tg Warmup Rate +| | [Documentation] +| | ... | Return value of \${tg_warmup_rate} variable, +| | ... | if not defined, return the max rate. +| | +| | ... | The return value controls the rate (TPS unidir) of tg warmup trial, +| | ... | Return type: float. +| | +| | ... | *Example:* +| | +| | ... | \| \${tg_warmup_rate} = \| Get Tg Warmup Rate \| +| | +| | ${rate} = | Get Variable Value | \${tg_warmup_rate} | ${0.0} +| | Return From Keyword If | ${rate} | ${rate} +| | Run Keyword And Return | Get Max Rate + | Get Traffic Directions | | [Documentation] | | ... | Return value of \${traffic_directions}, @@ -377,7 +444,7 @@ | Get Use Latency | | [Documentation] | | ... | Return value of \${use_latency} variable, -| | ... | if not defined return the value from Constants. +| | ... | if not defined, return the value from Constants. | | | | ... | The return value controls whether latency streams are active | | ... | during the main search. |