From 55372c91ac0c59065f3d8634c686efd0809a85aa Mon Sep 17 00:00:00 2001 From: pmikus Date: Tue, 24 Aug 2021 09:02:58 +0000 Subject: Fix DPDK nb_cores allocation + Migrate the call to main python util Signed-off-by: pmikus Change-Id: I8d00165071d4764121740c1c77819b8ffc65b3ba --- resources/libraries/python/CpuUtils.py | 4 +- resources/libraries/python/DPDK/L3fwdTest.py | 9 +++-- resources/libraries/robot/dpdk/default.robot | 55 +++++++++----------------- resources/libraries/robot/shared/default.robot | 2 +- 4 files changed, 27 insertions(+), 43 deletions(-) diff --git a/resources/libraries/python/CpuUtils.py b/resources/libraries/python/CpuUtils.py index f556c51814..b03e3e9bbc 100644 --- a/resources/libraries/python/CpuUtils.py +++ b/resources/libraries/python/CpuUtils.py @@ -500,9 +500,9 @@ class CpuUtils: return cpu_idle_list @staticmethod - def get_affinity_vpp_vswitch( + def get_affinity_vswitch( nodes, node, phy_cores, rx_queues=None, rxd=None, txd=None): - """Get affinity or VPP switch. + """Get affinity for vswitch. :param nodes: Topology nodes. :param node: Topology node string. diff --git a/resources/libraries/python/DPDK/L3fwdTest.py b/resources/libraries/python/DPDK/L3fwdTest.py index 07ffae9c43..fd3e51978f 100644 --- a/resources/libraries/python/DPDK/L3fwdTest.py +++ b/resources/libraries/python/DPDK/L3fwdTest.py @@ -21,6 +21,8 @@ from resources.libraries.python.ssh import exec_cmd_no_error, exec_cmd from resources.libraries.python.topology import NodeType, Topology +NB_PORTS = 2 + class L3fwdTest: """Test the DPDK l3fwd performance.""" @@ -54,16 +56,17 @@ class L3fwdTest: nodes, node, if1, if2 ) - list_cores = [int(item) for item in lcores_list.split(u",")] + lcores = [int(item) for item in lcores_list.split(u",")] # prepare the port config param nb_cores = int(nb_cores) index = 0 port_config = '' - for port in range(0, 2): + for port in range(0, NB_PORTS): for queue in range(0, int(queue_nums)): index = 0 if nb_cores == 1 else index - port_config += f"({port}, {queue}, {list_cores[index]})," + port_config += \ + f"({port}, {queue}, {lcores[index % NB_PORTS]})," index += 1 if jumbo_frames: diff --git a/resources/libraries/robot/dpdk/default.robot b/resources/libraries/robot/dpdk/default.robot index 8b7f4dcd7e..9fd6379afd 100644 --- a/resources/libraries/robot/dpdk/default.robot +++ b/resources/libraries/robot/dpdk/default.robot @@ -27,39 +27,29 @@ | | ... | - phy_cores - Number of physical cores to use. Type: integer | | ... | - rx_queues - Number of RX queues. Type: integer | | ... | - jumbo_frames - Jumbo frames on/off: boolean +| | ... | - rxd - Number of RX descriptors. Type: integer +| | ... | - txd - Number of TX descriptors. Type: integer | | | | ... | *Example:* | | | | ... | \| Start testpmd on all DUTs \| ${1} \| ${1} \| ${False} \| | | | | [Arguments] | ${phy_cores} | ${rx_queues}=${None} | ${jumbo_frames}=${False} +| | ... | ${rxd}=${None} | ${txd}=${None} | | | | ${cpu_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}']} -| | | ... | ${${dut}_pf1}[0] | ${${dut}_pf2}[0] -| | | ${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} -| | | ${dp_count_int}= | Run keyword if | ${smt_used} | -| | | ... | Evaluate | int(${cpu_count_int}*2) | ELSE | Set variable -| | | ... | ${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(${dp_count_int}/${rxq_ratio}) -| | | ${rxq_count_int}= | Run keyword if | ${rxq_count_int} == 0 -| | | ... | Set variable | ${1} -| | | ... | ELSE | Set variable | ${rxq_count_int} +| | | &{compute_resource_info}= | Get Affinity Vswitch +| | | ... | ${nodes} | ${dut} | ${phy_cores} | rx_queues=${rx_queues} +| | | ... | rxd=${rxd} | txd=${txd} +| | | Set Test Variable | &{compute_resource_info} +| | | Create compute resources variables | | | Start testpmd | | | ... | ${nodes['${dut}']} | ${${dut}_pf1}[0] | ${${dut}_pf2}[0] -| | | ... | ${cpus} | ${dp_count_int} | ${rxq_count_int} | ${jumbo_frames} +| | | ... | ${cpu_dp} | ${dp_count_int} | ${rxq_count_int} | ${jumbo_frames} | | | ... | ${nic_rxq_size} | ${nic_txq_size} -| | | Run keyword if | ${dp_count_int} > 1 -| | | ... | Set Tags | MTHREAD | ELSE | Set Tags | STHREAD -| | | Set Tags | ${dp_count_int}T${cpu_count_int}C | | END | Start l3fwd on all DUTs @@ -70,35 +60,26 @@ | | ... | - phy_cores - Number of physical cores to use. Type: integer | | ... | - rx_queues - Number of RX queues. Type: integer | | ... | - jumbo_frames - Jumbo frames on/off: boolean +| | ... | - rxd - Number of RX descriptors. Type: integer +| | ... | - txd - Number of TX descriptors. Type: integer | | | | ... | *Example:* | | | | ... | \| Start l3fwd on all DUTs \| ${1} \| ${1} \| ${False} \| | | | | [Arguments] | ${phy_cores} | ${rx_queues}=${None} | ${jumbo_frames}=${False} +| | ... | ${rxd}=${None} | ${txd}=${None} | | | | ${cpu_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}']} -| | | ... | ${${dut}_pf1}[0] | ${${dut}_pf2}[0] -| | | ${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} -| | | ${dp_count_int}= | Run keyword if | ${smt_used} | -| | | ... | Evaluate | int(${cpu_count_int}*2) | ELSE | Set variable -| | | ... | ${dp_count_int} -| | | ${rxq_count_int}= | Run keyword if | ${rx_queues} -| | | ... | Set variable | ${rx_queues} -| | | ... | 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} +| | | &{compute_resource_info}= | Get Affinity Vswitch +| | | ... | ${nodes} | ${dut} | ${phy_cores} | rx_queues=${rx_queues} +| | | ... | rxd=${rxd} | txd=${txd} +| | | Set Test Variable | &{compute_resource_info} +| | | Create compute resources variables | | | Start l3fwd | | | ... | ${nodes} | ${nodes['${dut}']} | ${${dut}_pf1}[0] | ${${dut}_pf2}[0] -| | | ... | ${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 | ${dp_count_int}T${cpu_count_int}C +| | | ... | ${cpu_dp} | ${dp_count_int} | ${rxq_count_int} | ${jumbo_frames} | | END diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index 4905da5baa..7c013d78e7 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -232,7 +232,7 @@ | | ... | ${txd}=${None} | | | | FOR | ${dut} | IN | @{duts} -| | | &{compute_resource_info}= | Get Affinity VPP Vswitch +| | | &{compute_resource_info}= | Get Affinity Vswitch | | | ... | ${nodes} | ${dut} | ${phy_cores} | rx_queues=${rx_queues} | | | ... | rxd=${rxd} | txd=${txd} | | | Set Test Variable | &{compute_resource_info} -- cgit 1.2.3-korg