diff --git a/test_plans/crypto_perf_cryptodev_perf_test_plan.rst b/test_plans/crypto_perf_cryptodev_perf_test_plan.rst
index 331720f..0762ee8 100644
--- a/test_plans/crypto_perf_cryptodev_perf_test_plan.rst
+++ b/test_plans/crypto_perf_cryptodev_perf_test_plan.rst
@@ -270,12 +270,10 @@ The table below contains ZUC algorithms which are supported in crypto perf.
 Prerequisites
 =============
 
-To test Cryptodev performance, an application
-test_crypto_perf is added into DPDK.
+To test Cryptodev performance, an application dpdk-test-crypto-perf is added into DPDK.
+The test commands of dpdk-test-crypto-perf is below::
 
-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) -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)
+    ./x86_64-native-linuxapp-gcc/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::
 
@@ -285,37 +283,61 @@ Common::
 
     --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.
 
-    --ptest (throughput/latency/verify) set test type. 
+    --ptest (throughput/latency/verify) set test type.
 
 Other parameters please reference above table's parameter.
 
+Software
+--------
+
+dpdk: http://dpdk.org/git/dpdk
+multi-buffer library: https://github.com/01org/intel-ipsec-mb
+Intel QuickAssist Technology Driver: https://01.org/packet-processing/intel%C2%AE-quickassist-technology-drivers-and-patches
+
+General set up
+--------------
+1, Compile DPDK::
+
+    CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=static x86_64-native-linuxapp-gcc
+    ninja -C x86_64-native-linuxapp-gcc -j 110
+
+2, Get the pci device id of QAT::
+
+   ./dpdk/usertools/dpdk-devbind.py --status-dev crypto
+
+3, Bind QAT VF port to dpdk::
+
+   ./dpdk/usertools/dpdk-devbind.py --force --bind=vfio-pci 0000:1a:01.0
+
+Test case
+=========
 
 Test Case 01: Cryptodev Thoughput Performance Test
 ==================================================
 
 QAT PMD command line::
 
-    ./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
+    ./x86_64-native-linuxapp-gcc/app/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::
 
-    ./build/app/test-crypto-perf/dpdk-test-crypto-perf -c 0xf --vdev crypto_aesni_mb_pmd  -- --ptest throughput --devtype crypto_aesni_mb --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
+    ./x86_64-native-linuxapp-gcc/app/dpdk-test-crypto-perf -c 0xf --vdev crypto_aesni_mb_pmd  -- --ptest throughput --devtype crypto_aesni_mb --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_GCM PMD command line::
 
-    ./build/app/test-crypto-perf/dpdk-test-crypto-perf -c 0xf --vdev crypto_aesni_gcm_pmd  -- --ptest throughput --devtype crypto_aesni_gcm  --optype aead  --cipher-algo aes-gcm --cipher-op encrypt --cipher-key-sz 16 --cipher-iv-sz 12 --auth-algo aes-gcm --auth-op generate --auth-key-sz 16 --auth-aad-sz 4 --auth-digest-sz 12 --total-ops 10000000 --burst-sz 32 --buffer-sz 1024
+    ./x86_64-native-linuxapp-gcc/app/dpdk-test-crypto-perf -c 0xf --vdev crypto_aesni_gcm_pmd  -- --ptest throughput --devtype crypto_aesni_gcm  --optype aead  --cipher-algo aes-gcm --cipher-op encrypt --cipher-key-sz 16 --cipher-iv-sz 12 --auth-algo aes-gcm --auth-op generate --auth-key-sz 16 --auth-aad-sz 4 --auth-digest-sz 12 --total-ops 10000000 --burst-sz 32 --buffer-sz 1024
 
 KASUMI PMD command line::
 
