[dts] [PATCH V1 0/2] framework: fix the issue of eal param may be duplicated

[dts] [PATCH V1 0/2] framework: fix the issue of eal param may be duplicated

[Haiyang Zhao]

*.The eal parameter will be duplicated when rx_mode is setted 
  in execution.cfg and suites, this patchset is to fix this issue.

Haiyang Zhao (2):
  framework/pmd_output: add other eal param into config
  framework/dut: add check if the rx mode eal param is duplicate
    *.ignore the rx mode config in execution.cfg   if the rx mode is
    setted in suites.

 framework/dut.py        | 17 +++++++++--------
 framework/pmd_output.py |  1 +
 2 files changed, 10 insertions(+), 8 deletions(-)

-- 
2.17.1

[dts] [PATCH V1 1/2] framework/pmd_output: add other eal param into config

[Haiyang Zhao]

*.save other eal param in config,so it can check if
  the eal param is duplicate in create_eal_parameter.

Signed-off-by: Haiyang Zhao <haiyangx.zhao@intel.com>
---
 framework/pmd_output.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/framework/pmd_output.py b/framework/pmd_output.py
index 94a8f7c..6557f9c 100644
--- a/framework/pmd_output.py
+++ b/framework/pmd_output.py
@@ -162,6 +162,7 @@ class PmdOutput():
             all_eal_param = self.dut.create_eal_parameters(fixed_prefix=fixed_prefix, socket=socket, **config)
         else:
             w_pci_list, port_options, b_pci_list, file_prefix, no_pci, other_eal_str = self.split_eal_param(eal_param)
+            config['other_eal_param'] = other_eal_str
             if no_pci:
                 config['no_pci'] = no_pci
             if w_pci_list:
-- 
2.17.1

[dts] [PATCH V1 2/2] framework/dut: add check if the rx mode eal param is duplicate

[Haiyang Zhao]

*.ignore the rx mode config in execution.cfg   
  if the rx mode is setted in suites.

Signed-off-by: Haiyang Zhao <haiyangx.zhao@intel.com>
---
 framework/dut.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/framework/dut.py b/framework/dut.py
index 656cb59..d6862e8 100644
--- a/framework/dut.py
+++ b/framework/dut.py
@@ -230,14 +230,15 @@ class Dut(Crb):
         if use_shared_lib == 'true' and shared_lib_path and 'Virt' not in str(self):
             eal_str = eal_str + ' -d {} '.format(shared_lib_path)
         rx_mode = settings.load_global_setting(settings.DPDK_RXMODE_SETTING)
-        if rx_mode == 'novector':
-            eal_str = eal_str + ' --force-max-simd-bitwidth=64 '
-        elif rx_mode == 'sse':
-            eal_str = eal_str + ' --force-max-simd-bitwidth=128 '
-        elif rx_mode == 'avx2':
-            eal_str = eal_str + ' --force-max-simd-bitwidth=256 '
-        elif rx_mode == 'avx512':
-            eal_str = eal_str + ' --force-max-simd-bitwidth=512 '
+        if 'other_eal_param' not in config or 'force-max-simd-bitwidth' not in config['other_eal_param']:
+            if rx_mode == 'novector':
+                eal_str = eal_str + ' --force-max-simd-bitwidth=64 '
+            elif rx_mode == 'sse':
+                eal_str = eal_str + ' --force-max-simd-bitwidth=128 '
+            elif rx_mode == 'avx2':
+                eal_str = eal_str + ' --force-max-simd-bitwidth=256 '
+            elif rx_mode == 'avx512':
+                eal_str = eal_str + ' --force-max-simd-bitwidth=512 '
 
         return eal_str
 
-- 
2.17.1

Re: [dts] [PATCH V1 0/2] framework: fix the issue of eal param may be duplicated

[Tu, Lijuan]

> 
> *.The eal parameter will be duplicated when rx_mode is setted
>   in execution.cfg and suites, this patchset is to fix this issue.
> 
> Haiyang Zhao (2):
>   framework/pmd_output: add other eal param into config
>   framework/dut: add check if the rx mode eal param is duplicate
>     *.ignore the rx mode config in execution.cfg   if the rx mode is
>     setted in suites.
> 
>  framework/dut.py        | 17 +++++++++--------
>  framework/pmd_output.py |  1 +
>  2 files changed, 10 insertions(+), 8 deletions(-)
> 

Reviewed-by: Lijuan Tu <lijuan.tu@intel.com>
Applied