diff --git a/conf/fips_cryptodev.cfg b/conf/fips_cryptodev.cfg
index fa638a20..dc93527f 100644
--- a/conf/fips_cryptodev.cfg
+++ b/conf/fips_cryptodev.cfg
@@ -9,40 +9,40 @@ n=6
 vdev="crypto_aesni_mb_pmd_1"
 
 [test_fips_aesni_gcm_gcm]
-w="0000:af:00.0"
+a="0000:af:00.0"
 req-file="/root/FIPS/GCM/req"
 rsp-file="/root/FIPS/GCM/resp"
 cryptodev="crypto_aesni_gcm_pmd_1"
 
 [test_fips_aesni_mb_3des]
-w="0000:af:00.0"
+a="0000:af:00.0"
 req-file="/root/FIPS/TDES/req"
 rsp-file="/root/FIPS/TDES/resp"
 cryptodev="crypto_aesni_mb_pmd_1"
 
 [test_fips_aesni_mb_aes]
-w="0000:af:00.0"
+a="0000:af:00.0"
 req-file="/root/FIPS/AES/req"
 rsp-file="/root/FIPS/AES/resp"
 cryptodev="crypto_aesni_mb_pmd_1"
 
 [test_fips_aesni_mb_ccm]
-w="0000:af:00.0"
+a="0000:af:00.0"
 req-file="/root/FIPS/CCM/req"
 rsp-file="/root/FIPS/CCM/resp"
 
 [test_fips_aesni_mb_cmac]
-w="0000:af:00.0"
+a="0000:af:00.0"
 req-file="/root/FIPS/CMAC/req"
 rsp-file="/root/FIPS/CMAC/resp"
 
 [test_fips_aesni_mb_hmac]
-w="0000:af:00.0"
+a="0000:af:00.0"
 req-file="/root/FIPS/HMAC/req"
 rsp-file="/root/FIPS/HMAC/resp"
 
 [test_fips_broken_test]
-w="0000:1a:01.0"
+a="0000:1a:01.0"
 req-file="/root/FIPS/AES/req"
 rsp-file="/root/FIPS/AES/resp"
 
@@ -67,36 +67,36 @@ req-file="/root/FIPS/HMAC/req"
 rsp-file="/root/FIPS/HMAC/resp"
 
 [test_fips_qat_3des]
-w="0000:1a:01.0"
+a="0000:1a:01.0"
 req-file="/root/FIPS/TDES/req"
 rsp-file="/root/FIPS/TDES/resp"
 
 [test_fips_qat_aes]
-w="0000:1a:01.0"
+a="0000:1a:01.0"
 req-file="/root/FIPS/AES/req"
 rsp-file="/root/FIPS/AES/resp"
 
 [test_fips_qat_ccm]
-w="0000:1a:01.0"
+a="0000:1a:01.0"
 req-file="/root/FIPS/CCM/req"
 rsp-file="/root/FIPS/CCM/resp"
 
 [test_fips_qat_cmac]
-w="0000:1a:01.0"
+a="0000:1a:01.0"
 req-file="/root/FIPS/CMAC/req"
 rsp-file="/root/FIPS/CMAC/resp"
 
 [test_fips_qat_gcm]
-w="0000:1a:01.0"
+a="0000:1a:01.0"
 req-file="/root/FIPS/GCM/req"
 rsp-file="/root/FIPS/GCM/resp"
 
 [test_fips_qat_hmac]
-w="0000:1a:01.0"
+a="0000:1a:01.0"
 req-file="/root/FIPS/HMAC/req"
 rsp-file="/root/FIPS/HMAC/resp"
 
 [test_fips_self_test]
-w="0000:1a:01.0"
+a="0000:1a:01.0"
 req-file="/root/FIPS/AES/req"
 rsp-file="/root/FIPS/AES/resp"
diff --git a/conf/virtio_ipsec_cryptodev_func.cfg b/conf/virtio_ipsec_cryptodev_func.cfg
index de6724d7..2d684a0f 100644
--- a/conf/virtio_ipsec_cryptodev_func.cfg
+++ b/conf/virtio_ipsec_cryptodev_func.cfg
@@ -4,7 +4,7 @@ crypto_dev_id="37c9"
 
 # default crypto device and sw device config
 vdev="crypto_aesni_mb_pmd_1 --vdev crypto_aesni_mb_pmd_2"
-w="0000:00:00.0"
+a="0000:00:00.0"
 
 [vm0]
 qemu =
diff --git a/conf/virtio_perf_cryptodev_func.cfg b/conf/virtio_perf_cryptodev_func.cfg
index 0cd766be..ef5da245 100644
--- a/conf/virtio_perf_cryptodev_func.cfg
+++ b/conf/virtio_perf_cryptodev_func.cfg
@@ -4,7 +4,7 @@ crypto_dev_id="37c9"
 
 # default crypto device and sw device config
 vdev="crypto_aesni_mb_pmd_1"
-w="0000:00:00.0"
+a="0000:00:00.0"
 
 [test_aesni_mb_aes_cbc_sha1_hmac]
 buffer-sz="64,128,256,512,1024,2048"
diff --git a/conf/virtio_unit_cryptodev_func.cfg b/conf/virtio_unit_cryptodev_func.cfg
index 53611e33..094addb8 100644
--- a/conf/virtio_unit_cryptodev_func.cfg
+++ b/conf/virtio_unit_cryptodev_func.cfg
@@ -4,7 +4,7 @@ crypto_dev_id="37c9"
 
 # default crypto device and sw device config
 vdev="crypto_aesni_mb_pmd_1"
-w="0000:00:00.0"
+a="0000:00:00.0"
 
 [vm0]
 qemu =
diff --git a/test_plans/compressdev_isal_pmd_test_plan.rst b/test_plans/compressdev_isal_pmd_test_plan.rst
index e33893d2..6ea21b8e 100644
--- a/test_plans/compressdev_isal_pmd_test_plan.rst
+++ b/test_plans/compressdev_isal_pmd_test_plan.rst
@@ -65,7 +65,7 @@ Test Case: Compressdev ISA-L PMD Unit test
 ----------------------------------------------------------------
 Start test application and run isal pmd unit test::
 
-    ./app/test -l1 -n1 -w vdev_bus_id --vdev=compress_isal
+    ./app/test -l1 -n1 -a vdev_bus_id --vdev=compress_isal
     RTE>>compressdev_autotest
 
 Verify all test cases passed in the test.
@@ -74,7 +74,7 @@ Test Case: Compressdev ISA-L PMD fixed function test
 ---------------------------------------------------------
 Run Compressdev isal pmd test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w vdev_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a vdev_bus_id -l 4 \
     --vdev=compress_isal -- --driver-name compress_isal --input-file file_name \
     --compress-level level --num-iter number --huffman-enc fixed
 
@@ -86,7 +86,7 @@ Test Case: Compressdev ISA-L PMD dynamic function test
 ---------------------------------------------------------
 Run Compressdev isal pmd test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w vdev_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a vdev_bus_id -l 4 \
     --vdev=compress_isal -- --driver-name compress_isal --input-file file_name \
     --compress-level level --num-iter number --huffman-enc dynamic
 
@@ -98,7 +98,7 @@ Test Case: Compressdev ISA-L PMD fixed performance test
 -----------------------------------------------------------
 Run Compressdev isal pmd performance test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w vdev_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a vdev_bus_id -l 4 \
     --vdev=compress_isal -- --driver-name compress_isal --input-file file_name \
     --compress-level level --seg-sz size --num-iter number --huffman-enc fixed
 
@@ -110,7 +110,7 @@ Test Case: Compressdev ISA-L PMD dynamic performance test
 ----------------------------------------------------------------
 Run Compressdev isal pmd performance test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w vdev_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a vdev_bus_id -l 4 \
     --vdev=compress_isal -- --driver-name compress_isal --input-file file_name \
     --compress-level level --seg-sz size --num-iter number --huffman-enc dynamic
 
diff --git a/test_plans/compressdev_qat_pmd_test_plan.rst b/test_plans/compressdev_qat_pmd_test_plan.rst
index 1c9fc79d..a23be221 100644
--- a/test_plans/compressdev_qat_pmd_test_plan.rst
+++ b/test_plans/compressdev_qat_pmd_test_plan.rst
@@ -68,7 +68,7 @@ Test Case: Compressdev QAT PMD Unit test
 ----------------------------------------------------------------
 Start test application and run qat pmd unit test::
 
-    ./app/test -l1 -n1 -w qat_device_bus_id --log-level=qat:8
+    ./app/test -l1 -n1 -a qat_device_bus_id --log-level=qat:8
     RTE>>compressdev_autotest
 
 Verify all test cases passed in the test.