-    ./build/app/test-crypto-perf/dpdk-test-crypto-perf -c 0xf --vdev crypto_kasumi_pmd  -- --ptest throughput --devtype crypto_kasumi --optype cipher-then-auth  --cipher-algo kasumi-f8 --cipher-op encrypt --cipher-key-sz 16 --cipher-iv-sz 8 --auth-algo kasumi-f9 --auth-op generate --auth-key-sz 16 --auth-aad-sz 8 --auth-digest-sz 4 --total-ops 10000000 --burst-sz 32 --buffer-sz 1024
+    ./x86_64-native-linuxapp-gcc/app/dpdk-test-crypto-perf -c 0xf --vdev crypto_kasumi_pmd  -- --ptest throughput --devtype crypto_kasumi --optype cipher-then-auth  --cipher-algo kasumi-f8 --cipher-op encrypt --cipher-key-sz 16 --cipher-iv-sz 8 --auth-algo kasumi-f9 --auth-op generate --auth-key-sz 16 --auth-aad-sz 8 --auth-digest-sz 4 --total-ops 10000000 --burst-sz 32 --buffer-sz 1024
 
 SNOW3G PMD command line::
 
-    ./build/app/test-crypto-perf/dpdk-test-crypto-perf -c 0xf --vdev crypto_snow3g_pmd  -- --ptest throughput --devtype crypto_snow3g --optype cipher-then-auth  --cipher-algo snow3g-uea2 --cipher-op encrypt --cipher-key-sz 16 --cipher-iv-sz 16 --auth-algo snow3g-uia2 --auth-op generate --auth-key-sz 16 --auth-aad-sz 16 --auth-digest-sz 4 --total-ops 10000000 --burst-sz 32 --buffer-sz 1024
+    ./x86_64-native-linuxapp-gcc/app/dpdk-test-crypto-perf -c 0xf --vdev crypto_snow3g_pmd  -- --ptest throughput --devtype crypto_snow3g --optype cipher-then-auth  --cipher-algo snow3g-uea2 --cipher-op encrypt --cipher-key-sz 16 --cipher-iv-sz 16 --auth-algo snow3g-uia2 --auth-op generate --auth-key-sz 16 --auth-aad-sz 16 --auth-digest-sz 4 --total-ops 10000000 --burst-sz 32 --buffer-sz 1024
 
 ZUC PMD command line::
 
-    ./build/app/test-crypto-perf/dpdk-test-crypto-perf -c 0xf --vdev crypto_zuc_pmd  -- --ptest throughput --devtype crypto_zuc_mb --optype cipher-then-auth  --cipher-algo zuc-eea3 --cipher-op encrypt --cipher-key-sz 16 --cipher-iv-sz 16 --auth-algo zuc-eia3  --auth-op generate --auth-key-sz 16 --auth-aad-sz 16 --auth-digest-sz 4 --total-ops 10000000 --burst-sz 32 --buffer-sz 1024
+    ./x86_64-native-linuxapp-gcc/app/dpdk-test-crypto-perf -c 0xf --vdev crypto_zuc_pmd  -- --ptest throughput --devtype crypto_zuc_mb --optype cipher-then-auth  --cipher-algo zuc-eea3 --cipher-op encrypt --cipher-key-sz 16 --cipher-iv-sz 16 --auth-algo zuc-eia3  --auth-op generate --auth-key-sz 16 --auth-aad-sz 16 --auth-digest-sz 4 --total-ops 10000000 --burst-sz 32 --buffer-sz 1024
 
 
 Test Case 02: Cryptodev Latency Performance Test
@@ -323,23 +345,23 @@ 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 -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
+  ./x86_64-native-linuxapp-gcc/app/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 -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
+  ./x86_64-native-linuxapp-gcc/app/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::
 
-  ./build/app/test-crypto-perf/dpdk-test-crypto-perf -l 10,11 -n 4 --vdev crypto_aesni_gcm_pmd_1 -- --aead-key-sz 16 --buffer-sz 64 --optype aead --ptest latency --aead-aad-sz 16 --devtype crypto_aesni_gcm --aead-op encrypt --burst-sz 32 --total-ops 10000000 --silent  --digest-sz 16 --aead-algo aes-gcm --aead-iv-sz 12 
+  ./x86_64-native-linuxapp-gcc/app/dpdk-test-crypto-perf -l 10,11 -n 4 --vdev crypto_aesni_gcm_pmd_1 -- --aead-key-sz 16 --buffer-sz 64 --optype aead --ptest latency --aead-aad-sz 16 --devtype crypto_aesni_gcm --aead-op encrypt --burst-sz 32 --total-ops 10000000 --silent  --digest-sz 16 --aead-algo aes-gcm --aead-iv-sz 12
 
 
 QAT PMD command line::
 
