[dts] [PATCH]tests pmd, generic_filter: reduce cores to run testpmd in i686

[Liu, Yong]

Applied, thanks.

On 12/10/2015 10:07 AM, Lijuan Tu wrote:
> Signed-off-by: Lijuan Tu <lijuanx.a.tu at intel.com>
> ---
>   tests/TestSuite_generic_filter.py | 29 ++++++++++++++---------------
>   tests/TestSuite_pmd.py            | 10 ++--------
>   2 files changed, 16 insertions(+), 23 deletions(-)
>
> diff --git a/tests/TestSuite_generic_filter.py b/tests/TestSuite_generic_filter.py
> index 26abea2..663001c 100644
> --- a/tests/TestSuite_generic_filter.py
> +++ b/tests/TestSuite_generic_filter.py
> @@ -60,10 +60,9 @@ class TestGeneric_filter(TestCase):
>           ports = self.dut.get_ports(self.nic)
>           # Verify that enough ports are available
>           self.verify(len(ports) >= 2, "Insufficient ports")
> -        cores = self.dut.get_core_list("all")
> -        self.verify(len(cores) >= 10, "Insufficient core")
> -        global coreMask
> -        coreMask = dts.create_mask(cores)
> +
> +        self.cores = "1S/5C/1T"
> +
>           # Based on h/w type, choose how many ports to use
>           global valports
>           valports = [_ for _ in ports if self.tester.get_local_port(_) != -1]
> @@ -201,7 +200,7 @@ class TestGeneric_filter(TestCase):
>           """
>           self.verify(self.nic in ["niantic", "kawela_4", "bartonhills", "powerville"], "%s nic not support syn filter" % self.nic)
>           self.pmdout.start_testpmd(
> -            "all", "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=8 --nb-ports=1" % portMask)
> +            "%s" % self.cores, "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=4 --nb-ports=1" % portMask)
>           self.port_config()
>           self.dut.send_expect(
>               "syn_filter %s add priority high queue 2" % valports[0], "testpmd> ")
> @@ -239,7 +238,7 @@ class TestGeneric_filter(TestCase):
>           priority filter
>           """
>           self.pmdout.start_testpmd(
> -            "all", "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=8 --nb-ports=1" % portMask)
> +            "%s" % self.cores, "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=4 --nb-ports=1" % portMask)
>           self.port_config()
>   
>           if self.nic == "niantic":
> @@ -304,7 +303,7 @@ class TestGeneric_filter(TestCase):
>           """
>           if self.nic in ["niantic", "kawela_4"]:
>               self.pmdout.start_testpmd(
> -                "all", "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=8 --nb-ports=1" % portMask)
> +                "%s" % self.cores, "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=4 --nb-ports=1" % portMask)
>               self.port_config()
>   
>               mask = ['0x1f', '0x0']
> @@ -369,7 +368,7 @@ class TestGeneric_filter(TestCase):
>                              "powerville", "fortville_eagle", "fortville_spirit",
>                              "fortville_spirit_single"], "%s nic not support syn filter" % self.nic)
>           self.pmdout.start_testpmd(
> -            "all", "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=8 --nb-ports=1" % portMask)
> +            "%s" % self.cores, "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=4 --nb-ports=1" % portMask)
>           self.port_config()
>           self.ethertype_filter = "on"
>           ethertype = "0x0806"
> @@ -406,7 +405,7 @@ class TestGeneric_filter(TestCase):
>       def test_multiple_filters_10GB(self):
>           if self.nic == "niantic":
>               self.pmdout.start_testpmd(
> -                "all", "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=8 --nb-ports=1" % portMask)
> +                "%s" % self.cores, "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=4 --nb-ports=1" % portMask)
>               self.port_config()
>               self.dut.send_expect(
>                   "syn_filter %s add priority high queue 1" % valports[0], "testpmd> ")
> @@ -490,7 +489,7 @@ class TestGeneric_filter(TestCase):
>   
>           if self.nic in ["powerville", "bartonhills"]:
>               self.pmdout.start_testpmd(
> -                "all", "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=8 --nb-ports=1" % portMask)
> +                "%s" % self.cores, "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=4 --nb-ports=1" % portMask)
>               self.port_config()
>               self.dut.send_expect(
>                   "2tuple_filter %s add dst_port 64 protocol 0x11 mask 1 tcp_flags 0 priority 3 queue 1" % valports[0], "testpmd> ")
> @@ -525,7 +524,7 @@ class TestGeneric_filter(TestCase):
>   
>           masks = ['000C', '000C']
>           self.pmdout.start_testpmd(
> -            "all", "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=8 --nb-ports=1" % portMask)
> +            "%s" % self.cores, "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=4 --nb-ports=1" % portMask)
>           self.port_config()
>           for i in [0, 1]:
>               if i == 0:
> @@ -578,7 +577,7 @@ class TestGeneric_filter(TestCase):
>   
>           if self.nic in ["powerville", "kawela_4", "bartonhills"]:
>               self.pmdout.start_testpmd(
> -                "all", "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=8 --nb-ports=1" % portMask)
> +                "%s" % self.cores, "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=4 --nb-ports=1" % portMask)
>               self.port_config()
>               self.dut.send_expect(
>                   "syn_filter %s add priority high queue 1" % valports[0], "testpmd> ")
> @@ -622,7 +621,7 @@ class TestGeneric_filter(TestCase):
>           
>           self.verify(self.nic not in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"], "%s nic not support this test" % self.nic)
>           self.pmdout.start_testpmd(
> -            "all", "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=8 --nb-ports=1 --mbcache=200 --mbuf-size=2048 --max-pkt-len=9600" % portMask)
> +            "%s" % self.cores, "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=4 --nb-ports=1 --mbcache=200 --mbuf-size=2048 --max-pkt-len=9600" % portMask)
>           port = self.tester.get_local_port(valports[0])
>           txItf = self.tester.get_interface(port)
>   
> @@ -696,7 +695,7 @@ class TestGeneric_filter(TestCase):
>               global valports
>               total_mbufs = self.request_mbufs(128) * len(valports)
>               self.pmdout.start_testpmd(
> -                "all", "--disable-rss --rxq=128 --txq=128 --portmask=%s --nb-cores=8 --total-num-mbufs=%d" % (portMask, total_mbufs))
> +                "all", "--disable-rss --rxq=128 --txq=128 --portmask=%s --nb-cores=4 --total-num-mbufs=%d" % (portMask, total_mbufs))
>               self.dut.send_expect(
>                   "set stat_qmap rx %s 0 0" % valports[0], "testpmd> ")
>               self.dut.send_expect(
> @@ -748,7 +747,7 @@ class TestGeneric_filter(TestCase):
>   
>       def test_perf_generic_filter_perf(self):
>           self.pmdout.start_testpmd(
> -            "all", "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=8 --nb-ports=1" % portMask)
> +            "%s" % self.cores, "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=4 --nb-ports=1" % portMask)
>           self.port_config()
>           print valports[0], valports[1]
>           tx_port = self.tester.get_local_port(valports[0])
> diff --git a/tests/TestSuite_pmd.py b/tests/TestSuite_pmd.py
> index bfd5e03..eeec53f 100644
> --- a/tests/TestSuite_pmd.py
> +++ b/tests/TestSuite_pmd.py
> @@ -292,14 +292,11 @@ class TestPmd(TestCase,IxiaPacketGenerator):
>   
>           self.dut.kill_all()
>   
> -        all_cores_mask = dts.create_mask(self.dut.get_core_list("all"))
> -        core_mask = dts.create_mask(self.dut.get_core_list('1S/1C/1T',
> -                                                           socket=self.ports_socket))
>           port_mask = dts.create_mask([self.dut_ports[0], self.dut_ports[1]])
>   
>           for rxfreet_value in self.rxfreet_values:
>   
> -            self.pmdout.start_testpmd("all", "--coremask=%s --portmask=%s --nb-cores=2 --enable-rx-cksum --disable-hw-vlan --disable-rss --rxd=1024 --txd=1024 --rxfreet=%d" % (core_mask, port_mask, rxfreet_value))
> +            self.pmdout.start_testpmd("1S/2C/1T", "--portmask=%s --enable-rx-cksum --disable-hw-vlan --disable-rss --rxd=1024 --txd=1024 --rxfreet=%d" % ( port_mask, rxfreet_value), socket=self.ports_socket)
>               self.dut.send_expect("set fwd csum", "testpmd> ")
>               self.dut.send_expect("start", "testpmd> ")
>   
> @@ -322,12 +319,9 @@ class TestPmd(TestCase,IxiaPacketGenerator):
>   
>           self.dut.kill_all()
>   
> -        all_cores_mask = dts.create_mask(self.dut.get_core_list("all"))
> -        core_mask = dts.create_mask(self.dut.get_core_list('1S/1C/1T',
> -                                                           socket=self.ports_socket))
>           port_mask = dts.create_mask([self.dut_ports[0], self.dut_ports[1]])
>   
> -        self.pmdout.start_testpmd("all", "--coremask=%s --portmask=%s" % (core_mask, port_mask))
> +        self.pmdout.start_testpmd("1S/2C/1T", "--portmask=%s" % port_mask, socket=self.ports_socket)
>           self.dut.send_expect("start", "testpmd> ")
>           for size in self.frame_sizes:
>               self.send_packet(size)