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

Message ID 20201106095535.5650-3-haiyangx.zhao@intel.com (mailing list archive)
State Accepted
Headers
Series framework: fix the issue of eal param may be duplicated |

Commit Message

Zhao, HaiyangX Nov. 6, 2020, 9:55 a.m. UTC
  *.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(-)
  

Patch

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