From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 20BB2A04F3; Thu, 9 Jan 2020 03:47:34 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E2A511D67A; Thu, 9 Jan 2020 03:47:33 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 332C91D678 for ; Thu, 9 Jan 2020 03:47:32 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jan 2020 18:47:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,412,1571727600"; d="scan'208";a="218243658" Received: from npg-dpdk-project-yinanwang-1.sh.intel.com ([10.67.117.55]) by fmsmga008.fm.intel.com with ESMTP; 08 Jan 2020 18:47:30 -0800 From: Yinan To: dts@dpdk.org Cc: Wang Yinan Date: Wed, 8 Jan 2020 19:42:36 +0000 Message-Id: <20200108194236.3909-1-yinan.wang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dts] [PATCH v2] tests/virtio_pvp_ci: add virtio pvp test for performance track X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" From: Wang Yinan add virtio pvp test for performance track in CI Signed-off-by: Wang Yinan --- conf/virtio_pvp_ci.cfg | 48 +++++ tests/TestSuite_virtio_pvp_ci.py | 355 +++++++++++++++++++++++++++++++ 2 files changed, 403 insertions(+) create mode 100644 conf/virtio_pvp_ci.cfg create mode 100644 tests/TestSuite_virtio_pvp_ci.py diff --git a/conf/virtio_pvp_ci.cfg b/conf/virtio_pvp_ci.cfg new file mode 100644 index 0000000..a1c96b8 --- /dev/null +++ b/conf/virtio_pvp_ci.cfg @@ -0,0 +1,48 @@ +# Throughput numbers vary in different environment. +# Change these configuration on demand. +# - test_parameters defines the combination of frame size and descriptor +# numbers, and the pattern is +# {'frame size': ['descriptor number #1', 'descriptor number #2']} +# - test_duration is how many seconds each combination performance will +# be recorded. +# - accepted_tolerance defines the accepted tolerance between test +# results and expected numbers. +# - expected_throughput is a dictionary defining expected throughput +# numbers based on NIC, and the pattern is +# {'NIC': {'frame size': {'descriptor number': 'excepted throughput'}}} +# Default numbers of fortville_spirit and niantic is generated on this +# environment: +# * Intel(R) Xeon(R) Platinum 8180 CPU @ 2.50GHz +# * Trex v3.23 +# - if update_expected == Ture, and add argument "--update-expected" in +# bash command, all objects in this file will changed after the run +# for example: ./dts --update-expected + +#[suite] +#update_expected = True +#test_parameters = {64: [1024],1518: [1024]} +#test_duration = 60 +#accepted_tolerance = 1 +#expected_throughput = {'1q1c':{64: {1024:7.718}, 1518:{1024: 3.4}},'virtio_single_core': {64: {1024:7.718}, 1518:{1024: 3.4}},'vhost_single_core': {64: {1024:7.718}, 1518:{1024: 3.4}}} +# legacy formate for reference +#throughput_nnt = {64: {128: 53.435, 512: 53.699, 2048: 42.798}} +#throughput_fvl25g = {64: {512: 43.777, 2048: 43.651}} +#throughput_fvl40g = {64: {512: 62.35, 2048: 47.89}} +#throughput_cx5 = {64: {128: 42.161, 256: 56.651, 512: 47.091, 2048: 40.104}} +#throughput_cx4lx25g = {64: {128: 28.178, 256: 34.581, 512: 30.528, 2048: 26.004}} +#throughput_cx4lx40g = {64: {128: 31.635, 256: 32.473, 512: 30.72, 2048: 26.94}} +[suite] +update_expected = True +test_parameters = {64: [1024]} +test_duration = 60 +accepted_tolerance = 2 +expected_throughput = {'1q1c': {64: {1024: 7.696}},'virtio_single_core': {64: {1024: 11.80}}, 'vhost_single_core': {64: {1024: 8.654}},} + + +# legacy formate for reference +throughput_nnt = {64: {128: 53.435, 512: 53.699, 2048: 42.798}} +throughput_fvl25g = {64: {512: 43.777, 2048: 43.651}} +throughput_fvl40g = {64: {512: 62.35, 2048: 47.89}} +throughput_cx5 = {64: {128: 42.161, 256: 56.651, 512: 47.091, 2048: 40.104}} +throughput_cx4lx25g = {64: {128: 28.178, 256: 34.581, 512: 30.528, 2048: 26.004}} +throughput_cx4lx40g = {64: {128: 31.635, 256: 32.473, 512: 30.72, 2048: 26.94}} diff --git a/tests/TestSuite_virtio_pvp_ci.py b/tests/TestSuite_virtio_pvp_ci.py new file mode 100644 index 0000000..06d379b --- /dev/null +++ b/tests/TestSuite_virtio_pvp_ci.py @@ -0,0 +1,355 @@ +# BSD LICENSE +# +# Copyright(c) 2019-2020 Intel Corporation. All rights reserved. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +""" +DPDK Test suite. +""" +import utils +import json +import rst +import os +import re +import time +from test_case import TestCase +from packet import Packet +from settings import UPDATE_EXPECTED, load_global_setting +from copy import deepcopy +from prettytable import PrettyTable + + +class TestVirtioSingleCorePerf(TestCase): + + def set_up_all(self): + """ + Run at the start of each test suite. + """ + # Clean the execution environment + self.dut.send_expect("rm -rf ./vhost.out", "#") + self.frame_sizes = [64, 1518] + # Based on h/w type, choose how many ports to use + self.number_of_ports = 1 + self.dut_ports = self.dut.get_ports() + self.nb_ports = len(self.dut_ports) + self.socket = self.dut.get_numa_id(self.dut_ports[0]) + # determine if to save test result as a separated file + self.save_result_flag = True + socket_num = len(set([int(core['socket']) for core in self.dut.cores])) + self.socket_mem = ','.join(['1024']*socket_num) + + def set_up(self): + """ + Run before each test case. + It's more convenient to load suite configuration here than + set_up_all in debug mode. + """ + + # test parameters include: frames size, descriptor numbers + self.test_parameters = self.get_suite_cfg()['test_parameters'] + + # traffic duraion in second + self.test_duration = self.get_suite_cfg()['test_duration'] + + # initilize throughput attribution + # {'$framesize':{"$nb_desc": 'throughput'} + self.throughput = {} + + # Accepted tolerance in Mpps + self.gap = self.get_suite_cfg()['accepted_tolerance'] + + # header to print test result table + self.table_header = ['Frame Size', 'TXD/RXD', 'Throughput', 'Rate', + 'Expected Throughput', 'Throughput Difference'] + self.test_result = {} + + def test_perf_vhost_virtio_pvp(self): + """ + Benchmark performance for Vhost PVP Mergeable Path. + """ + self.test_target = "1q1c" + self.expected_throughput = self.get_suite_cfg()['expected_throughput'][self.test_target] + self.perf_vhost_virtio_pvp_test(self.nb_ports) + self.handle_expected() + self.handle_results() + + def test_perf_virtio_single_core_performance(self): + """ + Benchmark performance for virtio single core PVP Mergeable Path. + """ + self.test_target = "virtio_single_core" + self.expected_throughput = self.get_suite_cfg()['expected_throughput'][self.test_target] + self.perf_virtio_single_core_test(self.nb_ports) + self.handle_expected() + self.handle_results() + + def test_perf_vhost_single_core_performance(self): + """ + Benchmark performance for Vhost single corePVP Mergeable Path. + """ + self.test_target = "vhost_single_core" + self.expected_throughput = self.get_suite_cfg()['expected_throughput'][self.test_target] + self.perf_vhost_single_core_test(self.nb_ports) + self.handle_expected() + self.handle_results() + + def prepare_stream(self, frame_size): + ''' + create streams for ports, one port two streams, and configure them. + ''' + self.tester.pktgen.clear_streams() + stream_ids = [] + for port in xrange(self.number_of_ports): + rx_port = self.tester.get_local_port( + self.dut_ports[port % self.number_of_ports]) + tx_port = self.tester.get_local_port( + self.dut_ports[(port) % self.number_of_ports]) + destination_mac = self.dut.get_mac_address( + self.dut_ports[(port) % self.number_of_ports]) + pkt = Packet(pkt_type='UDP', pkt_len=frame_size) + pkt.config_layer('ether', {'dst': '%s' % destination_mac}) + pkt.save_pcapfile(self.tester, "%s/single_core_%d.pcap" % (self.tester.tmp_file, port)) + stream_id = self.tester.pktgen.add_stream(tx_port, tx_port, + "%s/single_core_%d.pcap" % (self.tester.tmp_file, port)) + stream_option = { + 'pcap': "%s/single_core_%d.pcap" % (self.tester.tmp_file, port), + 'stream_config': {'rate': 100} + } + self.tester.pktgen.config_stream(stream_id, stream_option) + stream_ids.append(stream_id) + return stream_ids + + def handle_expected(self): + """ + Update expected numbers to configurate file: conf/$suite_name.cfg + """ + if load_global_setting(UPDATE_EXPECTED) == "yes": + for frame_size in self.test_parameters.keys(): + for nb_desc in self.test_parameters[frame_size]: + self.expected_throughput[frame_size][nb_desc] = round(self.throughput[frame_size][nb_desc], 3) + + def start_testpmd_as_vhost(self, nb_desc, nb_cores): + eal_params = self.dut.create_eal_parameters(cores=self.core_list_host, + ports=[0], prefix='vhost') + command_line_client = self.target + "/app/testpmd %s " + \ + "--socket-mem 1024,1024 --legacy-mem " \ + "--vdev 'net_vhost0,iface=vhost-net,queues=1' " + \ + "-- -i --nb-cores=%d --txd=%d --rxd=%d" + command_line_client = command_line_client % (eal_params, nb_cores, nb_desc, nb_desc) + self.dut.send_expect(command_line_client, "testpmd> ", 120) + self.dut.send_expect("set fwd mac", "testpmd> ", 120) + self.dut.send_expect("start", "testpmd> ", 120) + + def start_testpmd_as_virtio(self, nb_desc, nb_cores): + # launch virtio + eal_params = self.dut.create_eal_parameters(cores=self.core_list_user, + no_pci=True, prefix='virtio') + command_line_server = self.target + "/app/testpmd %s " + \ + "--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net,in_order=0 " + \ + "-- -i --nb-cores=%d --tx-offloads=0x0 --enable-hw-vlan-strip --txd=%d --rxd=%d" + command_line_server = command_line_server % (eal_params, nb_cores, nb_desc, nb_desc) + self.vhost_user = self.dut.new_session(suite="user") + self.vhost_user.send_expect(command_line_server, "testpmd> ", 120) + self.vhost_user.send_expect("set fwd mac", "testpmd> ", 120) + self.vhost_user.send_expect("start", "testpmd> ", 120) + self.vhost_user.send_expect("start", "testpmd> ", 120) + + def send_and_verify_throughput(self, nb_desc): + for frame_size in self.frame_sizes: + self.throughput[frame_size] = dict() + self.logger.info("Test running at parameters: " + + "framesize: {}, rxd/txd: {}".format(frame_size, nb_desc)) + stream_ids = self.prepare_stream(frame_size) + traffic_opt = { + 'method': 'throughput', + 'rate': 100, + 'duration': 20} + _, pps = self.tester.pktgen.measure(stream_ids, traffic_opt) + Mpps = pps / 1000000.0 + self.verify(Mpps > 0, "%s can not receive packets of frame size %d" % (self.running_case, frame_size)) + throughput = Mpps * 100 / \ + float(self.wirespeed(self.nic, frame_size, self.number_of_ports)) + self.throughput[frame_size][nb_desc] = Mpps + self.verify(throughput, + "No traffic detected, please check your configuration") + self.logger.info("Trouthput of " + + "framesize: {}, rxd/txd: {} is :{} Mpps".format( + frame_size, nb_desc, throughput)) + + def perf_vhost_virtio_pvp_test(self, port_num): + """ + Vhost/virtio PVP test + """ + core_config = "1S/4C/1T" + core_list = self.dut.get_core_list(core_config, socket=self.socket) + self.verify(len(core_list) >= 4, 'There no enough cores to run this case') + self.logger.info("Executing Test Using cores: %s" % core_list) + port_mask = utils.create_mask(self.dut_ports) + self.core_list_user = core_list[0:2] + self.core_list_host = core_list[2:4] + nb_desc = self.test_parameters[64][0] + self.start_testpmd_as_vhost(nb_desc, 1) + self.start_testpmd_as_virtio(nb_desc, 1) + self.send_and_verify_throughput(nb_desc) + + def perf_virtio_single_core_test(self, port_num): + """ + Vhost/virtio single core PVP test + """ + core_config = "1S/5C/1T" + core_list = self.dut.get_core_list(core_config, socket=self.socket) + self.verify(len(core_list) >= 5, 'There no enough cores to run this case') + self.logger.info("Executing Test Using cores: %s" % core_list) + port_mask = utils.create_mask(self.dut_ports) + self.core_list_user = core_list[0:2] + self.core_list_host = core_list[2:5] + nb_desc = self.test_parameters[64][0] + self.start_testpmd_as_vhost(nb_desc, 2) + self.start_testpmd_as_virtio(nb_desc, 1) + self.send_and_verify_throughput(nb_desc) + + def perf_vhost_single_core_test(self, port_num): + """ + Vhost/virtio vhost single core PVP test + """ + core_config = "1S/5C/1T" + core_list = self.dut.get_core_list(core_config, socket=self.socket) + self.verify(len(core_list) >= 5, 'There no enough cores to run this case') + self.logger.info("Executing Test Using cores: %s" % core_list) + port_mask = utils.create_mask(self.dut_ports) + self.core_list_user = core_list[0:3] + self.core_list_host = core_list[3:5] + nb_desc = self.test_parameters[64][0] + self.start_testpmd_as_vhost(nb_desc, 1) + self.start_testpmd_as_virtio(nb_desc, 2) + self.send_and_verify_throughput(nb_desc) + + def handle_results(self): + """ + results handled process: + 1, save to self.test_results + 2, create test results table + 3, save to json file for Open Lab + """ + header = self.table_header + for frame_size in self.test_parameters.keys(): + wirespeed = self.wirespeed(self.nic, frame_size, self.nb_ports) + ret_datas = {} + for nb_desc in self.test_parameters[frame_size]: + ret_data = {} + ret_data[header[0]] = frame_size + ret_data[header[1]] = nb_desc + ret_data[header[2]] = "{:.3f} Mpps".format( + self.throughput[frame_size][nb_desc]) + ret_data[header[3]] = "{:.3f}%".format( + self.throughput[frame_size][nb_desc] * 100 / wirespeed) + ret_data[header[4]] = "{:.3f} Mpps".format( + self.expected_throughput[frame_size][nb_desc]) + ret_data[header[5]] = "{:.3f} Mpps".format( + self.throughput[frame_size][nb_desc] - + self.expected_throughput[frame_size][nb_desc]) + ret_datas[nb_desc] = deepcopy(ret_data) + self.test_result[frame_size] = deepcopy(ret_datas) + # Create test results table + self.result_table_create(header) + for frame_size in self.test_parameters.keys(): + for nb_desc in self.test_parameters[frame_size]: + table_row = list() + for i in range(len(header)): + table_row.append( + self.test_result[frame_size][nb_desc][header[i]]) + self.result_table_add(table_row) + # present test results to screen + self.result_table_print() + # save test results as a file + if self.save_result_flag: + self.save_result(self.test_result) + + def save_result(self, data): + ''' + Saves the test results as a separated file named with + self.nic+_single_core_perf.json in output folder + if self.save_result_flag is True + ''' + json_obj = dict() + case_name = self.running_case + json_obj[case_name] = list() + status_result = [] + for frame_size in self.test_parameters.keys(): + for nb_desc in self.test_parameters[frame_size]: + row_in = self.test_result[frame_size][nb_desc] + row_dict0 = dict() + row_dict0['performance'] = list() + row_dict0['parameters'] = list() + row_dict0['parameters'] = list() + result_throughput = float(row_in['Throughput'].split()[0]) + expected_throughput = float(row_in['Expected Throughput'].split()[0]) + # delta value and accepted tolerance in percentage + delta = result_throughput - expected_throughput + gap = expected_throughput * -self.gap * 0.01 + self.logger.info("Accept tolerance are (Mpps) %s" % gap) + self.logger.info("Throughput Difference are (Mpps) %s" % delta) + delta = float(delta) + gap = float(gap) + self.logger.info("Accept tolerance are (Mpps) %f" % gap) + self.logger.info("Throughput Difference are (Mpps) %f" % delta) + if result_throughput > expected_throughput + gap: + row_dict0['status'] = 'PASS' + else: + row_dict0['status'] = 'FAIL' + self.verify(row_dict0['status'] == 'PASS', 'The throughput is not in correct range') + row_dict1 = dict(name="Throughput", value=result_throughput, unit="Mpps", delta=delta) + row_dict2 = dict(name="Txd/Rxd", value=row_in["TXD/RXD"], unit="descriptor") + row_dict3 = dict(name="frame_size", value=row_in["Frame Size"], unit="bytes") + row_dict0['performance'].append(row_dict1) + row_dict0['parameters'].append(row_dict2) + row_dict0['parameters'].append(row_dict3) + json_obj[case_name].append(row_dict0) + status_result.append(row_dict0['status']) + with open(os.path.join(rst.path2Result, + '{0:s}_single_core_perf.json'.format( + self.nic)), 'w') as fp: + json.dump(json_obj, fp) + self.verify("Fail" not in status_result, "Exceeded Gap") + + def tear_down(self): + """ + Run after each test case. + """ + self.dut.send_expect("stop", "testpmd> ") + self.dut.send_expect("quit", "# ", 30) + self.vhost_user.send_expect("stop", "testpmd> ") + self.vhost_user.send_expect("quit", "# ", 30) + self.dut.kill_all() + + def tear_down_all(self): + """ + Run after each test suite. + """ + pass -- 2.17.1