@@ -77,7 +77,7 @@ Test Case: Compressdev QAT PMD fixed function test
 ----------------------------------------------------------------------
 Run Compressdev qat pmd test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w qat_device_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a qat_device_bus_id -l 4 \
     -- --driver-name compress_qat --input-file file_name \
     --compress-level level --num-iter number --huffman-enc fixed
 
@@ -89,7 +89,7 @@ Test Case: Compressdev QAT PMD dynamic function test
 -----------------------------------------------------------------------
 Run Compressdev qat pmd test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w qat_device_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a qat_device_bus_id -l 4 \
     -- --driver-name compress_qat --input-file file_name \
     --compress-level level --num-iter number --huffman-enc dynamic
 
@@ -101,7 +101,7 @@ Test Case: Compressdev QAT PMD big sgl fixed function test
 --------------------------------------------------------------------------
 Run Compressdev qat pmd test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w qat_device_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a qat_device_bus_id -l 4 \
     -- --driver-name compress_qat --input-file file_name --seg-sz segsize \
     --compress-level level --num-iter number --extended-input-sz size \
     --max-num-sgl-segs seg --huffman-enc fixed
@@ -114,7 +114,7 @@ Test Case: Compressdev QAT PMD big sgl dynamic function test
 --------------------------------------------------------------------------
 Run Compressdev qat pmd test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w qat_device_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a qat_device_bus_id -l 4 \
     -- --driver-name compress_qat --input-file file_name --seg-sz segsize \
     --compress-level level --num-iter number --extended-input-sz size \
     --max-num-sgl-segs seg --huffman-enc dynamic
@@ -127,7 +127,7 @@ Test Case: Compressdev QAT PMD big seg-sz fixed function test
 --------------------------------------------------------------------------
 Run Compressdev qat pmd test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w qat_device_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a qat_device_bus_id -l 4 \
     -- --driver-name compress_qat --input-file file_name --seg-sz segsize \
     --compress-level level --num-iter number --extended-input-sz size \
     --max-num-sgl-segs seg --huffman-enc fixed
@@ -140,7 +140,7 @@ Test Case: Compressdev QAT PMD big seg-sz dynamic function test
 ---------------------------------------------------------------------------
 Run Compressdev qat pmd test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w qat_device_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a qat_device_bus_id -l 4 \
     -- --driver-name compress_qat --input-file file_name --seg-sz segsize \
     --compress-level level --num-iter number --extended-input-sz size \
     --max-num-sgl-segs seg --huffman-enc dynamic
@@ -153,7 +153,7 @@ Test Case: Compressdev QAT PMD external mbufs fixed function test
 -------------------------------------------------------------------------
 Run Compressdev qat pmd test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w qat_device_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a qat_device_bus_id -l 4 \
     -- --driver-name compress_qat --input-file file_name \
     --compress-level level --num-iter number --external-mbufs \
     --huffman-enc fixed
@@ -166,7 +166,7 @@ Test Case: Compressdev QAT PMD external mbufs dynamic function test
 --------------------------------------------------------------------------
 Run Compressdev qat pmd test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w qat_device_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a qat_device_bus_id -l 4 \
     -- --driver-name compress_qat --input-file file_name \
     --compress-level level --num-iter number --external-mbufs \
     --huffman-enc dynamic
@@ -179,7 +179,7 @@ Test Case: Compressdev QAT PMD im buffer split op fixed function test
 -------------------------------------------------------------------------
 Run Compressdev qat pmd test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w qat_device_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a qat_device_bus_id -l 4 \
     -- --driver-name compress_qat --input-file file_name \
     --compress-level level --num-iter number --seg-sz segsize \
     --max-num-sgl-segs seg --extended-input-sz size \
@@ -193,7 +193,7 @@ Test Case: Compressdev QAT PMD im buffer split op dynamic function test
 --------------------------------------------------------------------------
 Run Compressdev qat pmd test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w qat_device_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a qat_device_bus_id -l 4 \
     -- --driver-name compress_qat --input-file file_name \
     --compress-level level --num-iter number --seg-sz segsize \
     --max-num-sgl-segs seg --extended-input-sz size \
@@ -207,7 +207,7 @@ Test Case: Compressdev QAT PMD fixed performance test
 --------------------------------------------------------------------------
 Run Compressdev qat pmd test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w qat_device_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a qat_device_bus_id -l 4 \
     -- --driver-name compress_qat --input-file file_name \
     --compress-level level --num-iter number --huffman-enc fixed
 
@@ -219,7 +219,7 @@ Test Case: Compressdev QAT PMD dynamic performance test
 ---------------------------------------------------------------------------
 Run Compressdev qat pmd test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w qat_device_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a qat_device_bus_id -l 4 \
     -- --driver-name compress_qat --input-file file_name \
     --compress-level level --num-iter number --huffman-enc dynamic
 
diff --git a/test_plans/compressdev_zlib_pmd_test_plan.rst b/test_plans/compressdev_zlib_pmd_test_plan.rst
index dd697d7c..f42ef32a 100644
--- a/test_plans/compressdev_zlib_pmd_test_plan.rst
+++ b/test_plans/compressdev_zlib_pmd_test_plan.rst
@@ -64,7 +64,7 @@ Test Case: Compressdev ZLIB PMD Unit test
 ----------------------------------------------------------------
 Start test application and run zlib pmd unit test::
 
-    ./app/test -l1 -n1 -w vdev_bus_id --vdev=compress_zlib
+    ./app/test -l1 -n1 -a vdev_bus_id --vdev=compress_zlib
     RTE>>compressdev_autotest
 
 Verify all test cases passed in the test.
@@ -73,7 +73,7 @@ Test Case: Compressdev ZLIB PMD fixed function test
 -------------------------------------------------------------
 Run Compressdev zlib pmd test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w vdev_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a vdev_bus_id -l 4 \
     --vdev=compress_zlib -- --driver-name compress_zlib --input-file file_name \
     --compress-level level --num-iter number --huffman-enc fixed
 
@@ -85,7 +85,7 @@ Test Case: Compressdev ZLIB PMD dynamic function test
 -------------------------------------------------------------
 Run Compressdev zlib pmd test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w vdev_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a vdev_bus_id -l 4 \
     --vdev=compress_zlib -- --driver-name compress_zlib --input-file file_name \
     --compress-level level --num-iter number --huffman-enc dynamic
 
@@ -97,7 +97,7 @@ Test Case: Compressdev ZLIB PMD fixed performance test
 ----------------------------------------------------------------------------
 Run Compressdev zlib pmd performance test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w vdev_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a vdev_bus_id -l 4 \
     --vdev=compress_zlib -- --driver-name compress_zlib --input-file file_name \
     --compress-level level --seg-sz size --num-iter number --huffman-enc fixed
 
@@ -109,7 +109,7 @@ Test Case: Compressdev ZLIB PMD dynamic performance test
 ---------------------------------------------------------------------------
 Run Compressdev zlib pmd performance test with below sample commands::
 
-    ./app/dpdk-test-compress-perf  -w vdev_bus_id -l 4 \
+    ./app/dpdk-test-compress-perf  -a vdev_bus_id -l 4 \
     --vdev=compress_zlib -- --driver-name compress_zlib --input-file file_name \
     --compress-level level --seg-sz size --num-iter number --huffman-enc dynamic
 
diff --git a/test_plans/crypto_perf_cryptodev_perf_test_plan.rst b/test_plans/crypto_perf_cryptodev_perf_test_plan.rst
index 10445063..331720f3 100644
--- a/test_plans/crypto_perf_cryptodev_perf_test_plan.rst
+++ b/test_plans/crypto_perf_cryptodev_perf_test_plan.rst
@@ -275,13 +275,13 @@ test_crypto_perf is added into DPDK.
 
 The test commands of test_crypto_perf is below::
 