-  ./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
+  ./x86_64-native-linuxapp-gcc/app/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  -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
+	./x86_64-native-linuxapp-gcc/app/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 -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
+	./x86_64-native-linuxapp-gcc/app/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
@@ -349,17 +371,17 @@ For verify operation, you need to specify a vector file by --test-file option. P
 
 AESNI_MB PMD command line::
 
-  ./build/app/test-crypto-perf/dpdk-test-crypto-perf --vdev crypto_aesni_mb_pmd_1 -l 9,10 -n 6  -- --buffer-sz 32 --optype cipher-then-auth --ptest verify --auth-key-sz 64 --cipher-key-sz 32 --devtype crypto_aesni_mb --cipher-iv-sz 16 --auth-op generate --burst-sz 32 --total-ops 10000000 --silent  --digest-sz 12 --auth-algo sha1-hmac --cipher-algo aes-cbc --cipher-op encrypt --test-name sha1_hmac_buff_32  --test-file test_aes_cbc.data
+  ./x86_64-native-linuxapp-gcc/app/dpdk-test-crypto-perf --vdev crypto_aesni_mb_pmd_1 -l 9,10 -n 6  -- --buffer-sz 32 --optype cipher-then-auth --ptest verify --auth-key-sz 64 --cipher-key-sz 32 --devtype crypto_aesni_mb --cipher-iv-sz 16 --auth-op generate --burst-sz 32 --total-ops 10000000 --silent  --digest-sz 12 --auth-algo sha1-hmac --cipher-algo aes-cbc --cipher-op encrypt --test-name sha1_hmac_buff_32  --test-file test_aes_cbc.data
 
 QAT PMD command line::
 
-	./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
+	./x86_64-native-linuxapp-gcc/app/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 -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
+  ./x86_64-native-linuxapp-gcc/app/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::
 
-  ./build/app/test-crypto-perf/dpdk-test-crypto-perf -l 9,10,11,12 -n 4 --vdev crypto_openssl -- --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
+  ./x86_64-native-linuxapp-gcc/app/dpdk-test-crypto-perf -l 9,10,11,12 -n 4 --vdev crypto_openssl -- --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
 
diff --git a/test_plans/fips_cryptodev_test_plan.rst b/test_plans/fips_cryptodev_test_plan.rst
index 754c05a..9958a73 100644
--- a/test_plans/fips_cryptodev_test_plan.rst
+++ b/test_plans/fips_cryptodev_test_plan.rst
@@ -67,7 +67,7 @@ Get/install FIPS Object Module::
 
   wget https://www.openssl.org/source/openssl-fips-2.0.16.tar.gz
 
-  cd openssl-fips-2.0.16
+  cd openssl-fips-2.0.16; ./config
 
   make
 
@@ -89,7 +89,8 @@ Get/install the OpenSSL library::
 
 Build FIPS validation application(in DPDK examples directory)::
 
-  make -C examples/fips_validation
+  meson configure -Dexamples=fips_validation x86_64-native-linuxapp-gcc
+  ninja -C x86_64-native-linuxapp-gcc
 
 
 Test Case Common Step
@@ -97,7 +98,7 @@ Test Case Common Step
 
 Launch fips validation application command::
 
-  ./fips_validation [EAL options]
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-fips_validation [EAL options]
    -- --req-file FILE_PATH/FOLDER_PATH
    --rsp-file FILE_PATH/FOLDER_PATH
    [--cryptodev DEVICE_NAME] [--cryptodev-id ID] [--path-is-folder]
