X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fdpdk%2Fdefault.robot;h=53e3f9f04ebfb77dc51e0c301c2543ff4df30fdb;hp=e6921c9b27ecf18b7e35246281d110a6598e6548;hb=9780b57a9640e9ab40e40ec122ac80e09cd74c79;hpb=6721e7f09aa95bff6622068332a3f56afad9c87b

diff --git a/resources/libraries/robot/dpdk/default.robot b/resources/libraries/robot/dpdk/default.robot
index e6921c9b27..53e3f9f04e 100644
--- a/resources/libraries/robot/dpdk/default.robot
+++ b/resources/libraries/robot/dpdk/default.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2021 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:
@@ -12,99 +12,93 @@
 # limitations under the License.
 
 *** Settings ***
-| Variables | resources/libraries/python/topology.py
-| Library | resources.libraries.python.topology.Topology
+| Library | resources.libraries.python.InterfaceUtil
 | Library | resources.libraries.python.CpuUtils
-| Library | resources.libraries.python.DUTSetup
-| Library | resources.libraries.python.TGSetup
-| Library | resources.libraries.python.DPDK.L2fwdTest
+| Library | resources.libraries.python.DPDK.TestpmdTest
 | Library | resources.libraries.python.DPDK.L3fwdTest
 | Library | Collections
 
 *** Keywords ***