-    ./build/app/dpdk-test-crypto-perf -c COREMASK --vdev (AESNI_MB|QAT|AESNI_GCM|OPENSSL|SNOW3G|KASUMI|ZUC|NULL) -w (PCI:DEVICE:FUNCTION) -w (PCI:DEVICE:FUNCTION) -- --ptest (throughput|latency) --devtype (crypto_aesni_mb|crypto_qat|crypto_aes_gcm|crypto_openssl|crypto_snow3g|crypto_kasumi|crypto_zuc|crypto_null) --optype (aead|cipher-only|auth-only|cipher-then-auth|auth-then-cipher)  --cipher-algo (ALGO) --cipher-op (encrypt|decrypt) --cipher-key-sz (key_size) --cipher-iv-sz (iv_size) --auth-algo (ALGO) --auth-op (generate|verify) --auth-key-sz (key_size) --auth-aad-sz (aad_size) --auth-digest-sz (digest_size) --total-ops (ops_number) --burst-sz (burst_size) --buffer-sz (buffer_size)
+    ./build/app/dpdk-test-crypto-perf -c COREMASK --vdev (AESNI_MB|QAT|AESNI_GCM|OPENSSL|SNOW3G|KASUMI|ZUC|NULL) -a (PCI:DEVICE:FUNCTION) -a (PCI:DEVICE:FUNCTION) -- --ptest (throughput|latency) --devtype (crypto_aesni_mb|crypto_qat|crypto_aes_gcm|crypto_openssl|crypto_snow3g|crypto_kasumi|crypto_zuc|crypto_null) --optype (aead|cipher-only|auth-only|cipher-then-auth|auth-then-cipher)  --cipher-algo (ALGO) --cipher-op (encrypt|decrypt) --cipher-key-sz (key_size) --cipher-iv-sz (iv_size) --auth-algo (ALGO) --auth-op (generate|verify) --auth-key-sz (key_size) --auth-aad-sz (aad_size) --auth-digest-sz (digest_size) --total-ops (ops_number) --burst-sz (burst_size) --buffer-sz (buffer_size)
 
 Common::
 
    --vdev (AESNI_MB|QAT|AESNI_GCM|OPENSSL|SNOW3G|KASUMI|ZUC|NULL) this value can be set as : crypto_aesni_mb_pmd, crypto_aes_gcm_pmd, crypto_openssl_pmd, crypto_snow3g_pmd, crypto_kasumi_pmd, crypto_zuc_pmd or  crypto_null_pmd. If pmd is QAT this parameter should not be set.
 
-    -w (PCI:DEVICE:FUNCTION) whitelist, specify the network interfaces or/and QAT devices that will be used by test application.
+    -a (PCI:DEVICE:FUNCTION) allowlist, specify the network interfaces or/and QAT devices that will be used by test application.
 
     --optype (aead|cipher-only|auth-only|cipher-then-auth|auth-then-cipher): if cipher-algo is aes-gcm or gmac this value must be set to aead. Otherwise, it will be set to others. Notice, null algorithm only support cipher-only test.
 
@@ -295,7 +295,7 @@ Test Case 01: Cryptodev Thoughput Performance Test
 
 QAT PMD command line::
 
-    ./build/app/test-crypto-perf/dpdk-test-crypto-perf -c 0xf -w 0000:1a:01.0 -- --ptest throughput --devtype crypto_qat --optype cipher-then-auth  --cipher-algo aes-cbc --cipher-op encrypt --cipher-key-sz 16 --cipher-iv-sz 16 --auth-algo sha1-hmac --auth-op generate --auth-key-sz 64 --auth-aad-sz 0 --auth-digest-sz 20 --total-ops 10000000 --burst-sz 32 --buffer-sz 1024
+    ./build/app/test-crypto-perf/dpdk-test-crypto-perf -c 0xf -a 0000:1a:01.0 -- --ptest throughput --devtype crypto_qat --optype cipher-then-auth  --cipher-algo aes-cbc --cipher-op encrypt --cipher-key-sz 16 --cipher-iv-sz 16 --auth-algo sha1-hmac --auth-op generate --auth-key-sz 64 --auth-aad-sz 0 --auth-digest-sz 20 --total-ops 10000000 --burst-sz 32 --buffer-sz 1024
 
 AESNI_MB PMD command line::
 
@@ -323,9 +323,9 @@ Test Case 02: Cryptodev Latency Performance Test
 
 AESNI_MB PMD command line::
 
-  ./build/app/test-crypto-perf/dpdk-test-crypto-perf -l 9,10,11,12 -n 4 --vdev crypto_aesni_mb1 --vdev crypto_aesni_mb2 -w 0000:1a:01.0 -- --devtype crypto_aesni_mb --cipher-algo aes-cbc --cipher-key-sz 16 --cipher-iv-sz 16 --cipher-op encrypt --optype cipher-only --silent --ptest latency --total-ops 10
+  ./build/app/test-crypto-perf/dpdk-test-crypto-perf -l 9,10,11,12 -n 4 --vdev crypto_aesni_mb1 --vdev crypto_aesni_mb2 -a 0000:1a:01.0 -- --devtype crypto_aesni_mb --cipher-algo aes-cbc --cipher-key-sz 16 --cipher-iv-sz 16 --cipher-op encrypt --optype cipher-only --silent --ptest latency --total-ops 10
 
-  ./build/app/test-crypto-perf/dpdk-test-crypto-perf -l 9,10,11,12 -n 4 --vdev crypto_aesni_mb1 --vdev crypto_aesni_mb2 -w 0000:1a:01.0 -- --ptest latency --devtype crypto_aesni_mb --optype cipher-then-auth --cipher-algo aes-cbc --cipher-op encrypt --cipher-key-sz 16 --auth-algo sha1-hmac --auth-op generate --auth-key-sz 64 --digest-sz 12 --total-ops 10000000 --burst-sz 32 --buffer-sz 64
+  ./build/app/test-crypto-perf/dpdk-test-crypto-perf -l 9,10,11,12 -n 4 --vdev crypto_aesni_mb1 --vdev crypto_aesni_mb2 -a 0000:1a:01.0 -- --ptest latency --devtype crypto_aesni_mb --optype cipher-then-auth --cipher-algo aes-cbc --cipher-op encrypt --cipher-key-sz 16 --auth-algo sha1-hmac --auth-op generate --auth-key-sz 64 --digest-sz 12 --total-ops 10000000 --burst-sz 32 --buffer-sz 64
 
 
 AESNI_GCM PMD command line::
@@ -335,11 +335,11 @@ AESNI_GCM PMD command line::
 
 QAT PMD command line::
 
-  ./build/app/test-crypto-perf/dpdk-test-crypto-perf -l 9,10,11,12 -n 4  -w 0000:1a:01.0  -w 0000:1a:01.1  -w 0000:1a:01.2 -- --devtype crypto_qat --cipher-algo aes-cbc --cipher-key-sz 16 --cipher-iv-sz 16 --cipher-op encrypt --optype cipher-only --silent --ptest latency --total-ops 10
+  ./build/app/test-crypto-perf/dpdk-test-crypto-perf -l 9,10,11,12 -n 4  -a 0000:1a:01.0  -a 0000:1a:01.1  -a 0000:1a:01.2 -- --devtype crypto_qat --cipher-algo aes-cbc --cipher-key-sz 16 --cipher-iv-sz 16 --cipher-op encrypt --optype cipher-only --silent --ptest latency --total-ops 10
 
-	./build/app/test-crypto-perf/dpdk-test-crypto-perf -l 9,10,11,12 -n 4  -w 0000:1a:01.0  -w 0000:1a:01.1  -w 0000:1a:01.2 -- --ptest latency --devtype crypto_qat --optype cipher-then-auth --cipher-algo aes-cbc --cipher-op encrypt --cipher-key-sz 16 --auth-algo sha1-hmac --auth-op generate --auth-key-sz 64 --digest-sz 12 --total-ops 10000000 --burst-sz 32 --buffer-sz 64
+	./build/app/test-crypto-perf/dpdk-test-crypto-perf -l 9,10,11,12 -n 4  -a 0000:1a:01.0  -a 0000:1a:01.1  -a 0000:1a:01.2 -- --ptest latency --devtype crypto_qat --optype cipher-then-auth --cipher-algo aes-cbc --cipher-op encrypt --cipher-key-sz 16 --auth-algo sha1-hmac --auth-op generate --auth-key-sz 64 --digest-sz 12 --total-ops 10000000 --burst-sz 32 --buffer-sz 64
 	
-	./build/app/test-crypto-perf/dpdk-test-crypto-perf -l 10,11 -n 4 -w 0000:1a:01.0 -- --aead-key-sz 16 --buffer-sz 64 --optype aead --ptest latency --aead-aad-sz 16 --devtype crypto_qat --aead-op encrypt --burst-sz 32 --total-ops 10000000 --silent  --digest-sz 16 --aead-algo aes-gcm --aead-iv-sz 12
+	./build/app/test-crypto-perf/dpdk-test-crypto-perf -l 10,11 -n 4 -a 0000:1a:01.0 -- --aead-key-sz 16 --buffer-sz 64 --optype aead --ptest latency --aead-aad-sz 16 --devtype crypto_qat --aead-op encrypt --burst-sz 32 --total-ops 10000000 --silent  --digest-sz 16 --aead-algo aes-gcm --aead-iv-sz 12
 
 
 Test Case 03: Cryptodev Verify Performance Test
@@ -353,11 +353,11 @@ AESNI_MB PMD command line::
 
 QAT PMD command line::
 