@@ -117,7 +118,7 @@ Test Case 01: fips_aesni_mb_aes_test
 
 Test Command::
 
-  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --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 --cryptodev-id 0 --self-test
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --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 --cryptodev-id 0 --self-test
 
 
 Test Case 02: fips_aesni_mb_3des_test
@@ -125,7 +126,7 @@ Test Case 02: fips_aesni_mb_3des_test
 
 Test Command::
 
-  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_aesni_mb_pmd_1 -- --req-file /root/FIPS/TDES/req --rsp-file /root/FIPS/TDES/resp --cryptodev crypto_aesni_mb_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_aesni_mb_pmd_1 -- --req-file /root/FIPS/TDES/req --rsp-file /root/FIPS/TDES/resp --cryptodev crypto_aesni_mb_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
 
 
 Test Case 03: fips_aesni_mb_hmac_test
@@ -133,7 +134,7 @@ Test Case 03: fips_aesni_mb_hmac_test
 
 Test Command::
 
-  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_aesni_mb_pmd_1 -- --req-file /root/FIPS/HMAC/req --rsp-file /root/FIPS/HMAC/resp --cryptodev crypto_aesni_mb_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_aesni_mb_pmd_1 -- --req-file /root/FIPS/HMAC/req --rsp-file /root/FIPS/HMAC/resp --cryptodev crypto_aesni_mb_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
 
 
 Test Case 04: fips_aesni_mb_ccm_test
@@ -141,7 +142,7 @@ Test Case 04: fips_aesni_mb_ccm_test
 
 Test Command::
 
-  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_aesni_mb_pmd_1 -- --req-file /root/FIPS/CCM/req --rsp-file /root/FIPS/CCM/resp --cryptodev crypto_aesni_mb_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_aesni_mb_pmd_1 -- --req-file /root/FIPS/CCM/req --rsp-file /root/FIPS/CCM/resp --cryptodev crypto_aesni_mb_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
 
 
 Test Case 05: fips_aesni_mb_cmac_test
@@ -149,7 +150,7 @@ Test Case 05: fips_aesni_mb_cmac_test
 
 Test Command::
 
-  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_aesni_mb_pmd_1 -- --req-file /root/FIPS/CMAC/req --rsp-file /root/FIPS/CMAC/resp --cryptodev crypto_aesni_mb_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_aesni_mb_pmd_1 -- --req-file /root/FIPS/CMAC/req --rsp-file /root/FIPS/CMAC/resp --cryptodev crypto_aesni_mb_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
 
 
 Test Case 06: fips_qat_gcm_test
@@ -157,7 +158,7 @@ Test Case 06: fips_qat_gcm_test
 
 Test Command::
 
-  ./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
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-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 +166,7 @@ Test Case 07: fips_qat_aes_test
 
 Test Command::
 
-  ./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
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-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 +174,7 @@ Test Case 08: fips_qat_3des_test
 
 Test Command::
 
-  ./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
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-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 +182,7 @@ Test Case 09: fips_qat_hmac_test
 
 Test Command::
 
-  ./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
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-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 +190,7 @@ Test Case 10: fips_qat_ccm_test
 
 Test Command::
 
-  ./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
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-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 +198,7 @@ Test Case 11: fips_qat_cmac_test
 
 Test Command::
 
-  ./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
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-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
@@ -205,7 +206,7 @@ Test Case 12: fips_openssl_gcm_test
 
 Test Command::
 
-  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_openssl_pmd_1 -- --req-file /root/FIPS/GCM/req --rsp-file /root/FIPS/GCM/resp --cryptodev crypto_openssl_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_openssl_pmd_1 -- --req-file /root/FIPS/GCM/req --rsp-file /root/FIPS/GCM/resp --cryptodev crypto_openssl_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
 
 
 Test Case 13: fips_openssl_aes_test
@@ -213,7 +214,7 @@ Test Case 13: fips_openssl_aes_test
 
 Test Command::
 
