diff options
Diffstat (limited to 'tests/vpp/perf/hoststack')
15 files changed, 129 insertions, 111 deletions
diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot index 72952b00a7..2f8232e4c2 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 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: @@ -48,15 +48,16 @@ | ${nic_txq_size}= | 0 | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 +| ${smt_used}= | ${False} | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${dpdk_no_tx_checksum_offload}= | ${False} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} *** Keywords *** | Local template | | [Arguments] | ${phy_cores} | | -| | Set Test Variable | ${dpdk_no_tx_checksum_offload} | ${False} | | Set VPP Hoststack Attributes | phy_cores=${phy_cores} | | ${defer_fail}= | Get Test Results From Hoststack Iperf3 Test | | Run Keyword If | ${defer_fail}==True | FAIL diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot index bca2bcf5d1..39dd77f684 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 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: @@ -48,8 +48,10 @@ | ${nic_txq_size}= | 0 | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 +| ${smt_used}= | ${False} | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${dpdk_no_tx_checksum_offload}= | ${False} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} | ${pkts_per_drop}= | ${100} diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot index 79c6db294b..17ac73b8e0 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 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: @@ -49,7 +49,8 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${dpdk_no_tx_checksum_offload}= | ${False} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} | ${streams} | ${10} @@ -57,7 +58,6 @@ | Local template | | [Arguments] | ${phy_cores} | | -| | Set Test Variable | ${dpdk_no_tx_checksum_offload} | ${False} | | Set VPP Hoststack Attributes | phy_cores=${phy_cores} | | Set Iperf3 Client Attributes | parallel=${streams} | | ${defer_fail}= | Get Test Results From Hoststack Iperf3 Test diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot index b21623606a..30ac61def0 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 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: @@ -49,7 +49,8 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${dpdk_no_tx_checksum_offload}= | ${False} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} | ${pkts_per_drop}= | ${100} | ${streams}= | ${10} diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpbase-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpbase-ldpreload-iperf3-bps.robot index 0717e39dc7..491e20b170 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpbase-ldpreload-iperf3-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpbase-ldpreload-iperf3-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 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: @@ -48,8 +48,10 @@ | ${nic_txq_size}= | 0 | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 +| ${smt_used}= | ${False} | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${dpdk_no_tx_checksum_offload}= | ${False} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} | ${iperf3_packet_length}= | ${1460} @@ -57,7 +59,6 @@ | Local template | | [Arguments] | ${phy_cores} | | -| | Set Test Variable | ${dpdk_no_tx_checksum_offload} | ${False} | | Set VPP Hoststack Attributes | phy_cores=${phy_cores} | | ${bandwidth} = | Get From Dictionary | | ... | ${NIC_NAME_TO_BPS_LIMIT} | ${nic_name} diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot index 6077a7abf4..5f2eafb2f5 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 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: @@ -40,17 +40,19 @@ | ... | - **[Ref] Applicable standard specifications:** *** Variables *** -| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | quic_plugin.so +| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | quic_plugin.so | crypto_openssl_plugin.so | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 | ${nic_txq_size}= | 0 | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 +| ${smt_used}= | ${False} | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${dpdk_no_tx_checksum_offload}= | ${False} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} -| ${bytes}= | 10G +| ${bytes}= | 5G *** Keywords *** | Local template diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot index a853579acd..5806905b4f 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 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,7 +41,7 @@ | ... | - **[Ref] Applicable standard specifications:** *** Variables *** -| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | quic_plugin.so +| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | quic_plugin.so | crypto_openssl_plugin.so | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -49,7 +49,8 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${dpdk_no_tx_checksum_offload}= | ${False} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} | ${clients}= | ${10} | ${streams}= | ${10} diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot index c1deff32ea..a31273681e 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 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,7 +41,7 @@ | ... | - **[Ref] Applicable standard specifications:** *** Variables *** -| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | quic_plugin.so +| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | quic_plugin.so | crypto_openssl_plugin.so | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -49,7 +49,8 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${dpdk_no_tx_checksum_offload}= | ${False} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} | ${clients}= | ${10} | ${bytes}= | 1G diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot index 28549bb709..59951aa5db 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 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,7 +41,7 @@ | ... | - **[Ref] Applicable standard specifications:** *** Variables *** -| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | quic_plugin.so +| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | quic_plugin.so | crypto_openssl_plugin.so | ${nic_name}= | Intel-X710 | ${nic_driver}= | vfio-pci | ${nic_rxq_size}= | 0 @@ -49,7 +49,8 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${dpdk_no_tx_checksum_offload}= | ${False} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} | ${streams}= | ${10} | ${bytes}= | 1G diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpscale1cl10s-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpscale1cl10s-ldpreload-iperf3-bps.robot index 42fd601bb6..0368f9d15b 100644 --- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpscale1cl10s-ldpreload-iperf3-bps.robot +++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpscale1cl10s-ldpreload-iperf3-bps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2024 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: @@ -49,7 +49,8 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} -| ${frame_size}= | ${9000} +| ${dpdk_no_tx_checksum_offload}= | ${False} +| ${frame_size}= | ${1518} | ${crypto_type}= | ${None} | ${streams} | ${10} | ${iperf3_packet_length}= | ${1460} @@ -58,7 +59,6 @@ | Local template | | [Arguments] | ${phy_cores} | | -| | Set Test Variable | ${dpdk_no_tx_checksum_offload} | ${False} | | Set VPP Hoststack Attributes | phy_cores=${phy_cores} | | ${bandwidth} = | Get From Dictionary | | ... | ${NIC_NAME_TO_BPS_LIMIT} | ${nic_name} diff --git a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps.robot b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-cps.robot index 0dcd63f3ed..cd6cb673c5 100644 --- a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps.robot +++ b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-cps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Intel and/or its affiliates. +# Copyright (c) 2024 Intel 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: @@ -17,7 +17,8 @@ | | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | ... | HOSTSTACK | LDP_NGINX | TCP | NIC_Intel-X710 | DRV_VFIO_PCI -| ... | TCP_CPS | eth-ip4tcphttp-ldpreload-nginx-1_14_2 +| ... | TCP_CPS | DMA +| ... | eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 | | Suite Setup | Setup suite topology interfaces | ab | nginx | Suite Teardown | Tear down suite | ab @@ -26,7 +27,7 @@ | | Test Template | Local Template | -| Documentation | **TCP requests per seconds.** +| Documentation | **TCP requests per second.** | ... | | ... | - **[Top] Network Topologies:** TG-DUT-TG 2-node topology \ | ... | with single link between nodes. @@ -41,6 +42,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so +| ... | dma_intel_plugin.so | ping_plugin.so | ${nic_name}= | Intel-X710 | ${crypto_type}= | ${None} | ${nic_driver}= | vfio-pci @@ -49,6 +51,8 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} +| ${dpdk_no_tx_checksum_offload}= | ${False} +#| ${page_size}= | 1G | ${ciphers}= | 0 | ${rps_cps}= | cps | ${qat}= | ${0} @@ -62,62 +66,57 @@ | @{ab_ip_addrs}= | 192.168.10.2 | ${dut_ip_prefix}= | 24 | @{dut_ip_addrs}= | 192.168.10.1 -| ${nginx_version}= | 1.14.2 +| ${nginx_version}= | 1.21.5 +| ${use_dma}= | ${True} *** Keywords *** | Local template | | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None} | | | | Set Test Variable | \${frame_size} -| | Set Test Variable | ${dpdk_no_tx_checksum_offload} | ${False} | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | FOR | ${dut} | IN | @{duts} -| | | Import Library | resources.libraries.python.VppConfigGenerator -| | | ... | WITH NAME | ${dut} -| | | Run keyword | ${dut}.Add Session Event Queues Memfd Segment -| | | Run keyword | ${dut}.Add tcp congestion control algorithm -| | | Run keyword | ${dut}.Add session enable -| | END +| | And Add Additional Startup Configuration For DMA On All DUTs | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface -| | And Set up LDP or VCL Nginx on DUT node | ${dut1} | ${mode} +| | And Set up LDP or VCL Nginx on DUT1 node | ${mode} | | ... | ${rps_cps} | ${phy_cores} | ${qat} | ${tls_tcp} +| | ... | ${True} | | And Additional Suite Setup Action For ab | | Then Measure TLS requests or connections per second | | ... | ${ciphers} | ${frame_size} | ${tls_tcp} | ${rps_cps} *** Test Cases *** -| 0B-1c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps +| 0B-1c-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-cps | | [Tags] | 0B | 1C | | frame_size=${0} | phy_cores=${1} -| 0B-2c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps +| 0B-2c-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-cps | | [Tags] | 0B | 2C | | frame_size=${0} | phy_cores=${2} -| 64B-1c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps +| 64B-1c-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-cps | | [Tags] | 64B | 1C | | frame_size=${64} | phy_cores=${1} -| 64B-2c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps +| 64B-2c-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-cps | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} -| 1024B-1c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps +| 1024B-1c-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-cps | | [Tags] | 1024B | 1C | | frame_size=${1024} | phy_cores=${1} -| 1024B-2c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps +| 1024B-2c-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-cps | | [Tags] | 1024B | 2C | | frame_size=${1024} | phy_cores=${2} -| 2048B-1c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps +| 2048B-1c-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-cps | | [Tags] | 2048B | 1C | | frame_size=${2048} | phy_cores=${1} -| 2048B-2c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-cps +| 2048B-2c-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-cps | | [Tags] | 2048B | 2C | | frame_size=${2048} | phy_cores=${2} diff --git a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps.robot b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-rps.robot index 42524f0da4..e1680b4779 100644 --- a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps.robot +++ b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-rps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Intel and/or its affiliates. +# Copyright (c) 2024 Intel 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: @@ -17,7 +17,8 @@ | | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | ... | HOSTSTACK | LDP_NGINX | TCP | NIC_Intel-X710 | DRV_VFIO_PCI -| ... | TCP_RPS | eth-ip4tcphttp-ldpreload-nginx-1_14_2 +| ... | TCP_RPS | DMA +| ... | eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5 | | Suite Setup | Setup suite topology interfaces | ab | nginx | Suite Teardown | Tear down suite | ab @@ -41,6 +42,7 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so +| ... | dma_intel_plugin.so | ping_plugin.so | ${nic_name}= | Intel-X710 | ${crypto_type}= | ${None} | ${nic_driver}= | vfio-pci @@ -49,6 +51,8 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} +| ${dpdk_no_tx_checksum_offload}= | ${False} +#| ${page_size}= | 1G | ${ciphers}= | 0 | ${rps_cps}= | rps | ${qat}= | ${0} @@ -62,62 +66,57 @@ | @{ab_ip_addrs}= | 192.168.10.2 | ${dut_ip_prefix}= | 24 | @{dut_ip_addrs}= | 192.168.10.1 -| ${nginx_version}= | 1.14.2 +| ${nginx_version}= | 1.21.5 +| ${use_dma}= | ${True} *** Keywords *** | Local template | | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None} | | | | Set Test Variable | \${frame_size} -| | Set Test Variable | ${dpdk_no_tx_checksum_offload} | ${False} | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | FOR | ${dut} | IN | @{duts} -| | | Import Library | resources.libraries.python.VppConfigGenerator -| | | ... | WITH NAME | ${dut} -| | | Run keyword | ${dut}.Add Session Event Queues Memfd Segment -| | | Run keyword | ${dut}.Add tcp congestion control algorithm -| | | Run keyword | ${dut}.Add session enable -| | END +| | And Add Additional Startup Configuration For DMA On All DUTs | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface -| | And Set up LDP or VCL Nginx on DUT node | ${dut1} | ${mode} +| | And Set up LDP or VCL Nginx on DUT1 node | ${mode} | | ... | ${rps_cps} | ${phy_cores} | ${qat} | ${tls_tcp} +| | ... | ${True} | | And Additional Suite Setup Action For ab | | Then Measure TLS requests or connections per second | | ... | ${ciphers} | ${frame_size} | ${tls_tcp} | ${rps_cps} *** Test Cases *** -| 0B-1c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps +| 0B-1c-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-rps | | [Tags] | 0B | 1C | | frame_size=${0} | phy_cores=${1} -| 0B-2c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps +| 0B-2c-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-rps | | [Tags] | 0B | 2C | | frame_size=${0} | phy_cores=${2} -| 64B-1c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps +| 64B-1c-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-rps | | [Tags] | 64B | 1C | | frame_size=${64} | phy_cores=${1} -| 64B-2c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps +| 64B-2c-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-rps | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} -| 1024B-1c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps +| 1024B-1c-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-rps | | [Tags] | 1024B | 1C | | frame_size=${1024} | phy_cores=${1} -| 1024B-2c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps +| 1024B-2c-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-rps | | [Tags] | 1024B | 2C | | frame_size=${1024} | phy_cores=${2} -| 2048B-1c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps +| 2048B-1c-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-rps | | [Tags] | 2048B | 1C | | frame_size=${2048} | phy_cores=${1} -| 2048B-2c-eth-ip4tcphttp-ldpreload-nginx-1_14_2-rps +| 2048B-2c-eth-ip4tcphttp-dma-ldpreload-nginx-1_21_5-rps | | [Tags] | 2048B | 2C | | frame_size=${2048} | phy_cores=${2} diff --git a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps.robot b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps.robot index faee23794d..7f1e4ba189 100644 --- a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps.robot +++ b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Intel and/or its affiliates. +# Copyright (c) 2024 Intel 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: @@ -17,7 +17,7 @@ | | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | ... | HOSTSTACK | LDP_NGINX | TCP | NIC_Intel-X710 | DRV_VFIO_PCI -| ... | TCP_CPS | eth-ip4tcphttp-ldpreload-nginx-1_15_0 +| ... | TCP_CPS | eth-ip4tcphttp-ldpreload-nginx-1_21_5 | | Suite Setup | Setup suite topology interfaces | ab | nginx | Suite Teardown | Tear down suite | ab @@ -49,6 +49,7 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} +| ${dpdk_no_tx_checksum_offload}= | ${False} | ${ciphers}= | 0 | ${rps_cps}= | cps | ${qat}= | ${0} @@ -62,62 +63,66 @@ | @{ab_ip_addrs}= | 192.168.10.2 | ${dut_ip_prefix}= | 24 | @{dut_ip_addrs}= | 192.168.10.1 -| ${nginx_version}= | 1.15.0 +| ${nginx_version}= | 1.21.5 +| ${sess_evt_q_length}= | 100000 +| ${sess_prealloc_sess}= | 1100000 +| ${v4_sess_tbl_buckets}= | 250000 +| ${v4_sess_tbl_mem}= | 1g +| ${local_endpts_tbl_buckets}= | 250000 +| ${local_endpts_tbl_mem}= | 1g +| ${tcp_prealloc_conns}= | 1100000 +| ${tcp_prealloc_ho_conns}= | 1100000 *** Keywords *** | Local template | | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None} | | | | Set Test Variable | \${frame_size} -| | Set Test Variable | ${dpdk_no_tx_checksum_offload} | ${False} | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | FOR | ${dut} | IN | @{duts} -| | | Import Library | resources.libraries.python.VppConfigGenerator -| | | ... | WITH NAME | ${dut} -| | | Run keyword | ${dut}.Add Session Event Queues Memfd Segment -| | | Run keyword | ${dut}.Add tcp congestion control algorithm -| | | Run keyword | ${dut}.Add session enable -| | END +| | And Configure VPP startup configuration for NGINX | ${sess_prealloc_sess} +| | ... | ${sess_evt_q_length} | ${v4_sess_tbl_buckets} | ${v4_sess_tbl_mem} +| | ... | ${local_endpts_tbl_buckets} | ${local_endpts_tbl_mem} +| | ... | ${tcp_prealloc_conns} | ${tcp_prealloc_ho_conns} | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface -| | And Set up LDP or VCL Nginx on DUT node | ${dut1} | ${mode} +| | And Set up LDP or VCL Nginx on DUT1 node | ${mode} | | ... | ${rps_cps} | ${phy_cores} | ${qat} | ${tls_tcp} | | And Additional Suite Setup Action For ab | | Then Measure TLS requests or connections per second | | ... | ${ciphers} | ${frame_size} | ${tls_tcp} | ${rps_cps} *** Test Cases *** -| 0B-1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps +| 0B-1c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps | | [Tags] | 0B | 1C | | frame_size=${0} | phy_cores=${1} -| 0B-2c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps +| 0B-2c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps | | [Tags] | 0B | 2C | | frame_size=${0} | phy_cores=${2} -| 64B-1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps +| 64B-1c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps | | [Tags] | 64B | 1C | | frame_size=${64} | phy_cores=${1} -| 64B-2c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps +| 64B-2c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} -| 1024B-1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps +| 1024B-1c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps | | [Tags] | 1024B | 1C | | frame_size=${1024} | phy_cores=${1} -| 1024B-2c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps +| 1024B-2c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps | | [Tags] | 1024B | 2C | | frame_size=${1024} | phy_cores=${2} -| 2048B-1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps +| 2048B-1c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps | | [Tags] | 2048B | 1C | | frame_size=${2048} | phy_cores=${1} -| 2048B-2c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps +| 2048B-2c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps | | [Tags] | 2048B | 2C | | frame_size=${2048} | phy_cores=${2} diff --git a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps.robot b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps.robot index 4ea86b3b2f..0db8a72a16 100644 --- a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps.robot +++ b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Intel and/or its affiliates. +# Copyright (c) 2024 Intel 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: @@ -17,7 +17,7 @@ | | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | ... | HOSTSTACK | LDP_NGINX | TCP | NIC_Intel-X710 | DRV_VFIO_PCI -| ... | TCP_RPS | eth-ip4tcphttp-ldpreload-nginx-1_15_0 +| ... | TCP_RPS | eth-ip4tcphttp-ldpreload-nginx-1_21_5 | | Suite Setup | Setup suite topology interfaces | ab | nginx | Suite Teardown | Tear down suite | ab @@ -49,6 +49,7 @@ | ${nic_pfs}= | 2 | ${nic_vfs}= | 0 | ${overhead}= | ${0} +| ${dpdk_no_tx_checksum_offload}= | ${False} | ${ciphers}= | 0 | ${rps_cps}= | rps | ${qat}= | ${0} @@ -62,62 +63,66 @@ | @{ab_ip_addrs}= | 192.168.10.2 | ${dut_ip_prefix}= | 24 | @{dut_ip_addrs}= | 192.168.10.1 -| ${nginx_version}= | 1.15.0 +| ${nginx_version}= | 1.21.5 +| ${sess_evt_q_length}= | 100000 +| ${sess_prealloc_sess}= | 1100000 +| ${v4_sess_tbl_buckets}= | 250000 +| ${v4_sess_tbl_mem}= | 1g +| ${local_endpts_tbl_buckets}= | 250000 +| ${local_endpts_tbl_mem}= | 1g +| ${tcp_prealloc_conns}= | 1100000 +| ${tcp_prealloc_ho_conns}= | 1100000 *** Keywords *** | Local template | | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None} | | | | Set Test Variable | \${frame_size} -| | Set Test Variable | ${dpdk_no_tx_checksum_offload} | ${False} | | Given Set Max Rate And Jumbo | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} | | And Pre-initialize layer driver | ${nic_driver} -| | FOR | ${dut} | IN | @{duts} -| | | Import Library | resources.libraries.python.VppConfigGenerator -| | | ... | WITH NAME | ${dut} -| | | Run keyword | ${dut}.Add Session Event Queues Memfd Segment -| | | Run keyword | ${dut}.Add tcp congestion control algorithm -| | | Run keyword | ${dut}.Add session enable -| | END +| | And Configure VPP startup configuration for NGINX | ${sess_prealloc_sess} +| | ... | ${sess_evt_q_length} | ${v4_sess_tbl_buckets} | ${v4_sess_tbl_mem} +| | ... | ${local_endpts_tbl_buckets} | ${local_endpts_tbl_mem} +| | ... | ${tcp_prealloc_conns} | ${tcp_prealloc_ho_conns} | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface -| | And Set up LDP or VCL Nginx on DUT node | ${dut1} | ${mode} +| | And Set up LDP or VCL Nginx on DUT1 node | ${mode} | | ... | ${rps_cps} | ${phy_cores} | ${qat} | ${tls_tcp} | | And Additional Suite Setup Action For ab | | Then Measure TLS requests or connections per second | | ... | ${ciphers} | ${frame_size} | ${tls_tcp} | ${rps_cps} *** Test Cases *** -| 0B-1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps +| 0B-1c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps | | [Tags] | 0B | 1C | | frame_size=${0} | phy_cores=${1} -| 0B-2c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps +| 0B-2c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps | | [Tags] | 0B | 2C | | frame_size=${0} | phy_cores=${2} -| 64B-1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps +| 64B-1c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps | | [Tags] | 64B | 1C | | frame_size=${64} | phy_cores=${1} -| 64B-2c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps +| 64B-2c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} -| 1024B-1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps +| 1024B-1c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps | | [Tags] | 1024B | 1C | | frame_size=${1024} | phy_cores=${1} -| 1024B-2c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps +| 1024B-2c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps | | [Tags] | 1024B | 2C | | frame_size=${1024} | phy_cores=${2} -| 2048B-1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps +| 2048B-1c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps | | [Tags] | 2048B | 1C | | frame_size=${2048} | phy_cores=${1} -| 2048B-2c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps +| 2048B-2c-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps | | [Tags] | 2048B | 2C | | frame_size=${2048} | phy_cores=${2} diff --git a/tests/vpp/perf/hoststack/regenerate_testcases.py b/tests/vpp/perf/hoststack/regenerate_testcases.py index 87521e662d..e22f6de5c3 100755 --- a/tests/vpp/perf/hoststack/regenerate_testcases.py +++ b/tests/vpp/perf/hoststack/regenerate_testcases.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2023 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: |