-	./build/app/test-crypto-perf/dpdk-test-crypto-perf -w 0000:1a:01.0 -l 9,10 -n 6  -- --buffer-sz 32 --optype cipher-then-auth --ptest verify --auth-key-sz 64 --cipher-key-sz 32 --devtype crypto_qat --cipher-iv-sz 16 --auth-op generate --burst-sz 32 --total-ops 30000000 --silent  --digest-sz 20 --auth-algo sha1-hmac --cipher-algo aes-cbc --cipher-op encrypt --test-name sha1_hmac_buff_32  --test-file test_aes_cbc.data
+	./build/app/test-crypto-perf/dpdk-test-crypto-perf -a 0000:1a:01.0 -l 9,10 -n 6  -- --buffer-sz 32 --optype cipher-then-auth --ptest verify --auth-key-sz 64 --cipher-key-sz 32 --devtype crypto_qat --cipher-iv-sz 16 --auth-op generate --burst-sz 32 --total-ops 30000000 --silent  --digest-sz 20 --auth-algo sha1-hmac --cipher-algo aes-cbc --cipher-op encrypt --test-name sha1_hmac_buff_32  --test-file test_aes_cbc.data
 
 OPENSSL PMD and QAT PMD command line::
 	
-  ./build/app/test-crypto-perf/dpdk-test-crypto-perf -l 9,10,11,12 -n 4 --vdev crypto_openssl -w 0000:1a:01.0 -- --devtype crypto_openssl --aead-algo aes-gcm --aead-key-sz 16 --aead-iv-sz 12 --aead-op encrypt --aead-aad-sz 16 --digest-sz 16 --optype aead --silent --ptest verify --burst-sz 32 --buffer-sz 32 --total-ops 10 --test-name aes_gcm_buff_32 --test-file test_aes_gcm.data
+  ./build/app/test-crypto-perf/dpdk-test-crypto-perf -l 9,10,11,12 -n 4 --vdev crypto_openssl -a 0000:1a:01.0 -- --devtype crypto_openssl --aead-algo aes-gcm --aead-key-sz 16 --aead-iv-sz 12 --aead-op encrypt --aead-aad-sz 16 --digest-sz 16 --optype aead --silent --ptest verify --burst-sz 32 --buffer-sz 32 --total-ops 10 --test-name aes_gcm_buff_32 --test-file test_aes_gcm.data
 
 OPENSSL PMD command line::
 
diff --git a/test_plans/fips_cryptodev_test_plan.rst b/test_plans/fips_cryptodev_test_plan.rst
index f7e30f24..754c05a5 100644
--- a/test_plans/fips_cryptodev_test_plan.rst
+++ b/test_plans/fips_cryptodev_test_plan.rst
@@ -157,7 +157,7 @@ Test Case 06: fips_qat_gcm_test
 
 Test Command::
 
-  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 -w 0000:1a:01.0 -- --req-file /root/FIPS/GCM/req --rsp-file /root/FIPS/GCM/resp --path-is-folder --cryptodev-id 0 --self-test
+  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 -a 0000:1a:01.0 -- --req-file /root/FIPS/GCM/req --rsp-file /root/FIPS/GCM/resp --path-is-folder --cryptodev-id 0 --self-test
 
 
 Test Case 07: fips_qat_aes_test
@@ -165,7 +165,7 @@ Test Case 07: fips_qat_aes_test
 
 Test Command::
 
-  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 -w 0000:1a:01.0 -- --req-file /root/FIPS/AES/req --rsp-file /root/FIPS/AES/resp --path-is-folder --cryptodev-id 0 --self-test
+  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 -a 0000:1a:01.0 -- --req-file /root/FIPS/AES/req --rsp-file /root/FIPS/AES/resp --path-is-folder --cryptodev-id 0 --self-test
 
 
 Test Case 08: fips_qat_3des_test
@@ -173,7 +173,7 @@ Test Case 08: fips_qat_3des_test
 
 Test Command::
 
-  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 -w 0000:1a:01.0 -- --req-file /root/FIPS/TDES/req --rsp-file /root/FIPS/TDES/resp --path-is-folder --cryptodev-id 0 --self-test
+  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 -a 0000:1a:01.0 -- --req-file /root/FIPS/TDES/req --rsp-file /root/FIPS/TDES/resp --path-is-folder --cryptodev-id 0 --self-test
 
 
 Test Case 09: fips_qat_hmac_test
@@ -181,7 +181,7 @@ Test Case 09: fips_qat_hmac_test
 
 Test Command::
 
-  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 -w 0000:1a:01.0 -- --req-file /root/FIPS/HMAC/req --rsp-file /root/FIPS/HMAC/resp --path-is-folder --cryptodev-id 0 --self-test
+  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 -a 0000:1a:01.0 -- --req-file /root/FIPS/HMAC/req --rsp-file /root/FIPS/HMAC/resp --path-is-folder --cryptodev-id 0 --self-test
 
 
 Test Case 10: fips_qat_ccm_test
@@ -189,7 +189,7 @@ Test Case 10: fips_qat_ccm_test
 
 Test Command::
 
-  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 -w 0000:1a:01.0 -- --req-file /root/FIPS/CCM/req --rsp-file /root/FIPS/CCM/resp --path-is-folder --cryptodev-id 0 --self-test
+  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 -a 0000:1a:01.0 -- --req-file /root/FIPS/CCM/req --rsp-file /root/FIPS/CCM/resp --path-is-folder --cryptodev-id 0 --self-test
 
 
 Test Case 11: fips_qat_cmac_test
@@ -197,7 +197,7 @@ Test Case 11: fips_qat_cmac_test
 
 Test Command::
 
-  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 -w 0000:1a:01.0 -- --req-file /root/FIPS/CMAC/req --rsp-file /root/FIPS/CMAC/resp --path-is-folder --cryptodev-id 0 --self-test
+  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 -a 0000:1a:01.0 -- --req-file /root/FIPS/CMAC/req --rsp-file /root/FIPS/CMAC/resp --path-is-folder --cryptodev-id 0 --self-test
 
 
 Test Case 12: fips_openssl_gcm_test
@@ -253,7 +253,7 @@ Test Case 18: fips_self-test
 
 Test Command::
 
-  ./fips_validation -w 0000:1a:01.0 --socket-mem 2048,0 --vdev crypto_aesni_mb_pmd_1 -- --req-file /root/FIPS/AES/req --rsp-file ./root/FIPS/AES/resp --cryptodev crypto_aesni_mb_pmd_1 --path-is-folder --self-test
+  ./fips_validation -a 0000:1a:01.0 --socket-mem 2048,0 --vdev crypto_aesni_mb_pmd_1 -- --req-file /root/FIPS/AES/req --rsp-file ./root/FIPS/AES/resp --cryptodev crypto_aesni_mb_pmd_1 --path-is-folder --self-test
 
 
 Test Case 19: fips_broken-test
@@ -261,5 +261,5 @@ Test Case 19: fips_broken-test
 
 Test Command::
 
-  ./fips_validation -w 0000:1a:01.0--socket-mem 2048,0 --vdev crypto_aesni_mb_pmd_1 -- --req-file /root/FIPS/AES/req --rsp-file ./root/FIPS/AES/resp --cryptodev crypto_aesni_mb_pmd_1 --path-is-folder --self-test --broken-test-id 15 --broken-test-dir dec
+  ./fips_validation -a 0000:1a:01.0--socket-mem 2048,0 --vdev crypto_aesni_mb_pmd_1 -- --req-file /root/FIPS/AES/req --rsp-file ./root/FIPS/AES/resp --cryptodev crypto_aesni_mb_pmd_1 --path-is-folder --self-test --broken-test-id 15 --broken-test-dir dec
 
diff --git a/test_plans/ipsec_gw_cryptodev_func_test_plan.rst b/test_plans/ipsec_gw_cryptodev_func_test_plan.rst
index a103faca..19a98365 100644
--- a/test_plans/ipsec_gw_cryptodev_func_test_plan.rst
+++ b/test_plans/ipsec_gw_cryptodev_func_test_plan.rst
@@ -131,7 +131,7 @@ The test commands of ipsec-secgw is below::
 
     ./build/ipsec-secgw [EAL options] --
         -p PORTMASK -P -u PORTMASK -j FRAMESIZE
