diff mbox series

[V1] test_plans/*: modify power test plans to adapt meson build

Message ID 20220301122239.812405-1-tadhg.kearney@intel.com (mailing list archive)
State Superseded
Headers
Series [V1] test_plans/*: modify power test plans to adapt meson build |

Checks

Context Check Description
ci/Intel-dts-suite-test fail Apply issues

Commit Message

Tadhg Kearney March 1, 2022, 12:22 p.m. UTC 
  Signed-off-by: Tadhg Kearney <tadhg.kearney@intel.com>
---
 .../power_bidirection_channel_test_plan.rst   |  8 +++----
 test_plans/power_branch_ratio_test_plan.rst   |  4 ++--
 test_plans/power_empty_poll_test_plan.rst     |  4 ++--
 test_plans/power_negative_test_plan.rst       | 12 +++++-----
 test_plans/power_pbf_test_plan.rst            |  6 ++---
 test_plans/power_pstate_test_plan.rst         |  2 +-
 test_plans/power_telemetry_test_plan.rst      |  2 +-
 test_plans/vm_power_manager_test_plan.rst     |  6 ++---
 test_plans/vm_pw_mgmt_policy_test_plan.rst    | 22 +++++++++++--------
 9 files changed, 35 insertions(+), 31 deletions(-)
diff mbox series

Patch

diff --git a/test_plans/power_bidirection_channel_test_plan.rst b/test_plans/power_bidirection_channel_test_plan.rst
index a6df6597..59bd193d 100644
--- a/test_plans/power_bidirection_channel_test_plan.rst
+++ b/test_plans/power_bidirection_channel_test_plan.rst
@@ -59,7 +59,7 @@  Step 1. Launch VM using libvirt::
 
 Step 2. Launch VM power manager example on the host to monitor the channel from VM::
 
-    ./examples/vm_power_manager/build/vm_power_mgr -c 0xfffe -n 4 --no-pci
+    ./<build_target>/examples/dpdk-vm_power_manager -c 0xfffe -n 4 --no-pci
     vmpower> add_vm [vm name]
     vmpower> add_channels [vm name] all
     vmpower> set_channel_status [vm name] all enabled
@@ -73,7 +73,7 @@  Step 2. Launch VM power manager example on the host to monitor the channel from
 
 Step 3. In the VM, launch guest_vm_power_mgr to set and send the power manager policy to the host power example::
 
-   ./examples/vm_power_manager/guest_cli/build/guest_vm_power_mgr -c 0xfe -n 4 -m 1024 --no-pci --file-prefix=vm_power -- --vm-name=ubuntu --vcpu-list=0-7
+   ./<build_target>/examples/dpdk-guest_cli -c 0xfe -n 4 -m 1024 --no-pci --file-prefix=vm_power -- --vm-name=ubuntu --vcpu-list=0-7
 
     Send command to the core 7 on host APP:
     vmpower(guest)> set_cpu_freq 7 down
@@ -100,7 +100,7 @@  Step 1. Launch VM using libvirt::
 
 Step 2. Launch VM power manager example on the host to monitor the channel from VM::
 
-    ./examples/vm_power_manager/build/vm_power_mgr -c 0xfffe -n 4 --no-pci
+    ./<build_target>/examples/dpdk-vm_power_manager -c 0xfffe -n 4 --no-pci
     vmpower> add_vm [vm name]
     vmpower> add_channels [vm name] all
     vmpower> set_channel_status [vm name] all enabled
@@ -115,7 +115,7 @@  Step 3. Enable the query permission for target VM from host vm_power_mgr example
 
 Step 4. Query the CPU frequency for all CPU cores from VM side::
 
-   ./examples/vm_power_manager/guest_cli/build/guest_vm_power_mgr -c 0xfe -n 4 -m 1024 --no-pci --file-prefix=vm_power -- --vm-name=ubuntu --vcpu-list=0-7
+   ./<build_target>/examples/dpdk-guest_cli -c 0xfe -n 4 -m 1024 --no-pci --file-prefix=vm_power -- --vm-name=ubuntu --vcpu-list=0-7
     vmpower> query_cpu_freq <core_num> | all
 
     Check vcpu 0~7 frequency info will be returned, for example:
diff --git a/test_plans/power_branch_ratio_test_plan.rst b/test_plans/power_branch_ratio_test_plan.rst
index daecc133..17553068 100644
--- a/test_plans/power_branch_ratio_test_plan.rst
+++ b/test_plans/power_branch_ratio_test_plan.rst
@@ -58,11 +58,11 @@  no_turbo_max=$(rdmsr -p 2 0x0CE -f 15:8 -d)00000
 
 Test Case 1 : Set Branch-Ratio Test Rate by User ====================================================================================
 1. Launch VM power manager sample on the host to run branch monitor.
-./x86_64-native-linuxapp-gcc/examples/dpdk-vm_power_manager  -v -c 0xe -n 1 -m 1024 --no-pci  -- --core-branch-ratio=1-3:0.3
+./<build_target>/examples/dpdk-vm_power_manager  -v -c 0xe -n 1 -m 1024 --no-pci  -- --core-branch-ratio=1-3:0.3
 
 2. Launch testpmd with fwd io mode::
 
-    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd  -v -c 0x6 -n 1 -m 1024 --file-prefix=vmpower2 -- -i
+    ./<build_target>/app/dpdk-testpmd  -v -c 0x6 -n 1 -m 1024 --file-prefix=vmpower2 -- -i
     > start
 
 3. Inject packet with packet generator to the NIC, with line rate,
diff --git a/test_plans/power_empty_poll_test_plan.rst b/test_plans/power_empty_poll_test_plan.rst
index 44728308..f18a483a 100644
--- a/test_plans/power_empty_poll_test_plan.rst
+++ b/test_plans/power_empty_poll_test_plan.rst
@@ -124,7 +124,7 @@  Test Case1 : Basic Training mode test based on one NIC with l3fwd-power
 =======================================================================
 Step 1. Bind One NIC to DPDK driver, launch l3fwd-power with empty-poll enabled
 
-    ./l3fwd-power -l 1-2 -n 4 -- -p 0x1 -P --config="(0,0,2)" --empty-poll="1,0,0" -l 10 -m 6 -h 1
+    ./<build_target>/examples/dpdk-l3fwd-power -l 1-2 -n 4 -- -p 0x1 -P --config="(0,0,2)" --empty-poll="1,0,0" -l 10 -m 6 -h 1
 
 Step 2. Check the log also when changing the inject packet rate as following:
 
@@ -139,6 +139,6 @@  Test Case2: No-Training mode test based on one NIC with l3fwd-power
 ===================================================================
 Step 1. Bind One NIC to DPDK driver, launch l3fwd-power with empty-poll enabled
 
-   ./l3fwd-power -l 1-2 -n 4  -- -p 0x1 -P --config="(0,0,2)" --empty-poll="0,350000,500000" -l 10 -m 6 -h 1
+   ./<build_target>/examples/dpdk-l3fwd-power -l 1-2 -n 4  -- -p 0x1 -P --config="(0,0,2)" --empty-poll="0,350000,500000" -l 10 -m 6 -h 1
 
 Step 2. Check no training steps are executed in sample's launch log.
diff --git a/test_plans/power_negative_test_plan.rst b/test_plans/power_negative_test_plan.rst
index 76563683..3d074832 100644
--- a/test_plans/power_negative_test_plan.rst
+++ b/test_plans/power_negative_test_plan.rst
@@ -53,7 +53,7 @@  Step 1. Create powermonitor fold for vm_power_manager sample::
 
 Step 2. Luanch VM power manager sample::
 
-    ./examples/vm_power_manager/build/vm_power_mgr -l 1-3 -n 4 --file-prefix=test1 --no-pci
+    ./<build_target>/examples/dpdk-vm_power_manager -l 1-3 -n 4 --file-prefix=test1 --no-pci
 
 Step 3. Prepare policy in JSON format then send it to the fifo channel:
     Prepare different command in JSON format then send it to the fifo channel
@@ -84,7 +84,7 @@  Step 1. Create powermonitor fold for vm_power_manager sample::
 
 Step 2. Luanch VM power manager sample::
 
-    ./examples/vm_power_manager/build/vm_power_mgr -l 1-3 -n 4 --file-prefix=test1 --no-pci
+    ./<build_target>/examples/dpdk-vm_power_manager -l 1-3 -n 4 --file-prefix=test1 --no-pci
 
 Step 3. Prepare policy in JSON format then send it to the fifo channel:
 
@@ -118,7 +118,7 @@  Note: For the VM xml file which will be used for creating the VM, it can re-use
 
 Step 2. Luanch VM power manager sample on the host to monitor the channel from VM::
 
-    ./examples/vm_power_manager/build/vm_power_mgr -l 12-14 -n 4 --no-pci
+    ./<build_taget>/examples/dpdk-vm_power_manager -l 12-14 -n 4 --no-pci
       >　add_vm [vm name]
       >　add_channels [vm name] all
       >　set_channel_status [vm name] all enabled
@@ -133,7 +133,7 @@  Check point:　No crash should be occur at vm_power_mgr sample
 
 Step 3. In the VM, launch guest_vm_power_mgr to set and send the power manager policy to the host power sample::
 
-    ./examples/vm_power_manager/guest_cli/build/guest_vm_power_mgr -c 0xff -n 4 -m 1024 --no-pci --file-prefix=yaolei \
+    ./<build_target>/examples/dpdk-guest_cli -c 0xff -n 4 -m 1024 --no-pci --file-prefix=yaolei \
       -- --vm-name=ubuntu --vcpu-list=0-7
       > set_cpu_freq 128 down
       > set_cpu_freq 1000000000000 down
@@ -149,11 +149,11 @@  Test Case4: TRAFFIC Policy Test based on JSON configure file with large integer
 Step 1. Generate 1 VF under vfio-pci driver, launch vm_power_mgr sample with PF, for example::
 
     echo 1 > /sys/bus/pci/drivers/vfio-pci/0000\:82\:00.0/max_vfs
-    ./examples/vm_power_manager/build/vm_power_mgr -l 1-4 -n 4 --socket-mem=1024,1024 --file-prefix=test1 -a 82:00.0 -- -p 0x01
+    ./<build_target>/examples/dpdk-vm_power_manager -l 1-4 -n 4 --socket-mem=1024,1024 --file-prefix=test1 -a 82:00.0 -- -p 0x01
 
 Step 2. Launch testpmd with VF::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -l 5-6 -n 4 --socket-mem=1024,1024 --file-prefix=test2 -a 0000:82:02.0 -- -i
+     ./<build_target>/app/dpdk-testpmd -l 5-6 -n 4 --socket-mem=1024,1024 --file-prefix=test2 -a 0000:82:02.0 -- -i
        > set fwd macswap
        > start
 
diff --git a/test_plans/power_pbf_test_plan.rst b/test_plans/power_pbf_test_plan.rst
index 6a38fc61..8131bc5b 100644
--- a/test_plans/power_pbf_test_plan.rst
+++ b/test_plans/power_pbf_test_plan.rst
@@ -59,7 +59,7 @@  Step 1. Create powermonitor fold for::
 
 Step 2. Compile DPDK with Power Lib debug info on, then Luanch VM power manager sample::
 
-    ./examples/vm_power_manager/build/vm_power_mgr -l 1-46 -n 4 --file-prefix=power --no-pci
+    ./<build_target>/examples/dpdk-vm_power_manager -l 1-46 -n 4 --file-prefix=power --no-pci
 
     Check two different base_max frequency will be shown in log, for example on Intel 6230N Processor:
     The log will be like as following
@@ -87,7 +87,7 @@  Step 1. Create powermonitor fold for::
 
 Step 2. Compile DPDK with Power Lib debug info on, then aunch VM power manager sample::
 
-    ./examples/vm_power_manager/build/vm_power_mgr -l 1-46 -n 4 --file-prefix=power --no-pci
+    ./<build_target>/examples/dpdk-vm_power_manager -l 1-46 -n 4 --file-prefix=power --no-pci
 
 Step 3. Prepare different command in JSON format::
 
@@ -129,7 +129,7 @@  Step 1. Create powermonitor fold for::
 
 Step 2. Compile DPDK with Power Lib debug info on, then launch VM power manager sample::
 
- ./examples/vm_power_manager/build/vm_power_mgr -l 1-46 -n 4 --file-prefix=power --no-pci
+ ./<build_target>/examples/dpdk-vm_power_manager -l 1-46 -n 4 --file-prefix=power --no-pci
 
 Step 3. Prepare Several command in JSON format then send it to the fifo channel for the high priority core::
 
diff --git a/test_plans/power_pstate_test_plan.rst b/test_plans/power_pstate_test_plan.rst
index f2a5e199..ce79c71f 100644
--- a/test_plans/power_pstate_test_plan.rst
+++ b/test_plans/power_pstate_test_plan.rst
@@ -64,7 +64,7 @@  Step 1. Create powermonitor fold for::
 
 Step 2. Luanch VM power manager sample::
 
-    ./examples/vm_power_manager/build/vm_power_mgr -l 1-4 -n 4 --file-prefix=power --no-pci
+    ./<build_target>/examples/dpdk-vm_power_manager -l 1-4 -n 4 --file-prefix=power --no-pci
 
 Step 3. Prepare different command in JSON format then send it to the fifo channel::
 
diff --git a/test_plans/power_telemetry_test_plan.rst b/test_plans/power_telemetry_test_plan.rst
index fd27f8a1..0afb0f77 100644
--- a/test_plans/power_telemetry_test_plan.rst
+++ b/test_plans/power_telemetry_test_plan.rst
@@ -63,7 +63,7 @@  Test Case 1 : Check all 3 type of power related info reported by Telemetry Syste
 =================================================================================
 1. Launch l3fwd-power sample with telemetry enabled, bind one NIC to DPDK driver, launch l3fwd-power::
 
-    ./l3fwd-power -l 1-2 -n 4 --telemetry -- -p 0x1 -P --config="(0,0,2)" --telemetry
+    ./<build_target>/examples/dpdk-l3fwd-power -l 1-2 -n 4 --telemetry -- -p 0x1 -P --config="(0,0,2)" --telemetry
 
 2. Get the telemetry info using dpdk-telemetry-client.py script, then choose mode 3 ``Send for global Metrics``::
 
diff --git a/test_plans/vm_power_manager_test_plan.rst b/test_plans/vm_power_manager_test_plan.rst
index 7cac509c..58e78949 100644
--- a/test_plans/vm_power_manager_test_plan.rst
+++ b/test_plans/vm_power_manager_test_plan.rst
@@ -123,11 +123,11 @@  Test Case 1: VM Power Management Channel
 
 3. Run power-manager in Host::
 
-        ./build/vm_power_mgr -c 0x3 -n 4
+        ./<build_target>/examples/dpdk-vm_power_manager -c 0x3 -n 4
 
 4. Startup VM and run guest_vm_power_mgr::
 
-        guest_vm_power_mgr -c 0x1f -n 4 -- -i
+        ./<build_target>/examples/dpdk-guest_cli -c 0x1f -n 4 -- -i
 
 5. Add vm in host and check vm_power_mgr can get frequency normally::
 
@@ -155,7 +155,7 @@  Test Case 1: VM Power Management Channel
 
 7. Run vm_power_mgr in vm::
 
-        guest_cli/build/vm_power_mgr -c 0x1f -n 4
+        ./<build_target>/examples/dpdk-vm_power_manager -c 0x1f -n 4
 
    Check monitor channel for all cores has been connected.
 
diff --git a/test_plans/vm_pw_mgmt_policy_test_plan.rst b/test_plans/vm_pw_mgmt_policy_test_plan.rst
index 98894ff5..e751649e 100644
--- a/test_plans/vm_pw_mgmt_policy_test_plan.rst
+++ b/test_plans/vm_pw_mgmt_policy_test_plan.rst
@@ -168,11 +168,13 @@  Set up testing environment
 
 #. Compile and run power-manager in host, core number should >= 3, add vm in host.
 
-    export RTE_SDK=`pwd`
-    export RTE_TARGET=x86_64-native-linuxapp-gcc
-    make -C examples/vm_power_manager
+    CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=static <build_target>
+    ninja -C <build_target>
 
-   ./examples/vm_power_manager/build/vm_power_mgr -c 0xffff -n 4
+    meson configure -Dexamples=vm_power_manager <build_target>
+    ninja -C <build_target>
+
+   ./<build_target>/examples/dpdk-vm_power_manager -c 0xffff -n 4
 
     vmpower> add_vm <vm_name>
     vmpower> add_channels <vm_name> all
@@ -181,7 +183,7 @@  Set up testing environment
 #. Run testpmd on vm0 when do traffic policy testing, other test cases ignore
    this step.
 
-    ./testpmd -c 0x3 -n 1 -v -m 1024 --file-prefix=vmpower1 -- -i --port-topology=loop
+    ./<build_target>/app/dpdk-testpmd -c 0x3 -n 1 -v -m 1024 --file-prefix=vmpower1 -- -i --port-topology=loop
 
     testpmd> set fwd mac
     testpmd> set promisc all on
@@ -190,11 +192,13 @@  Set up testing environment
 
 #. Compile and run guest_vm_power_mgr on VM.
 
-    export RTE_SDK=`pwd`
-    export RTE_TARGET=x86_64-native-linuxapp-gcc
-    make -C examples/vm_power_manager/guest_cli
+    CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=static <build_target>
+    ninja -C <build_target>
+
+    meson configure -Dexamples=vm_power_manager/guest_cli <build_target>
+    ninja -C <build_target>
 
-   ./examples/vm_power_manager/guest_cli/build/guest_vm_power_mgr \
+   ./<build_target>/examples/dpdk-guest_cli \
    -c 0xff -n 4 --file-prefix=vmpower2 -- -i --vm-name=<vm name> \
    --policy=<policy name> --vcpu-list=<vcpus list> --busy-hours=<time stage>