diff options
| -rw-r--r-- | resources/libraries/python/DPDK/TestpmdTest.py | 4 | ||||
| -rw-r--r-- | resources/libraries/python/DpdkUtil.py | 2 | ||||
| -rw-r--r-- | resources/libraries/python/QemuUtils.py | 4 | ||||
| -rw-r--r-- | resources/libraries/robot/dpdk/default.robot | 9 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/container.robot | 7 |
5 files changed, 14 insertions, 12 deletions
diff --git a/resources/libraries/python/DPDK/TestpmdTest.py b/resources/libraries/python/DPDK/TestpmdTest.py index dd30376fd1..ed53acb0b5 100644 --- a/resources/libraries/python/DPDK/TestpmdTest.py +++ b/resources/libraries/python/DPDK/TestpmdTest.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 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: @@ -63,7 +63,7 @@ class TestpmdTest: eal_pci_whitelist0=if_pci0, eal_pci_whitelist1=if_pci1, eal_in_memory=True, - pmd_num_mbufs=16384, + pmd_num_mbufs=32768, pmd_fwd_mode=u"io", pmd_nb_ports=u"2", pmd_portmask=u"0x3", diff --git a/resources/libraries/python/DpdkUtil.py b/resources/libraries/python/DpdkUtil.py index fd31f1ddb2..4a5983affb 100644 --- a/resources/libraries/python/DpdkUtil.py +++ b/resources/libraries/python/DpdkUtil.py @@ -126,7 +126,7 @@ class DpdkUtil: options.add_equals_from_dict( u"max-pkt-len", u"pmd_max_pkt_len", kwargs ) - # Set the max packet length. + # Set the mbuf size. options.add_equals_from_dict( u"mbuf-size", u"pmd_mbuf_size", kwargs ) diff --git a/resources/libraries/python/QemuUtils.py b/resources/libraries/python/QemuUtils.py index a765e11e27..682def1a27 100644 --- a/resources/libraries/python/QemuUtils.py +++ b/resources/libraries/python/QemuUtils.py @@ -364,7 +364,7 @@ class QemuUtils: eal_pci_whitelist0=u"0000:00:06.0", eal_pci_whitelist1=u"0000:00:07.0", eal_in_memory=True, - pmd_num_mbufs=16384, + pmd_num_mbufs=32768, pmd_fwd_mode=u"io", pmd_nb_ports=u"2", pmd_portmask=u"0x3", @@ -391,7 +391,7 @@ class QemuUtils: eal_pci_whitelist0=u"0000:00:06.0", eal_pci_whitelist1=u"0000:00:07.0", eal_in_memory=True, - pmd_num_mbufs=16384, + pmd_num_mbufs=32768, pmd_fwd_mode=u"mac", pmd_nb_ports=u"2", pmd_portmask=u"0x3", diff --git a/resources/libraries/robot/dpdk/default.robot b/resources/libraries/robot/dpdk/default.robot index 957a2541d8..53e3f9f04e 100644 --- a/resources/libraries/robot/dpdk/default.robot +++ b/resources/libraries/robot/dpdk/default.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2020 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: @@ -46,9 +46,10 @@ | | | ${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} +| | | ${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}/2) +| | | ... | 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} @@ -90,7 +91,7 @@ | | | ... | ${thr_count_int} | | | ${rxq_count_int}= | Run keyword if | ${rx_queues} | | | ... | Set variable | ${rx_queues} -| | | ... | ELSE | Evaluate | int(${thr_count_int}/2) +| | | ... | 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} diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot index 06ac1209e5..1d4c9a17b0 100644 --- a/resources/libraries/robot/shared/container.robot +++ b/resources/libraries/robot/shared/container.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2020 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: @@ -330,9 +330,10 @@ | | ${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} +| | ${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}/2) +| | ... | 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} |