-        -l -w REPLAY_WINOW_SIZE -e -a
+        -l -a REPLAY_WINOW_SIZE -e -a
         --config (port,queue,lcore)[,(port,queue,lcore]
         --single-sa SAIDX
         --rxoffload MASK
@@ -200,7 +200,7 @@ Cryptodev AES-NI algorithm validation matrix is showed in table below.
 
 example::
 
-    ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 2048,0 --legacy-mem -w 0000:60:00.0 -w 0000:60:00.2
+    ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 2048,0 --legacy-mem -a 0000:60:00.0 -a 0000:60:00.2
     --vdev crypto_aesni_mb_pmd_1 --vdev=crypto_aesni_mb_pmd_2 -l 9,10,11 -n 6  -- -P  --config "(0,0,10),(1,0,11)"
     -u 0x1 -p 0x3 -f /root/dts/local_conf/ipsec_test.cfg
 
@@ -231,8 +231,8 @@ Cryptodev QAT algorithm validation matrix is showed in table below.
 
 example::
 
-    ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 2048,0 --legacy-mem -w 0000:60:00.0 -w 0000:60:00.2
-    -w 0000:1a:01.0 -l 9,10,11 -n 6  -- -P  --config "(0,0,10),(1,0,11)" -u 0x1 -p 0x3
+    ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 2048,0 --legacy-mem -a 0000:60:00.0 -a 0000:60:00.2
+    -a 0000:1a:01.0 -l 9,10,11 -n 6  -- -P  --config "(0,0,10),(1,0,11)" -u 0x1 -p 0x3
     -f /root/dts/local_conf/ipsec_test.cfg
 
 Sub-case: AES-GCM test case
@@ -248,7 +248,7 @@ Cryptodev AES-GCM algorithm validation matrix is showed in table below.
 
 example::
 
-    ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 2048,0 --legacy-mem -w 0000:60:00.0 -w 0000:60:00.2
+    ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 2048,0 --legacy-mem -a 0000:60:00.0 -a 0000:60:00.2
     --vdev crypto_aesni_gcm_pmd_1 --vdev=crypto_aesni_gcm_pmd_2 -l 9,10,11 -n 6  -- -P  --config "(0,0,10),(1,0,11)"
     -u 0x1 -p 0x3 -f /root/dts/local_conf/ipsec_test.cfg
 
@@ -265,6 +265,6 @@ Cryptodev NULL algorithm validation matrix is showed in table below.
 
 example::
 
-    ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 2048,0 --legacy-mem -w 0000:60:00.0 -w 0000:60:00.2
+    ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 2048,0 --legacy-mem -a 0000:60:00.0 -a 0000:60:00.2
     --vdev crypto_null_pmd_1 --vdev=crypto_null_pmd_2 -l 9,10,11 -n 6  -- -P  --config "(0,0,10),(1,0,11)"
     -u 0x1 -p 0x3 -f /root/dts/local_conf/ipsec_test.cfg
diff --git a/test_plans/virtio_ipsec_cryptodev_func_test_plan.rst b/test_plans/virtio_ipsec_cryptodev_func_test_plan.rst
index 35b2a144..58267ba9 100644
--- a/test_plans/virtio_ipsec_cryptodev_func_test_plan.rst
+++ b/test_plans/virtio_ipsec_cryptodev_func_test_plan.rst
@@ -90,7 +90,7 @@ The options of ipsec-secgw is below::
 
     ./build/ipsec-secgw [EAL options] --
                         -p PORTMASK -P -u PORTMASK -j FRAMESIZE
-                        -l -w REPLAY_WINOW_SIZE -e -a
+                        -l -a REPLAY_WINOW_SIZE -e -a
                         --config (port,queue,lcore)[,(port,queue,lcore]
                         --single-sa SAIDX
                         --rxoffload MASK
@@ -125,7 +125,7 @@ In Host:
 
     ./examples/vhost_crypto/build/vhost-crypto \
     --socket-mem 2048,0 --legacy-mem \
-    -w 1a:01.0 -w 1c:01.0 -w 1e:01.0 \
+    -a 1a:01.0 -a 1c:01.0 -a 1e:01.0 \
     --vdev crypto_scheduler_pmd_1,slave=0000:1a:01.0_qat_sym,slave=0000:1c:01.0_qat_sym,slave=0000:1e:01.0_qat_sym,mode=round-robin,ordering=enable \
     -l 8,9,10,11,12 -n 6 \
     -- --config "(9,0,0),(10,0,0),(11,0,0),(12,0,0)" \
@@ -186,11 +186,11 @@ Test Case: Cryptodev AESNI_MB test
 
 In vm0::
 
-    ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 1024,0  -w 0000:00:06.0 -w 0000:00:07.0 --vdev crypto_aesni_mb_pmd_1 --vdev crypto_aesni_mb_pmd_2 -l 1,2,3 -n 4  -- -P  --config "(0,0,2),(1,0,3)" -u 0x1 -p 0x3 -f /root/ipsec_test0.cfg
+    ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 1024,0  -a 0000:00:06.0 -a 0000:00:07.0 --vdev crypto_aesni_mb_pmd_1 --vdev crypto_aesni_mb_pmd_2 -l 1,2,3 -n 4  -- -P  --config "(0,0,2),(1,0,3)" -u 0x1 -p 0x3 -f /root/ipsec_test0.cfg
 
 In vm1::
 
-    ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 1024,0  -w 0000:00:06.0 -w 0000:00:07.0 --vdev crypto_aesni_mb_pmd_1 --vdev crypto_aesni_mb_pmd_2 -l 1,2,3 -n 4  -- -P  --config "(0,0,2),(1,0,3)" -u 0x1 -p 0x3 -f /root/ipsec_test1.cfg
+    ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 1024,0  -a 0000:00:06.0 -a 0000:00:07.0 --vdev crypto_aesni_mb_pmd_1 --vdev crypto_aesni_mb_pmd_2 -l 1,2,3 -n 4  -- -P  --config "(0,0,2),(1,0,3)" -u 0x1 -p 0x3 -f /root/ipsec_test1.cfg
 
 send packets and verify
 
@@ -199,10 +199,10 @@ Test Case: Cryptodev VIRTIO test
 
 In vm0::
 
-    ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 1024,0  -w 0000:00:06.0 -w 0000:00:07.0 -w 00:04.0 -w 00:05.0 -l 1,2,3 -n 4  -- -P  --config "(0,0,2),(1,0,3)" -u 0x1 -p 0x3 -f /root/ipsec_test0.cfg
+    ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 1024,0  -a 0000:00:06.0 -a 0000:00:07.0 -a 00:04.0 -a 00:05.0 -l 1,2,3 -n 4  -- -P  --config "(0,0,2),(1,0,3)" -u 0x1 -p 0x3 -f /root/ipsec_test0.cfg
 
 In vm1::
 
-    ./examples/ipsec-secgw/ibuild/ipsec-secgw --socket-mem 1024,0  -w 0000:00:06.0 -w 0000:00:07.0 -w 00:04.0 -w 00:05.0 -l 1,2,3 -n 4  -- -P  --config "(0,0,2),(1,0,3)" -u 0x1 -p 0x3 -f /root/ipsec_test1.cfg
+    ./examples/ipsec-secgw/ibuild/ipsec-secgw --socket-mem 1024,0  -a 0000:00:06.0 -a 0000:00:07.0 -a 00:04.0 -a 00:05.0 -l 1,2,3 -n 4  -- -P  --config "(0,0,2),(1,0,3)" -u 0x1 -p 0x3 -f /root/ipsec_test1.cfg
 
 send packets and verify
diff --git a/test_plans/virtio_perf_cryptodev_func_test_plan.rst b/test_plans/virtio_perf_cryptodev_func_test_plan.rst
index 3f58135c..816425b0 100644
--- a/test_plans/virtio_perf_cryptodev_func_test_plan.rst
+++ b/test_plans/virtio_perf_cryptodev_func_test_plan.rst
@@ -162,7 +162,7 @@ Test Case: Cryptodev VIRTIO test
 
 command::
 
-      ./build/app/dpdk-test-crypto-perf -c 0xf  -w 00:05.0 -- --ptest throughput \
+      ./build/app/dpdk-test-crypto-perf -c 0xf  -a 00:05.0 -- --ptest throughput \
       --devtype crypto_virtio --optype cipher-then-auth  --cipher-algo aes-cbc --cipher-op encrypt \
       --cipher-key-sz 16 --cipher-iv-sz 16 --auth-algo sha1-hmac --auth-op generate --auth-key-sz 64 \
       --auth-aad-sz 0 --auth-digest-sz 20 --total-ops 10000000 --burst-sz 32 --buffer-sz 1024
diff --git a/tests/TestSuite_compressdev_isal_pmd.py b/tests/TestSuite_compressdev_isal_pmd.py
index 070eedbb..1c2b7775 100644
--- a/tests/TestSuite_compressdev_isal_pmd.py
+++ b/tests/TestSuite_compressdev_isal_pmd.py
@@ -40,7 +40,7 @@ class TestCompressdevIsalPmd(TestCase):
 
     def set_up_all(self):
         self.prepare_dpdk()
-        cc.default_eals.update({'w': "0000:00:00.0", "vdev": "compress_isal"})
+        cc.default_eals.update({'a': "0000:00:00.0", "vdev": "compress_isal"})
         cc.default_opts.update({"driver-name": "compress_isal"})
         self._perf_result = dict()
         self.eals = copy.deepcopy(cc.default_eals)
@@ -94,5 +94,5 @@ class TestCompressdevIsalPmd(TestCase):
 
         if not self._perf_result:
             return
-        with open(self.logger.log_path + "/" + self.suite_name + ".json", "w") as f:
+        with open(self.logger.log_path + "/" + self.suite_name + ".json", "a") as f:
             json.dump(self._perf_result, f, indent=4)
diff --git a/tests/TestSuite_compressdev_qat_pmd.py b/tests/TestSuite_compressdev_qat_pmd.py
index 0451cf0a..4ac45938 100644
--- a/tests/TestSuite_compressdev_qat_pmd.py
+++ b/tests/TestSuite_compressdev_qat_pmd.py
@@ -72,76 +72,76 @@ class TestCompressdevQatPmd(TestCase):
         return perf_device_list
 
     def test_qat_pmd_unit_test(self):
-        cc.default_eals['w'] = self.device_list[0]
+        cc.default_eals['a'] = self.device_list[0]
         cc.run_unit(self)
 
     def test_qat_pmd_fixed_func(self):
-        cc.default_eals['w'] = ' -w '.join(self.get_perf_default_device())
+        cc.default_eals['a'] = ' -a '.join(self.get_perf_default_device())
         cc.default_opts.update({"huffman-enc": "fixed"})
         result = cc.run_compress_func(self)
 
     def test_qat_pmd_dynamic_func(self):
-        cc.default_eals['w'] = ' -w '.join(self.get_perf_default_device())
+        cc.default_eals['a'] = ' -a '.join(self.get_perf_default_device())
         cc.default_opts.update({"huffman-enc": "dynamic"})
         result = cc.run_compress_func(self)
 
     def test_qat_pmd_big_sgl_fixed_func(self):
-        cc.default_eals['w'] = ' -w '.join(self.get_perf_default_device())
+        cc.default_eals['a'] = ' -a '.join(self.get_perf_default_device())
         cc.default_opts.update({"huffman-enc": "fixed", "seg-sz": 1024,
             "extended-input-sz": 1048576, "max-num-sgl-segs": 1003})
         result = cc.run_compress_func(self)
 
     def test_qat_pmd_big_sgl_dynamic_func(self):
-        cc.default_eals['w'] = ' -w '.join(self.get_perf_default_device())
+        cc.default_eals['a'] = ' -a '.join(self.get_perf_default_device())
         cc.default_opts.update({"huffman-enc": "dynamic", "seg-sz": 1024,
             "extended-input-sz": 1048576, "max-num-sgl-segs": 1003})
         result = cc.run_compress_func(self)
 
     def test_qat_pmd_big_seg_fixed_func(self):
-        cc.default_eals['w'] = ' -w '.join(self.get_perf_default_device())
+        cc.default_eals['a'] = ' -a '.join(self.get_perf_default_device())
         cc.default_opts.update({"huffman-enc": "fixed", "seg-sz": 59460,
             "extended-input-sz": 1048576, "max-num-sgl-segs": 18})
         result = cc.run_compress_func(self)
 
     def test_qat_pmd_big_seg_dynamic_func(self):
-        cc.default_eals['w'] = ' -w '.join(self.get_perf_default_device())
+        cc.default_eals['a'] = ' -a '.join(self.get_perf_default_device())
         cc.default_opts.update({"huffman-enc": "dynamic", "seg-sz": 59460,
             "extended-input-sz": 1048576, "max-num-sgl-segs": 18})
         result = cc.run_compress_func(self)
 
     def test_qat_pmd_external_mbufs_fixed_func(self):
-        cc.default_eals['w'] = ' -w '.join(self.get_perf_default_device())
+        cc.default_eals['a'] = ' -a '.join(self.get_perf_default_device())
         cc.default_opts.update({"huffman-enc": "fixed", "max-num-sgl-segs": 16,
             "seg-sz": 2048, "external-mbufs": '', "extended-input-sz": 300000})
         result = cc.run_compress_func(self)
 
     def test_qat_pmd_external_mbufs_dynamic_func(self):
-        cc.default_eals['w'] = ' -w '.join(self.get_perf_default_device())
+        cc.default_eals['a'] = ' -a '.join(self.get_perf_default_device())
         cc.default_opts.update({"huffman-enc": "dynamic", "max-num-sgl-segs": 16,
             "seg-sz": 2048, "external-mbufs": '', "extended-input-sz": 300000})
         result = cc.run_compress_func(self)
 
     def test_qat_pmd_im_fixed_func(self):
-        cc.default_eals['w'] = ' -w '.join(self.get_perf_default_device())
+        cc.default_eals['a'] = ' -a '.join(self.get_perf_default_device())
         cc.default_opts.update({"huffman-enc": "fixed", "seg-sz": 59460,
             "max-num-sgl-segs": 54, "extended-input-sz": 3251493})
         result = cc.run_compress_func(self)
 
     def test_qat_pmd_im_dynamic_func(self):
-        cc.default_eals['w'] = ' -w '.join(self.get_perf_default_device())
+        cc.default_eals['a'] = ' -a '.join(self.get_perf_default_device())
         cc.default_opts.update({"huffman-enc": "dynamic", "seg-sz": 59460,
             "max-num-sgl-segs": 54, "extended-input-sz": 3251493})
         result = cc.run_compress_func(self)
 
     def test_qat_pmd_fixed_perf(self):
-        cc.default_eals['w'] = ' -w '.join(self.get_perf_default_device())
+        cc.default_eals['a'] = ' -a '.join(self.get_perf_default_device())
         cc.default_opts.update({"huffman-enc": "fixed", "extended-input-sz": 3244032,
             "max-num-sgl-segs": 1})
         result = cc.run_compress_perf(self)
         self._perf_result.update(result)
 
     def test_qat_pmd_dynamic_perf(self):
-        cc.default_eals['w'] = ' -w '.join(self.get_perf_default_device())
+        cc.default_eals['a'] = ' -a '.join(self.get_perf_default_device())
         cc.default_opts.update({"huffman-enc": "dynamic", "extended-input-sz": 3244032,
             "max-num-sgl-segs": 1})
         result = cc.run_compress_perf(self)
@@ -161,5 +161,5 @@ class TestCompressdevQatPmd(TestCase):
 
         if not self._perf_result:
             return
-        with open(self.logger.log_path + "/" + self.suite_name + ".json", "w") as fv:
+        with open(self.logger.log_path + "/" + self.suite_name + ".json", "a") as fv:
             json.dump(self._perf_result, fv, indent=4)
diff --git a/tests/TestSuite_compressdev_zlib_pmd.py b/tests/TestSuite_compressdev_zlib_pmd.py
index ea935c26..35a7502b 100644
--- a/tests/TestSuite_compressdev_zlib_pmd.py
+++ b/tests/TestSuite_compressdev_zlib_pmd.py
@@ -40,7 +40,7 @@ class TestCompressdevZlibPmd(TestCase):
 
     def set_up_all(self):
         self.prepare_dpdk()
-        cc.default_eals.update({"w":"0000:00:00.0", "vdev": "compress_zlib"})
+        cc.default_eals.update({"a":"0000:00:00.0", "vdev": "compress_zlib"})
         cc.default_opts.update({"driver-name": "compress_zlib"})
         self._perf_result = dict()
 
@@ -95,5 +95,5 @@ class TestCompressdevZlibPmd(TestCase):
 
         if not self._perf_result:
             return
-        with open(self.logger.log_path + "/" + self.suite_name + ".json", "w") as fv:
+        with open(self.logger.log_path + "/" + self.suite_name + ".json", "a") as fv:
             json.dump(self._perf_result, fv, indent=4)
diff --git a/tests/TestSuite_crypto_perf_cryptodev_perf.py b/tests/TestSuite_crypto_perf_cryptodev_perf.py
index 6a71f055..d1f104e2 100644
--- a/tests/TestSuite_crypto_perf_cryptodev_perf.py
+++ b/tests/TestSuite_crypto_perf_cryptodev_perf.py
@@ -90,7 +90,7 @@ class PerfTestsCryptodev(TestCase):
         if not self._perf_result:
             return
 
-        with open(self.logger.log_path + "/" + "perf_cryptodev_result.json", "w") as fv:
+        with open(self.logger.log_path + "/" + "perf_cryptodev_result.json", "a") as fv:
             json.dump(self._perf_result, fv, indent=4)
 
     def set_up(self):
@@ -352,7 +352,7 @@ class PerfTestsCryptodev(TestCase):
             dev = "crypto_aesni_mb"
         elif self.get_case_cfg()["devtype"] == "crypto_qat":
             w = cc.get_qat_devices(self, cpm_num=1, num=num)
-            device["w"] = ' -w '.join(w)
+            device["a"] = ' -a '.join(w)
             device["vdev"] = None
         elif self.get_case_cfg()["devtype"] == "crypto_openssl":
             dev = "crypto_openssl"
@@ -374,7 +374,7 @@ class PerfTestsCryptodev(TestCase):
                 vdev = "{}{},worker={}_qat_sym,worker={}_qat_sym,worker={}_qat_sym,mode=round-robin".format(dev,
                         i, w[i*3], w[i*3 + 1], w[i*3 + 2])
                 vdev_list.append(vdev)
-            device["w"] = ' -w '.join(w)
+            device["a"] = ' -a '.join(w)
             device["vdev"] = ' --vdev '.join(vdev_list)
         else:
             return {}
@@ -384,7 +384,7 @@ class PerfTestsCryptodev(TestCase):
             for i in range(num):
                 vdev = "{}{}".format(dev, i)
                 vdev_list.append(vdev)
-            device["w"] = "0000:00:00.0"
+            device["a"] = "0000:00:00.0"
             device["vdev"] = ' --vdev '.join(vdev_list)
 
         return device
diff --git a/tests/TestSuite_ipsec_gw_cryptodev_func.py b/tests/TestSuite_ipsec_gw_cryptodev_func.py
index 472b65c5..33b67d45 100644
--- a/tests/TestSuite_ipsec_gw_cryptodev_func.py
+++ b/tests/TestSuite_ipsec_gw_cryptodev_func.py
@@ -248,7 +248,7 @@ class TestIPsecGW(TestCase):
             dev = "crypto_aesni_mb"
         elif self.get_case_cfg()["devtype"] == "crypto_qat":
             w = cc.get_qat_devices(self, cpm_num=1, num=num)
-            device["w"] = ' -w '.join(w)
+            device["a"] = ' -a '.join(w)
             device["vdev"] = None
         elif self.get_case_cfg()["devtype"] == "crypto_openssl":
             dev = "crypto_openssl"
@@ -270,7 +270,7 @@ class TestIPsecGW(TestCase):
             for i in range(num):
                 vdev = "{}{}".format(dev, i)
                 vdev_list.append(vdev)
-            device["w"] = "0000:00:00.0"
+            device["a"] = "0000:00:00.0"
             device["vdev"] = ' --vdev '.join(vdev_list)
 
         return device
diff --git a/tests/TestSuite_l2fwd_cryptodev_func.py b/tests/TestSuite_l2fwd_cryptodev_func.py
index 8bafb65a..de0c0447 100644
--- a/tests/TestSuite_l2fwd_cryptodev_func.py
+++ b/tests/TestSuite_l2fwd_cryptodev_func.py
@@ -207,7 +207,7 @@ class TestL2fwdCrypto(TestCase):
         self.__execute_l2fwd_crypto_test(test_vectors, "openssl_DES_CBC_00")
 
     def test_scheduler_rr_AES_CBC_auto(self):
-        vdev = '-w ' + ' -w '.join(cc.get_qat_devices(self, num=3))
+        vdev = '-a ' + ' -a '.join(cc.get_qat_devices(self, num=3))
         vdev += " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=%s_qat_sym,slave=%s_qat_sym,\
                 mode=round-robin" % tuple(cc.get_qat_devices(self, num=3))
         test_vectors["scheduler_AES_CBC_00"]['vdev'] = vdev
@@ -215,7 +215,7 @@ class TestL2fwdCrypto(TestCase):
         self.__execute_l2fwd_crypto_test(test_vectors, "scheduler_AES_CBC_00")
 
     def test_scheduler_rr_AES_GCM_auto(self):
-        vdev = "-w 0000:00:00.0 --vdev crypto_aesni_mb1,name=aesni_mb_1"
+        vdev = "-a 0000:00:00.0 --vdev crypto_aesni_mb1,name=aesni_mb_1"
         vdev += " --vdev crypto_aesni_mb2,name=aesni_mb_2"
         vdev += " --vdev crypto_aesni_mb3,name=aesni_mb_3"
         vdev += " --vdev crypto_scheduler0,slave=aesni_mb_1,slave=aesni_mb_2,slave=aesni_mb_3,mode=round-robin"
@@ -224,7 +224,7 @@ class TestL2fwdCrypto(TestCase):
         self.__execute_l2fwd_crypto_test(test_vectors, "scheduler_AES_GCM_00")
 
     def test_scheduler_psb_AES_CBC_auto(self):
-        vdev = '-w ' + ' -w '.join(cc.get_qat_devices(self, num=2))
+        vdev = '-a ' + ' -a '.join(cc.get_qat_devices(self, num=2))
         vdev += " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=%s_qat_sym,\
                 mode=packet-size-distr" % tuple(cc.get_qat_devices(self, num=2))
         test_vectors["scheduler_AES_CBC_00"]['vdev'] = vdev
@@ -232,7 +232,7 @@ class TestL2fwdCrypto(TestCase):
         self.__execute_l2fwd_crypto_test(test_vectors, "scheduler_AES_CBC_00")
 
     def test_scheduler_psb_AES_GCM_auto(self):
-        vdev = '-w ' + ' -w '.join(cc.get_qat_devices(self, num=1))
+        vdev = '-a ' + ' -a '.join(cc.get_qat_devices(self, num=1))
         vdev += " --vdev crypto_aesni_mb1,name=aesni_mb_1"
         vdev += " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=aesni_mb_1,\
                 mode=packet-size-distr"% tuple(cc.get_qat_devices(self, num=1))
@@ -241,7 +241,7 @@ class TestL2fwdCrypto(TestCase):
         self.__execute_l2fwd_crypto_test(test_vectors, "scheduler_AES_GCM_00")
 
     def test_scheduler_fo_AES_CBC_auto(self):
-        vdev = '-w ' + ' -w '.join(cc.get_qat_devices(self, num=2))
+        vdev = '-a ' + ' -a '.join(cc.get_qat_devices(self, num=2))
         vdev += " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=%s_qat_sym,\
                 mode=fail-over" % tuple(cc.get_qat_devices(self, num=2))
         test_vectors["scheduler_AES_CBC_00"]['vdev'] = vdev
@@ -249,7 +249,7 @@ class TestL2fwdCrypto(TestCase):
         self.__execute_l2fwd_crypto_test(test_vectors, "scheduler_AES_CBC_00")
 
     def test_scheduler_fo_AES_GCM_auto(self):
-        vdev = '-w ' + ' -w '.join(cc.get_qat_devices(self, num=1))
+        vdev = '-a ' + ' -a '.join(cc.get_qat_devices(self, num=1))
         vdev += " --vdev crypto_aesni_mb1,name=aesni_mb_1"
         vdev += " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=aesni_mb_1,\
                 mode=fail-over"% tuple(cc.get_qat_devices(self, num=1))
@@ -258,7 +258,7 @@ class TestL2fwdCrypto(TestCase):
         self.__execute_l2fwd_crypto_test(test_vectors, "scheduler_AES_GCM_00")
 
     def test_scheduler_mm_AES_CBC_auto(self):
-        vdev = '-w ' + ' -w '.join(cc.get_qat_devices(self, num=2))
+        vdev = '-a ' + ' -a '.join(cc.get_qat_devices(self, num=2))
         vdev += " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=%s_qat_sym\
                 mode=multi-core" % tuple(cc.get_qat_devices(self, num=2))
         test_vectors["scheduler_AES_CBC_00"]['vdev'] = vdev
@@ -266,7 +266,7 @@ class TestL2fwdCrypto(TestCase):
         self.__execute_l2fwd_crypto_test(test_vectors, "scheduler_AES_CBC_00")
 
     def test_scheduler_mm_AES_GCM_auto(self):
-        vdev = '-w ' + ' -w '.join(cc.get_qat_devices(self, num=1))
+        vdev = '-a ' + ' -a '.join(cc.get_qat_devices(self, num=1))
         vdev += " --vdev crypto_aesni_mb1,name=aesni_mb_1"
         vdev += " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=aesni_mb_1,\
                 mode=multi-core"% tuple(cc.get_qat_devices(self, num=1))
@@ -455,10 +455,10 @@ class TestL2fwdCrypto(TestCase):
         elif self.__check_field_in_vector(test_vector, "vdev"):
             vdev = "--vdev " + test_vector["vdev"] + "1" +\
                     " --vdev " + test_vector["vdev"] + "2" +\
-                    " -w 0000:00:00.0"
+                    " -a 0000:00:00.0"
             self.vector.append(test_vector["vdev"].upper())
         else:
-            vdev = '-w ' + ' -w '.join(cc.get_qat_devices(self, num=2))
+            vdev = '-a ' + ' -a '.join(cc.get_qat_devices(self, num=2))
             self.vector.append("QAT")
 
         chain = ""
diff --git a/tests/TestSuite_unit_tests_cryptodev_func.py b/tests/TestSuite_unit_tests_cryptodev_func.py
index fdc1398a..98425d47 100644
--- a/tests/TestSuite_unit_tests_cryptodev_func.py
+++ b/tests/TestSuite_unit_tests_cryptodev_func.py
@@ -110,7 +110,7 @@ class UnitTestsCryptodev(TestCase):
 
         self.logger.info("STEP_TEST: " + testsuite)
         self.dut.send_expect("dmesg -C", "# ", 30)
-        cmd_str = cc.get_dpdk_app_cmd_str(self._app_path, eal_opt_str + " --log-level=6 -w %s" % w[0])
+        cmd_str = cc.get_dpdk_app_cmd_str(self._app_path, eal_opt_str + " --log-level=6 -a %s" % w[0])
         self.dut.send_expect(cmd_str, "RTE>>", 30)
 
         out = ""
diff --git a/tests/TestSuite_virtio_ipsec_cryptodev_func.py b/tests/TestSuite_virtio_ipsec_cryptodev_func.py
index d30e0d7c..71557d42 100644
--- a/tests/TestSuite_virtio_ipsec_cryptodev_func.py
+++ b/tests/TestSuite_virtio_ipsec_cryptodev_func.py
@@ -106,7 +106,7 @@ class VirtioCryptodevIpsecTest(TestCase):
         default_eal_opts = {
             "c": None,
             "l": ','.join(self.cores),
-            "w": None,
+            "a": None,
             "vdev": None,
             "config": None,
             "socket-mem": "2048,0",
@@ -163,7 +163,7 @@ class VirtioCryptodevIpsecTest(TestCase):
         self.set_cfg(dut, 'ep1.cfg', ep1)
 
     def set_cfg(self, dut, filename, cfg):
-        with open(filename, 'w') as f:
+        with open(filename, 'a') as f:
             f.write(cfg)
 
         dut.session.copy_file_to(filename, dut.base_dir)
@@ -286,7 +286,7 @@ class VirtioCryptodevIpsecTest(TestCase):
 
         eal_opt_str_0 = cc.get_eal_opt_str(self, {"l": ','.join(self.vm0.cores[-3:]),
                                                 "socket-mem":"512,0",
-                                                "w": " -w ".join(self.vm0.ports),
+                                                "a": " -a ".join(self.vm0.ports),
                                                 "vdev":"crypto_aesni_mb_pmd_1 --vdev crypto_aesni_mb_pmd_2"})
 
         crypto_ipsec_opt_str0 = cc.get_opt_str(self, self._default_ipsec_gw_opts, override_opts={'f': "/root/dpdk/ep0.cfg", "config": '"(0,0,%s),(1,0,%s)"' % tuple(self.vm0.cores[-2:])})
@@ -296,7 +296,7 @@ class VirtioCryptodevIpsecTest(TestCase):
 
         eal_opt_str_1 = cc.get_eal_opt_str(self, {"l": ','.join(self.vm1.cores[-3:]),
                                                 "socket-mem":"512,0",
-                                                "w": " -w ".join(self.vm1.ports),
+                                                "a": " -a ".join(self.vm1.ports),
                                                 "vdev": "crypto_aesni_mb_pmd_1 --vdev crypto_aesni_mb_pmd_2"})
 
         crypto_ipsec_opt_str1 = cc.get_opt_str(self, self._default_ipsec_gw_opts, override_opts={'f': "/root/dpdk/ep1.cfg", "config": '"(0,0,%s),(1,0,%s)"' % tuple(self.vm1.cores[-2:])})
@@ -312,7 +312,7 @@ class VirtioCryptodevIpsecTest(TestCase):
 
         eal_opt_str_0 = cc.get_eal_opt_str(self, {"l": ','.join(self.vm0.cores[-3:]),
                                                 "socket-mem":"512,0",
-                                                "w": " -w ".join(self.vm0.ports + self.vm0.virtio_list),
+                                                "a": " -a ".join(self.vm0.ports + self.vm0.virtio_list),
                                                 "vdev":None})
 
         crypto_ipsec_opt_str0 = cc.get_opt_str(self, self._default_ipsec_gw_opts, override_opts={'f': "/root/dpdk/ep0.cfg", "config": '"(0,0,%s),(1,0,%s)"' % tuple(self.vm0.cores[-2:])})
@@ -321,7 +321,7 @@ class VirtioCryptodevIpsecTest(TestCase):
 
         eal_opt_str_1 = cc.get_eal_opt_str(self, {"l": ','.join(self.vm1.cores[-3:]),
                                                 "socket-mem":"512,0",
-                                                "w": " -w ".join(self.vm1.ports + self.vm1.virtio_list),
+                                                "a": " -a ".join(self.vm1.ports + self.vm1.virtio_list),
                                                 "vdev": None})
 
         crypto_ipsec_opt_str1 = cc.get_opt_str(self, self._default_ipsec_gw_opts, override_opts={'f': "/root/dpdk/ep1.cfg", "config": '"(0,0,%s),(1,0,%s)"' % tuple(self.vm1.cores[-2:])})
diff --git a/tests/TestSuite_virtio_perf_cryptodev_func.py b/tests/TestSuite_virtio_perf_cryptodev_func.py
index fc319dd4..506dd5a7 100644
--- a/tests/TestSuite_virtio_perf_cryptodev_func.py
+++ b/tests/TestSuite_virtio_perf_cryptodev_func.py
@@ -126,7 +126,7 @@ class VirtioCryptodevPerfTest(TestCase):
         default_eal_opts = {
             "c": None,
             "l": ','.join(self.cores),
-            "w": None,
+            "a": None,
             "vdev": None,
             "socket-mem": "2048,0",
             "n": self.mem_channel
@@ -206,7 +206,7 @@ class VirtioCryptodevPerfTest(TestCase):
         if cc.is_test_skip(self):
             return
 
-        eal_opt_str = cc.get_eal_opt_str(self, {"w":None})
+        eal_opt_str = cc.get_eal_opt_str(self, {"a":None})
         crypto_perf_opt_str = cc.get_opt_str(self, self._default_crypto_perf_opts)
         out = self._run_crypto_perf(eal_opt_str, crypto_perf_opt_str)
         self.logger.info(out)
@@ -217,7 +217,7 @@ class VirtioCryptodevPerfTest(TestCase):
         if cc.is_test_skip(self):
             return
 
-        eal_opt_str = cc.get_eal_opt_str(self, {"w": self.vm0.virtio_list[0], "vdev":None})
+        eal_opt_str = cc.get_eal_opt_str(self, {"a": self.vm0.virtio_list[0], "vdev":None})
         crypto_perf_opt_str = cc.get_opt_str(self, self._default_crypto_perf_opts)
         out = self._run_crypto_perf(eal_opt_str, crypto_perf_opt_str)
         self.logger.info(out)
diff --git a/tests/TestSuite_virtio_unit_cryptodev_func.py b/tests/TestSuite_virtio_unit_cryptodev_func.py
index ee42b5d9..8d69d5b3 100644
--- a/tests/TestSuite_virtio_unit_cryptodev_func.py
+++ b/tests/TestSuite_virtio_unit_cryptodev_func.py
@@ -90,7 +90,7 @@ class VirtioCryptodevUnitTest(TestCase):
         default_eal_opts = {
             "c": None,
             "l": ','.join(self.cores),
-            "w": None,
+            "a": None,
             "vdev": None,
             "socket-mem": "2048,0",
             "n": self.mem_channel,
@@ -158,7 +158,7 @@ class VirtioCryptodevUnitTest(TestCase):
         return vm, vm_dut
 
     def test_cryptodev_virtio_autotest(self):
-        eal_opt_str = cc.get_eal_opt_str(self, {"w":None, "vdev":None})
+        eal_opt_str = cc.get_eal_opt_str(self, {"a":None, "vdev":None})
         self.__run_unit_test("cryptodev_virtio_autotest", eal_opt_str)
 
     def __run_unit_test(self, testsuite, eal_opt_str='', timeout=600):
diff --git a/tests/cryptodev_common.py b/tests/cryptodev_common.py
index fdae7a37..bb725897 100644
--- a/tests/cryptodev_common.py
+++ b/tests/cryptodev_common.py
@@ -190,7 +190,7 @@ def clear_dpdk_config(test_case):
 default_eal_opts = {
     "c": None,
     "l": None,
-    "w": None,
+    "a": None,
     "vdev": None,
     "socket-mem": "512,512",
     "n": "4"
@@ -222,10 +222,10 @@ def get_opt_str(test_case, default_opts, override_opts={}, add_port=False):
     opts.update(override_opts)
 
     pci_list = [port["pci"] for port in test_case.dut.ports_info]
-    if 'w' in list(opts.keys()) and opts['w']:
-        pci_list.append(opts['w'])
+    if 'a' in list(opts.keys()) and opts['a']:
+        pci_list.append(opts['a'])
     if add_port and pci_list:
-        opts['w'] = " -w ".join(pci_list)
+        opts['a'] = " -a ".join(pci_list)
 
     # Generate option string
     opt_str = ""