-| Start L2FWD '${m}' worker threads and '${n}' rxqueues with jumbo frames '${b}'
-| | [Documentation] | Start the l2fwd with M worker threads without SMT
-| | ... | and rxqueues N and B (yes or no) jumbo frames in all DUTs.
-| | ...
-| | ${m_int}= | Convert To Integer | ${m}
-| | ${cpu_cnt}= | Evaluate | ${m_int}+1
-| | ${nb_cores}= | Convert to String | ${m}
-| | ${rxqueues}= | Convert to String | ${n}
-| | ${jumbo_frames}= | Convert to String | ${b}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_cpus}= | Cpu Range Per Node Str | ${dut1} | ${dut1_numa}
-| | ... | skip_cnt=${1} | cpu_cnt=${cpu_cnt}
-| | ${dut2_cpus}= | Cpu Range Per Node Str | ${dut2} | ${dut2_numa}
-| | ... | skip_cnt=${1} | cpu_cnt=${cpu_cnt}
-| | Start the l2fwd test | ${dut1} | ${dut1_cpus} | ${nb_cores} | ${rxqueues}
-| | ... | ${jumbo_frames}
-| | Start the l2fwd test | ${dut2} | ${dut2_cpus} | ${nb_cores} | ${rxqueues}
-| | ... | ${jumbo_frames}
-
-| Start L2FWD '${m}' worker threads using SMT and '${n}' rxqueues with jumbo frames '${b}'
-| | [Documentation] | Start the l2fwd with M worker threads with SMT
-| | ... | and rxqueues N and B (yes or no) jumbo frames in all DUTs.
-| | ...
-| | ${m_int}= | Convert To Integer | ${m}
-| | ${cpu_cnt}= | Evaluate | ${m_int}+1
-| | ${nb_cores_int}= | Evaluate | ${m_int}*2
-| | ${nb_cores}= | Convert to String | ${nb_cores_int}
-| | ${rxqueues}= | Convert to String | ${n}
-| | ${jumbo_frames}= | Convert to String | ${b}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_cpus}= | Cpu Range Per Node Str | ${dut1} | ${dut1_numa}
-| | ... | skip_cnt=${1} | cpu_cnt=${cpu_cnt} | smt_used=${True}
-| | ${dut2_cpus}= | Cpu Range Per Node Str | ${dut2} | ${dut2_numa}
-| | ... | skip_cnt=${1} | cpu_cnt=${cpu_cnt} | smt_used=${True}
-| | Start the l2fwd test | ${dut1} | ${dut1_cpus} | ${nb_cores} | ${rxqueues}
-| | ... | ${jumbo_frames}
-| | Start the l2fwd test | ${dut2} | ${dut2_cpus} | ${nb_cores} | ${rxqueues}
-| | ... | ${jumbo_frames}
-
-| Start L3FWD '${m}' worker threads and '${n}' rxqueues with jumbo frames '${b}'
-| | [Documentation] | Start the l3fwd with M worker threads without SMT
-| | ... | and rxqueues N and B(yes or no) jumbo frames in all DUTs.
-| | ${cpu_cnt}= | Convert To Integer | ${m}
-| | ${nb_cores}= | Convert to String | ${m}
-| | ${rxqueues}= | Convert to String | ${n}
-| | ${jumbo_frames}= | Convert to String | ${b}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_cpus}= | Cpu List Per Node Str | ${dut1} | ${dut1_numa}
-| | ... | cpu_cnt=${cpu_cnt}
-| | ${dut2_cpus}= | Cpu List Per Node Str | ${dut2} | ${dut2_numa}
-| | ... | cpu_cnt=${cpu_cnt}
-| | Start the l3fwd test | ${nodes} | ${dut1} | ${dut1_if1} | ${dut1_if2}
-| | ... | ${nb_cores} | ${dut1_cpus} | ${rxqueues} | ${jumbo_frames}
-| | Start the l3fwd test | ${nodes} | ${dut2} | ${dut2_if1} | ${dut2_if2}
-| | ... | ${nb_cores} | ${dut2_cpus} | ${rxqueues} | ${jumbo_frames}
-
-| Start L3FWD '${m}' worker threads using SMT and '${n}' rxqueues with jumbo frames '${b}'
-| | [Documentation] | Start the l3fwd with M worker threads with SMT
-| | ... | and rxqueues N and B(yes or no) jumbo frames in all DUTs.
-| | ${cpu_cnt}= | Convert To Integer | ${m}
-| | ${nb_cores_int}= | Evaluate | ${cpu_cnt}*2
-| | ${nb_cores}= | Convert to String | ${nb_cores_int}
-| | ${rxqueues}= | Convert to String | ${n}
-| | ${jumbo_frames}= | Convert to String | ${b}
-| | ${dut1_numa}= | Get interfaces numa node | ${dut1}
-| | ... | ${dut1_if1} | ${dut1_if2}
-| | ${dut2_numa}= | Get interfaces numa node | ${dut2}
-| | ... | ${dut2_if1} | ${dut2_if2}
-| | ${dut1_cpus}= | Cpu List Per Node Str | ${dut1} | ${dut1_numa}
-| | ... | cpu_cnt=${cpu_cnt} | smt_used=${True}
-| | ${dut2_cpus}= | Cpu List Per Node Str | ${dut2} | ${dut2_numa}
-| | ... | cpu_cnt=${cpu_cnt} | smt_used=${True}
-| | Start the l3fwd test | ${nodes} | ${dut1} | ${dut1_if1} | ${dut1_if2}
-| | ... | ${nb_cores} | ${dut1_cpus} | ${rxqueues} | ${jumbo_frames}
-| | Start the l3fwd test | ${nodes} | ${dut2} | ${dut2_if1} | ${dut2_if2}
-| | ... | ${nb_cores} | ${dut2_cpus} | ${rxqueues} | ${jumbo_frames}
+| Start testpmd on all DUTs
+| | [Documentation] | Start the testpmd with M worker threads and rxqueues N and
+| | ... | jumbo support frames on/off on all DUTs.
+| |
+| | ... | *Arguments:*
+| | ... | - 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
+| |
+| | ... | *Example:*
+| |
+| | ... | \| Start testpmd on all DUTs \| ${1} \| ${1} \| ${False} \|
+| |
+| | [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_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}
+| | | ${thr_count_int}= | Run keyword if | ${smt_used} |
+| | | ... | Evaluate | int(${cpu_count_int}*2) | ELSE | Set variable
+| | | ... | ${thr_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})
+| | | ${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}
+| | | ... | ${nic_rxq_size} | ${nic_txq_size}
+| | | Run keyword if | ${thr_count_int} > 1
+| | | ... | Set Tags | MTHREAD | ELSE | Set Tags | STHREAD
+| | | Set Tags | ${thr_count_int}T${cpu_count_int}C
+| | END
 
+| Start l3fwd on all DUTs
+| | [Documentation] | Start the l3fwd with M worker threads and rxqueues N and
+| | ... | jumbo support frames on/off on all DUTs.
+| |
+| | ... | *Arguments:*
+| | ... | - 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
+| |
+| | ... | *Example:*
+| |
+| | ... | \| Start l3fwd on all DUTs \| ${1} \| ${1} \| ${False} \|
+| |
+| | [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_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}
+| | | ${thr_count_int}= | Run keyword if | ${smt_used} |
+| | | ... | Evaluate | int(${cpu_count_int}*2) | ELSE | Set variable
+| | | ... | ${thr_count_int}
+| | | ${rxq_count_int}= | Run keyword if | ${rx_queues}
+| | | ... | Set variable | ${rx_queues}
+| | | ... | ELSE | Evaluate | int(${thr_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
+| | | ... | Set Tags | MTHREAD | ELSE | Set Tags | STHREAD
+| | | Set Tags | ${thr_count_int}T${cpu_count_int}C
+| | END