diff options
| author |   pmikus <pmikus@cisco.com> | 2021-06-11 13:06:34 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2021-06-17 13:26:40 +0000 |
| commit | a275fa0062158d712152f542b7bc9ec40b5c5f31 (patch) | |
| tree | 7d55c04747fd49f0ac08c9452976088f2df0791f /resources/libraries/robot/dpdk | |
| parent | 70766243f6c00c77fedc00d68114c108528950d6 (diff) | |
Core: Rework CPU allocation
Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I6826add7b3032041632c3952c45a3c64409400b0
Diffstat (limited to 'resources/libraries/robot/dpdk')
| -rw-r--r-- | resources/libraries/robot/dpdk/default.robot | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/resources/libraries/robot/dpdk/default.robot b/resources/libraries/robot/dpdk/default.robot index 53e3f9f04e..8b7f4dcd7e 100644 --- a/resources/libraries/robot/dpdk/default.robot +++ b/resources/libraries/robot/dpdk/default.robot @@ -35,7 +35,7 @@ | | [Arguments] | ${phy_cores} | ${rx_queues}=${None} | ${jumbo_frames}=${False} | | | | ${cpu_count_int} | Convert to Integer | ${phy_cores} -| | ${thr_count_int} | Convert to Integer | ${phy_cores} +| | ${dp_count_int} | Convert to Integer | ${phy_cores} | | ${dp_cores}= | Evaluate | ${cpu_count_int}+1 | | FOR | ${dut} | IN | @{duts} | | | ${numa}= | Get interfaces numa node | ${nodes['${dut}']} @@ -43,23 +43,23 @@ | | | ${smt_used}= | Is SMT enabled | ${nodes['${dut}']['cpuinfo']} | | | ${cpus}= | Cpu List Per Node Str | ${nodes['${dut}']} | ${numa} | | | ... | skip_cnt=${2} | cpu_cnt=${cpu_count_int} | smt_used=${smt_used} -| | | ${thr_count_int}= | Run keyword if | ${smt_used} | +| | | ${dp_count_int}= | Run keyword if | ${smt_used} | | | | ... | Evaluate | int(${cpu_count_int}*2) | ELSE | Set variable -| | | ... | ${thr_count_int} +| | | ... | ${dp_count_int} | | | ${rxq_ratio} = | Get Variable Value | \${rxq_ratio} | ${1} | | | ${rxq_count_int}= | Run Keyword If | ${rx_queues} | | | ... | Set variable | ${rx_queues} -| | | ... | ELSE | Evaluate | int(${thr_count_int}/${rxq_ratio}) +| | | ... | ELSE | Evaluate | int(${dp_count_int}/${rxq_ratio}) | | | ${rxq_count_int}= | Run keyword if | ${rxq_count_int} == 0 | | | ... | Set variable | ${1} | | | ... | ELSE | Set variable | ${rxq_count_int} | | | Start testpmd | | | ... | ${nodes['${dut}']} | ${${dut}_pf1}[0] | ${${dut}_pf2}[0] -| | | ... | ${cpus} | ${thr_count_int} | ${rxq_count_int} | ${jumbo_frames} +| | | ... | ${cpus} | ${dp_count_int} | ${rxq_count_int} | ${jumbo_frames} | | | ... | ${nic_rxq_size} | ${nic_txq_size} -| | | Run keyword if | ${thr_count_int} > 1 +| | | Run keyword if | ${dp_count_int} > 1 | | | ... | Set Tags | MTHREAD | ELSE | Set Tags | STHREAD -| | | Set Tags | ${thr_count_int}T${cpu_count_int}C +| | | Set Tags | ${dp_count_int}T${cpu_count_int}C | | END | Start l3fwd on all DUTs @@ -78,7 +78,7 @@ | | [Arguments] | ${phy_cores} | ${rx_queues}=${None} | ${jumbo_frames}=${False} | | | | ${cpu_count_int} | Convert to Integer | ${phy_cores} -| | ${thr_count_int} | Convert to Integer | ${phy_cores} +| | ${dp_count_int} | Convert to Integer | ${phy_cores} | | ${dp_cores}= | Evaluate | ${cpu_count_int}+1 | | FOR | ${dut} | IN | @{duts} | | | ${numa}= | Get interfaces numa node | ${nodes['${dut}']} @@ -86,19 +86,19 @@ | | | ${smt_used}= | Is SMT enabled | ${nodes['${dut}']['cpuinfo']} | | | ${cpus}= | Cpu List Per Node Str | ${nodes['${dut}']} | ${numa} | | | ... | skip_cnt=${2} | cpu_cnt=${cpu_count_int} | smt_used=${smt_used} -| | | ${thr_count_int}= | Run keyword if | ${smt_used} | +| | | ${dp_count_int}= | Run keyword if | ${smt_used} | | | | ... | Evaluate | int(${cpu_count_int}*2) | ELSE | Set variable -| | | ... | ${thr_count_int} +| | | ... | ${dp_count_int} | | | ${rxq_count_int}= | Run keyword if | ${rx_queues} | | | ... | Set variable | ${rx_queues} -| | | ... | ELSE | Evaluate | int(${thr_count_int}/1) +| | | ... | ELSE | Evaluate | int(${dp_count_int}/1) | | | ${rxq_count_int}= | Run keyword if | ${rxq_count_int} == 0 | | | ... | Set variable | ${1} | | | ... | ELSE | Set variable | ${rxq_count_int} | | | Start l3fwd | | | ... | ${nodes} | ${nodes['${dut}']} | ${${dut}_pf1}[0] | ${${dut}_pf2}[0] -| | | ... | ${cpus} | ${thr_count_int} | ${rxq_count_int} | ${jumbo_frames} -| | | Run keyword if | ${thr_count_int} > 1 +| | | ... | ${cpus} | ${dp_count_int} | ${rxq_count_int} | ${jumbo_frames} +| | | Run keyword if | ${dp_count_int} > 1 | | | ... | Set Tags | MTHREAD | ELSE | Set Tags | STHREAD -| | | Set Tags | ${thr_count_int}T${cpu_count_int}C +| | | Set Tags | ${dp_count_int}T${cpu_count_int}C | | END |