-  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_openssl_pmd_1 -- --req-file /root/FIPS/AES/req --rsp-file /root/FIPS/AES/resp --cryptodev crypto_openssl_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_openssl_pmd_1 -- --req-file /root/FIPS/AES/req --rsp-file /root/FIPS/AES/resp --cryptodev crypto_openssl_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
 
 
 Test Case 14: fips_openssl_3des_test
@@ -221,7 +222,7 @@ Test Case 14: fips_openssl_3des_test
 
 Test Command::
 
-  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_openssl_pmd_1 -- --req-file /root/FIPS/TDES/req --rsp-file /root/FIPS/TDES/resp --cryptodev crypto_openssl_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_openssl_pmd_1 -- --req-file /root/FIPS/TDES/req --rsp-file /root/FIPS/TDES/resp --cryptodev crypto_openssl_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
 
 
 Test Case 15: fips_openssl_hmac_test
@@ -229,7 +230,7 @@ Test Case 15: fips_openssl_hmac_test
 
 Test Command::
 
-  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_openssl_pmd_1 -- --req-file /root/FIPS/HMAC/req --rsp-file /root/FIPS/HMAC/resp --cryptodev crypto_openssl_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_openssl_pmd_1 -- --req-file /root/FIPS/HMAC/req --rsp-file /root/FIPS/HMAC/resp --cryptodev crypto_openssl_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
 
 
 Test Case 16: fips_openssl_ccm_test
@@ -237,7 +238,7 @@ Test Case 16: fips_openssl_ccm_test
 
 Test Command::
 
-  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_openssl_pmd_1 -- --req-file /root/FIPS/CCM/req --rsp-file /root/FIPS/CCM/resp --cryptodev crypto_openssl_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_openssl_pmd_1 -- --req-file /root/FIPS/CCM/req --rsp-file /root/FIPS/CCM/resp --cryptodev crypto_openssl_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
 
 
 Test Case 17: fips_aesni_gcm_gcm_test
@@ -245,7 +246,7 @@ Test Case 17: fips_aesni_gcm_gcm_test
 
 Test Command::
 
-  ./fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_aesni_gcm_pmd_1 -- --req-file /root/FIPS/GCM/req --rsp-file /root/FIPS/GCM/resp --cryptodev crypto_aesni_gcm_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-fips_validation --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6 --vdev crypto_aesni_gcm_pmd_1 -- --req-file /root/FIPS/GCM/req --rsp-file /root/FIPS/GCM/resp --cryptodev crypto_aesni_gcm_pmd_1 --path-is-folder --cryptodev-id 0 --self-test
 
 
 Test Case 18: fips_self-test
@@ -253,7 +254,7 @@ Test Case 18: fips_self-test
 
 Test Command::
 
-  ./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
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-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 +262,5 @@ Test Case 19: fips_broken-test
 
 Test Command::
 
-  ./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
+  ./x86_64-native-linuxapp-gcc/examples/dpdk-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 19a9836..7239f46 100644
--- a/test_plans/ipsec_gw_cryptodev_func_test_plan.rst
+++ b/test_plans/ipsec_gw_cryptodev_func_test_plan.rst
@@ -129,7 +129,7 @@ To test CryptoDev API, an example ipsec-secgw is added into DPDK.
 The test commands of ipsec-secgw is below::
 
 
