From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id C3A6B37AA for ; Mon, 25 Apr 2016 11:06:34 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP; 25 Apr 2016 02:06:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,532,1455004800"; d="scan'208";a="962090957" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga002.jf.intel.com with ESMTP; 25 Apr 2016 02:06:32 -0700 Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com [10.239.29.90]) by shvmail01.sh.intel.com with ESMTP id u3P96QWd028794; Mon, 25 Apr 2016 17:06:26 +0800 Received: from shecgisg003.sh.intel.com (localhost [127.0.0.1]) by shecgisg003.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id u3P96N4f025262; Mon, 25 Apr 2016 17:06:25 +0800 Received: (from hengdinx@localhost) by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id u3P96NF1025258; Mon, 25 Apr 2016 17:06:23 +0800 From: Ding Heng To: dts@dpdk.org Cc: Ding Heng Date: Mon, 25 Apr 2016 17:06:22 +0800 Message-Id: <1461575182-25226-1-git-send-email-hengx.ding@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dts] [PATCH] l3fwd/testpmd performance: optimize command delete some useless configure. 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: , X-List-Received-Date: Mon, 25 Apr 2016 09:06:35 -0000 l3fwd: comment 2 cases no need to run in nightly performance test. Fix issues for run rfc2544 case with different nic. Add 72 byte for performance test. testpmd: change report format for generate nightly performance test. Use core mask instead of all cores for performance test. Optimize command for performance test. Signed-off-by: Ding Heng diff --git a/tests/TestSuite_l3fwd.py b/tests/TestSuite_l3fwd.py index 0376a76..f6fce26 100644 --- a/tests/TestSuite_l3fwd.py +++ b/tests/TestSuite_l3fwd.py @@ -50,7 +50,7 @@ class TestL3fwd(TestCase,IxiaPacketGenerator): test_cases_2_ports = [(1,"1S/1C/1T","%s -c %s -n %d -- -P -p %s --config '(P0,0,C{1.1.0}), (P1,0,C{1.1.0})'"), #"1S/1C/2T": "%s -c %s -n %d -- -p %s --config '(P0,0,C{1.1.0}), (P1,0,C{1.1.1})'", (1,"1S/2C/1T","%s -c %s -n %d -- -P -p %s --config '(P0,0,C{1.1.0}), (P1,0,C{1.2.0})'"), - #"1S/4C/1T": "%s -c %s -n %d -- -p %s --config '(P0,0,C{1.1.0}), (P1,0,C{1.2.0}),(P0,1,C{1.3.0}), (P1,1,C{1.4.0})'", + (1,"1S/4C/1T", "%s -c %s -n %d -- -p %s --config '(P0,0,C{1.1.0}), (P1,0,C{1.2.0}),(P0,1,C{1.3.0}), (P1,1,C{1.4.0})'"), #"2S/2C/1T": "%s -c %s -n %d -- -p %s --config '(P0,0,C{0.1.0}), (P1,0,C{0.2.0}),(P0,1,C{1.3.0}), (P1,1,C{1.4.0})'", ] @@ -94,7 +94,7 @@ class TestL3fwd(TestCase,IxiaPacketGenerator): "{IPv4(13,101,0,0), 24, P3}", ] - frame_sizes = [64, 128, 256, 512, 2048] # 65, 128 + frame_sizes = [64, 72, 128, 256, 512, 1024, 2048] # 65, 128 methods = ['lpm']#, 'exact'] # @@ -309,7 +309,7 @@ class TestL3fwd(TestCase,IxiaPacketGenerator): """ pass - def test_perf_l3fwd_4ports(self): + def no_test_perf_l3fwd_4ports(self): """ L3fwd main 4 ports. """ @@ -360,7 +360,7 @@ class TestL3fwd(TestCase,IxiaPacketGenerator): dts.results_table_print() - def test_perf_l3fwd_2ports(self): + def no_test_perf_l3fwd_2ports(self): """ L3fwd main 2 ports. """ @@ -395,6 +395,7 @@ class TestL3fwd(TestCase,IxiaPacketGenerator): repl1 = "C{" + str(self.port_socket) coreMask = {} + cmdlist = [] rtCmdLines = {} cmdlist = TestL3fwd.test_cases_2_ports for cmdline_pat in cmdlist: @@ -471,12 +472,12 @@ class TestL3fwd(TestCase,IxiaPacketGenerator): ports = self.dut.get_ports() ports_num = len(ports) - header_row = ["Frame", "mode", "S/C/T", "LR_tx_pkts(1min)", "LR_rx_pkts(1min)", "LR_loss_pkts(1min)", "% zero_loss_rate", "zero_loss_throughput(Mpps)"] + header_row = ["Frame_size(byte)", "mode", "S/C/T", "zero_loss_throughput(Mpps)", " % zero_loss_rate"]# "LR_tx_pkts(1min)", "LR_rx_pkts(1min)", "LR_loss_pkts(1min)", "% zero_loss_rate", "zero_loss_throughput(Mpps)"] self.l3fwd_test_results['header'] = header_row dts.results_table_add_header(header_row) self.l3fwd_test_results['data'] = [] - for frame_size in [64, 128, 256, 512, 1024]: + for frame_size in TestL3fwd.frame_sizes: # Prepare traffic flow payload_size = frame_size - \ @@ -501,10 +502,17 @@ class TestL3fwd(TestCase,IxiaPacketGenerator): coreMask = {} rtCmdLines = {} + cmdlist = [] if ports_num == 4: - cmdlist = TestL3fwd.test_cases_4_ports + for i in TestL3fwd.test_cases_4_ports: + cmdlist.append(i) else: - cmdlist = TestL3fwd.test_cases_2_ports + for i in TestL3fwd.test_cases_2_ports: + cmdlist.append(i) + if 'eagle' in self.nic: + del cmdlist[2] + else: + del cmdlist[1] for cmdline_pat in cmdlist: corelist = [] rtCmdLines[cmdline_pat[1]] = cmdline_pat[2] @@ -561,14 +569,15 @@ class TestL3fwd(TestCase,IxiaPacketGenerator): zero_loss_rate, tx_pkts, rx_pkts = self.tester.run_rfc2544(tgenInput, delay=60) loss_pkts = tx_pkts - rx_pkts self.dut.send_expect("^C", "#") - linerate = self.wirespeed(self.nic, frame_size, 2) + linerate = self.wirespeed(self.nic, frame_size, ports_num) zero_loss_throughput = (linerate * zero_loss_rate) / 100 tx_pkts = human_read_number(tx_pkts) rx_pkts = human_read_number(rx_pkts) loss_pkts = human_read_number(loss_pkts) - data_row = [frame_size, mode, cores, tx_pkts, rx_pkts, loss_pkts, zero_loss_rate, zero_loss_throughput] + #data_row = [frame_size, mode, cores, tx_pkts, rx_pkts, loss_pkts, zero_loss_rate, zero_loss_throughput] + data_row = [frame_size, mode, cores, zero_loss_throughput, zero_loss_rate] dts.results_table_add_row(data_row) self.l3fwd_test_results['data'].append(data_row) else: diff --git a/tests/TestSuite_pmd.py b/tests/TestSuite_pmd.py index aeab99a..d078487 100644 --- a/tests/TestSuite_pmd.py +++ b/tests/TestSuite_pmd.py @@ -57,15 +57,12 @@ class TestPmd(TestCase,IxiaPacketGenerator): self.rxfreet_values = [0, 8, 16, 32, 64, 128] - self.test_cycles = [{'cores': '1S/1C/1T', 'Mpps': {}, 'pct': {}}, - {'cores': '1S/2C/1T', 'Mpps': {}, 'pct': {}}, - {'cores': '1S/2C/2T', 'Mpps': {}, 'pct': {}}, - {'cores': '1S/4C/1T', 'Mpps': {}, 'pct': {}}, - {'cores': '1S/8C/1T', 'Mpps': {}, 'pct': {}} + self.test_cycles = [{'cores': '1S/2C/1T', 'Mpps': {}, 'pct': {}} ] self.table_header = ['Frame Size'] for test_cycle in self.test_cycles: + self.table_header.append("app") self.table_header.append("%s Mpps" % test_cycle['cores']) self.table_header.append("% linerate") @@ -126,7 +123,7 @@ class TestPmd(TestCase,IxiaPacketGenerator): core_mask = dts.create_mask(core_list) port_mask = dts.create_mask(self.dut.get_ports()) - self.pmdout.start_testpmd("all", "--coremask=%s --rxq=%d --txq=%d --portmask=%s --rss-ip" % (core_mask, queues, queues, port_mask)) + self.pmdout.start_testpmd(core_config, " --rxq=%d --txq=%d --portmask=%s --rss-ip --txrst=32 --txfreet=32 --txd=128 --txqflags=0xf01" % (queues, queues, port_mask), socket=self.ports_socket) command_line = self.pmdout.get_pmd_cmd() info = "Executing PMD (mac fwd) using %s\n" % test_cycle['cores'] @@ -171,6 +168,7 @@ class TestPmd(TestCase,IxiaPacketGenerator): table_row = [frame_size] for test_cycle in self.test_cycles: + table_row.append("testpmd") table_row.append(test_cycle['Mpps'][frame_size]) table_row.append(test_cycle['pct'][frame_size]) @@ -209,7 +207,8 @@ class TestPmd(TestCase,IxiaPacketGenerator): core_mask = dts.create_mask(core_list) port_mask = dts.create_mask([self.dut_ports[0], self.dut_ports[1]]) - self.pmdout.start_testpmd("all", "--coremask=%s --rxq=%d --txq=%d --portmask=%s" % (core_mask, queues, queues, port_mask)) + #self.pmdout.start_testpmd("all", "--coremask=%s --rxq=%d --txq=%d --portmask=%s" % (core_mask, queues, queues, port_mask)) + self.pmdout.start_testpmd(core_config, " --rxq=%d --txq=%d --portmask=%s --rss-ip --txrst=32 --txfreet=32 --txd=128" % (queues, queues, port_mask), socket=self.ports_socket) command_line = self.pmdout.get_pmd_cmd() info = "Executing PMD using %s\n" % test_cycle['cores'] @@ -249,6 +248,7 @@ class TestPmd(TestCase,IxiaPacketGenerator): for frame_size in self.frame_sizes: table_row = [frame_size] for test_cycle in self.test_cycles: + table_row.append("testpmd") table_row.append(test_cycle['Mpps'][frame_size]) table_row.append(test_cycle['pct'][frame_size]) -- 1.9.3