-    ./build/ipsec-secgw [EAL options] --
+    ./build/examples/dpdk-l2fwd-crypto [EAL options] --
         -p PORTMASK -P -u PORTMASK -j FRAMESIZE
         -l -a REPLAY_WINOW_SIZE -e -a
         --config (port,queue,lcore)[,(port,queue,lcore]
@@ -140,8 +140,8 @@ The test commands of ipsec-secgw is below::
 
 compile the applications::
 
-    make -C ./examples/ipsec-secgw
-
+      meson configure -Dexamples=ipsec-secgw x86_64-native-linuxapp-gcc
+      ninja -C x86_64-native-linuxapp-gcc
 
 Configuration File Syntax:
 
@@ -151,6 +151,33 @@ Configuration File Syntax:
     the configuration file will be explained in DPDK code directory
     dpdk/doc/guides/sample_app_ug/ipsec_secgw.rst.
 
+Software
+--------
+
+dpdk: http://dpdk.org/git/dpdk
+multi-buffer library: https://github.com/01org/intel-ipsec-mb
+Intel QuickAssist Technology Driver: https://01.org/packet-processing/intel%C2%AE-quickassist-technology-drivers-and-patches
+
+General set up
+--------------
+1, Compile DPDK::
+
+    CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=static x86_64-native-linuxapp-gcc
+    ninja -C x86_64-native-linuxapp-gcc -j 110
+
+2, Build App::
+      meson configure -Dexamples=ipsec-secgw x86_64-native-linuxapp-gcc
+      ninja -C x86_64-native-linuxapp-gcc
+
+3, Get the pci device id of QAT and NIC::
+
+   ./dpdk/usertools/dpdk-devbind.py --status-dev crypto
+   ./dpdk/usertools/dpdk-devbind.py --status-dev net
+
+4, Bind QAT VF ports and NICs to dpdk::
+
+   ./dpdk/usertools/dpdk-devbind.py --force --bind=vfio-pci 000:1a:01.0
+   ./dpdk/usertools/dpdk-devbind.py --force --bind=vfio-pci 0000:60:00.0 0000:60:00.2
 
 QAT/AES-NI installation
 =======================
@@ -200,7 +227,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 -a 0000:60:00.0 -a 0000:60:00.2
+    ./x86_64-native-linuxapp-gcc/examples/dpdk-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,7 +258,7 @@ Cryptodev QAT algorithm validation matrix is showed in table below.
 
 example::
 
-    ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 2048,0 --legacy-mem -a 0000:60:00.0 -a 0000:60:00.2
+    ./x86_64-native-linuxapp-gcc/examples/dpdk-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
 
@@ -248,7 +275,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 -a 0000:60:00.0 -a 0000:60:00.2
+    ./x86_64-native-linuxapp-gcc/examples/dpdk-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 +292,6 @@ Cryptodev NULL algorithm validation matrix is showed in table below.
 
 example::
 
-    ./examples/ipsec-secgw/build/ipsec-secgw --socket-mem 2048,0 --legacy-mem -a 0000:60:00.0 -a 0000:60:00.2
+    ./x86_64-native-linuxapp-gcc/examples/dpdk-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/l2fwd_cryptodev_func_test_plan.rst b/test_plans/l2fwd_cryptodev_func_test_plan.rst
index 4176770..9ace53d 100644
--- a/test_plans/l2fwd_cryptodev_func_test_plan.rst
+++ b/test_plans/l2fwd_cryptodev_func_test_plan.rst
@@ -291,6 +291,29 @@ The test commands of l2fwd-crypto is below::
     [--digest size SIZE] [--sessionless] [--cryptodev_mask MASK] /
     [--mac-updating] [--no-mac-updating]
 
+Software
+--------
+
+dpdk: http://dpdk.org/git/dpdk
+multi-buffer library: https://github.com/01org/intel-ipsec-mb
+Intel QuickAssist Technology Driver: https://01.org/packet-processing/intel%C2%AE-quickassist-technology-drivers-and-patches
+
+General set up
+--------------
+1, Compile DPDK::
+
+    CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=static x86_64-native-linuxapp-gcc
+    ninja -C x86_64-native-linuxapp-gcc -j 110
+
+2, Get the pci device id of QAT and NIC::
+
+   ./dpdk/usertools/dpdk-devbind.py --status-dev crypto
+   ./dpdk/usertools/dpdk-devbind.py --status-dev net
+
+3, Bind QAT VF ports and  NICs  to dpdk::
+
+   ./dpdk/usertools/dpdk-devbind.py --force --bind=vfio-pci 000:1a:01.0
+   ./dpdk/usertools/dpdk-devbind.py --force --bind=vfio-pci 0000:60:00.0 0000:65:00.2
 
 QAT/AES-NI installation
 =======================
@@ -336,8 +359,8 @@ and compare the payload with correct answer pre-stored in scripts::
 
 compile the applications::
 
-    make -C ./examples/l2fwd-crypto
-
+    meson configure -Dexamples=l2fwd-crypto x86_64-native-linuxapp-gcc
+    ninja -C x86_64-native-linuxapp-gcc
 
 Sub-case: AES-NI test case
 --------------------------
@@ -378,7 +401,8 @@ Cryptodev AES-NI algorithm validation matrix is showed in table below.
 
 example::
 
-    ./examples/l2fwd-crypto/build/l2fwd-crypto --socket-mem 1024,0 --legacy-mem -l 6,7,8 -n 2
+    ./x86_64-native-linuxapp-gcc/examples/dpdk-l2fwd-crypto --socket-mem 1024,0 --legacy-mem -l 6,7,8 -n 2
+    -a 0000:60:00.0 -a 0000:60:00.2
     --vdev crypto_aesni_mb --vdev crypto_aesni_mb -- -p 0x1 --chain CIPHER_ONLY --cdev_type SW
     --cipher_algo aes-cbc --cipher_op ENCRYPT --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f
     --cipher_iv 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f --no-mac-updating
@@ -438,7 +462,8 @@ Cryptodev QAT algorithm validation matrix is showed in table below.
 
 example::
 
-    ./examples/l2fwd-crypto/build/l2fwd-crypto --socket-mem 1024,0 --legacy-mem -l 6,7,8 -n 2
+    ./x86_64-native-linuxapp-gcc/examples/dpdk-l2fwd-crypto --socket-mem 1024,0 --legacy-mem -l 6,7,8 -n 2
+    -a 0000:60:00.0 -a 0000:60:00.2 -a 000:1a:01.0
     -- -p 0x1 --chain CIPHER_ONLY --cdev_type HW --cipher_algo aes-cbc --cipher_op ENCRYPT
     --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f
     --cipher_iv 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f --no-mac-updating
@@ -482,7 +507,8 @@ Cryptodev OPENSSL algorithm validation matrix is showed in table below.
 
 example::
 
-    ./examples/l2fwd-crypto/build/l2fwd-crypto --socket-mem 1024,0 --legacy-mem -l 6,7,8 -n 2
+    ./x86_64-native-linuxapp-gcc/examples/dpdk-l2fwd-crypto --socket-mem 1024,0 --legacy-mem -l 6,7,8 -n 2
+    -a 0000:60:00.0 -a 0000:60:00.2
     --vdev crypto_openssl_pmd --vdev crypto_openssl_pmd -- -p 0x1 --chain CIPHER_ONLY
     --cdev_type SW --cipher_algo aes-cbc --cipher_op ENCRYPT
     --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f
@@ -508,7 +534,8 @@ Cipher only, hash-only and chaining functionality is supported for Snow3g.
 
 example::
 
-    ./examples/l2fwd-crypto/build/l2fwd-crypto --socket-mem 1024,0 --legacy-mem -l 6,7,8 -n 2
+    ./x86_64-native-linuxapp-gcc/examples/dpdk-l2fwd-crypto --socket-mem 1024,0 --legacy-mem -l 6,7,8 -n 2
+    -a 0000:60:00.0 -a 0000:60:00.2 [-a 000:1a:01.0]
     -- -p 0x1 --chain HASH_ONLY --cdev_type HW --auth_algo snow3g-uia2 --auth_op GENERATE
     --auth_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f
     --auth_iv 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00 --digest 4 --no-mac-updating
@@ -533,7 +560,8 @@ Cipher only, hash-only and chaining functionality is supported for Kasumi.
 
 example::
 
-    ./examples/l2fwd-crypto/build/l2fwd-crypto --socket-mem 1024,0 --legacy-mem -l 6,7,8 -n 2
+    ./x86_64-native-linuxapp-gcc/examples/dpdk-l2fwd-crypto --socket-mem 1024,0 --legacy-mem -l 6,7,8 -n 2
+    -a 0000:60:00.0 -a 0000:60:00.2 [-a 000:1a:01.0]
     --vdev crypto_kasumi_pmd --vdev crypto_kasumi_pmd -- -p 0x1 --chain HASH_ONLY --cdev_type SW
     --auth_algo kasumi-f9 --auth_op GENERATE
     --auth_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f --digest 4 --no-mac-updating
@@ -558,7 +586,8 @@ Cipher only, hash-only and chaining functionality is supported for ZUC.
 
 example::
 
-    ./examples/l2fwd-crypto/build/l2fwd-crypto --socket-mem 1024,0 --legacy-mem -l 6,7,8 -n 2
+    ./x86_64-native-linuxapp-gcc/examples/dpdk-l2fwd-crypto --socket-mem 1024,0 --legacy-mem -l 6,7,8 -n 2
+    -a 0000:60:00.0 -a 0000:60:00.2 [-a 000:1a:01.0]
     --vdev crypto_zuc_pmd --vdev crypto_zuc_pmd -- -p 0x1 --chain HASH_ONLY --cdev_type SW
     --auth_algo zuc-eia3 --auth_op GENERATE --auth_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f
     --auth_iv 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00 --digest 4 --no-mac-updating
@@ -586,7 +615,8 @@ Cryptodev AESNI-GCM algorithm validation matrix is showed in table below.
 
 example::
 
-    ./examples/l2fwd-crypto/build/l2fwd-crypto --socket-mem 1024,0 --legacy-mem -l 6,7,8 -n 2
+    ./x86_64-native-linuxapp-gcc/examples/dpdk-l2fwd-crypto --socket-mem 1024,0 --legacy-mem -l 6,7,8 -n 2
+    -a 0000:60:00.0 -a 0000:60:00.2 [-a 000:1a:01.0]
     --vdev crypto_aesni_gcm_pmd --vdev crypto_aesni_gcm_pmd -- -p 0x1 --chain AEAD --cdev_type SW
     --aead_algo aes-gcm --aead_op ENCRYPT --aead_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f
     --aead_iv 00:01:02:03:04:05:06:07:08:09:0a:0b --aad 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f
@@ -612,6 +642,7 @@ Cipher only, hash-only and chaining functionality is supported for NULL.
 
 example::
 
-    ./examples/l2fwd-crypto/build/l2fwd-crypto --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6
+    ./x86_64-native-linuxapp-gcc/examples/dpdk-l2fwd-crypto --socket-mem 2048,0 --legacy-mem -l 9,10,66 -n 6
+    -a 0000:60:00.0 -a 0000:60:00.2 [-a 000:1a:01.0]
     --vdev crypto_null_pmd --vdev crypto_null_pmd  --  -p 0x1 --chain CIPHER_ONLY --cdev_type SW
     --cipher_algo null --cipher_op ENCRYPT --no-mac-updating
diff --git a/test_plans/unit_tests_cryptodev_func_test_plan.rst b/test_plans/unit_tests_cryptodev_func_test_plan.rst
index 6cb6c5e..b5fc640 100644
--- a/test_plans/unit_tests_cryptodev_func_test_plan.rst
+++ b/test_plans/unit_tests_cryptodev_func_test_plan.rst
@@ -68,10 +68,16 @@ Test Case Setup
 ===============
 
 #. Build DPDK and app/test app
-#. Bind cryptodev devices to igb_uio driver
+    CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=static x86_64-native-linuxapp-gcc
+    ninja -C x86_64-native-linuxapp-gcc -j 110
+
+#. Bind cryptodev devices to vfio-pci driver when test cryptodev_qat_autotest
+   ./dpdk/usertools/dpdk-devbind.py --status-dev crypto
+   ./dpdk/usertools/dpdk-devbind.py --force --bind=vfio-pci 000:1a:01.0
+
 #. Manually verify the app/test by this command, as example, in your build folder::
 
-     ./app/test -c 1 -n 1
+     ./x86_64-native-linuxapp-gcc/app/test/dpdk-test -c 1 -n 1
      RTE>> cryptodev_qat_autotest
 
 All Unit Test Cases are listed above.
