[dts][V3 0/2] Remove old DPDK flags from power tests

[dts][V3 0/2] Remove old DPDK flags from power tests

[Tadhg Kearney]

* Remove use of old DPDK flags that are no longer used.
* Remove makefile support.
* Remove use of old DPDK flags in test plans.

Tadhg Kearney (2):
  test_plans/*: Remove old DPDK RTE flags from power tests
  tests/*: Remove old DPDK flags from power tests

 test_plans/power_branch_ratio_test_plan.rst |  5 ++-
 test_plans/power_telemetry_test_plan.rst    |  5 ---
 tests/TestSuite_power_branch_ratio.py       | 39 +--------------------
 tests/TestSuite_power_telemetry.py          | 18 +---------
 4 files changed, 4 insertions(+), 63 deletions(-)

-- 
2.25.1

[dts][V3 1/2] test_plans/*: Remove old DPDK RTE flags from power tests

[Tadhg Kearney]

Remove refernce to flags that don't exist anymore

Signed-off-by: Tadhg Kearney <tadhg.kearney@intel.com>
---
 test_plans/power_branch_ratio_test_plan.rst | 5 ++---
 test_plans/power_telemetry_test_plan.rst    | 5 -----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/test_plans/power_branch_ratio_test_plan.rst b/test_plans/power_branch_ratio_test_plan.rst
index 4bbf95af..ba943693 100644
--- a/test_plans/power_branch_ratio_test_plan.rst
+++ b/test_plans/power_branch_ratio_test_plan.rst
@@ -47,9 +47,8 @@ Prepare work
 
     intel_pstate=enable
 
-5. Set CONFIG_RTE_LIBRTE_POWER_DEBUG=y CONFIG_RTE_LIBRTE_POWER=y in /config/common_base file.
-6. modprobe msr module to let the application can get the CPU HW info.
-7. Let user space can control the CPU frequency::
+5. modprobe msr module to let the application can get the CPU HW info.
+6. Let user space can control the CPU frequency::
 
     cpupower frequency-set -g userspace
 
diff --git a/test_plans/power_telemetry_test_plan.rst b/test_plans/power_telemetry_test_plan.rst
index 0afb0f77..8804129c 100644
--- a/test_plans/power_telemetry_test_plan.rst
+++ b/test_plans/power_telemetry_test_plan.rst
@@ -53,11 +53,6 @@ Preparation Work for Settings
 
     cpupower frequency-set -g userspace
 
-Compile DPDK with telemetry enabled, enable telemetry lib in configuration file::
-
-    -CONFIG_RTE_LIBRTE_TELEMETRY=n
-    +CONFIG_RTE_LIBRTE_TELEMETRY=y
-
 
 Test Case 1 : Check all 3 type of power related info reported by Telemetry System
 =================================================================================
-- 
2.25.1

[dts][V3 2/2] tests/*: Remove old DPDK flags from power tests

[Tadhg Kearney]

* CONFIG_RTE_LIBRTE_I40E_PMD, CONFIG_RTE_LIBRTE_POWER + _CONFIG option do not exist anymore
* Telemetry is built by default + _LIBRTE_ option also does not exist anymore

Signed-off-by: Tadhg Kearney <tadhg.kearney@intel.com>
---
 tests/TestSuite_power_branch_ratio.py | 39 +--------------------------
 tests/TestSuite_power_telemetry.py    | 18 +------------
 2 files changed, 2 insertions(+), 55 deletions(-)

diff --git a/tests/TestSuite_power_branch_ratio.py b/tests/TestSuite_power_branch_ratio.py
index deb271e0..a2c28478 100644
--- a/tests/TestSuite_power_branch_ratio.py
+++ b/tests/TestSuite_power_branch_ratio.py
@@ -44,8 +44,7 @@ from pprint import pformat
 from framework.exception import VerifyFailure
 from framework.packet import Packet
 from framework.pktgen import TRANSMIT_CONT
-from framework.qemu_libvirt import LibvirtKvm
-from framework.settings import HEADER_SIZE, HOST_BUILD_TYPE_SETTING, load_global_setting
+from framework.settings import HEADER_SIZE
 from framework.test_case import TestCase
 from framework.utils import create_mask as dts_create_mask
 
@@ -227,27 +226,6 @@ class TestPowerBranchRatio(TestCase):
 
         return result
 
-    @property
-    def compile_switch(self):
-        sw_table = [
-            "CONFIG_RTE_LIBRTE_POWER",
-            "CONFIG_RTE_LIBRTE_POWER_DEBUG",
-        ]
-        return sw_table
-
-    def preset_compilation(self):
-        if "meson" == load_global_setting(HOST_BUILD_TYPE_SETTING):
-            compile_SWs = self.compile_switch + ["CONFIG_RTE_LIBRTE_I40E_PMD"]
-            self.dut.set_build_options(dict([(sw[7:], "y") for sw in compile_SWs]))
-        else:
-            for sw in self.compile_switch:
-                cmd = (
-                    "sed -i -e " "'s/{0}=n$/{0}=y/' " "{1}/config/common_base"
-                ).format(sw, self.target_dir)
-                self.d_a_con(cmd)
-        # re-compile dpdk source code
-        self.dut.build_install_dpdk(self.target)
-
     @contextmanager
     def restore_environment(self):
         try:
@@ -258,19 +236,6 @@ class TestPowerBranchRatio(TestCase):
                 self.restore_port_drv()
             except Exception as e:
                 self.logger.error(traceback.format_exc())
-            # restore compilation
-            if "meson" == load_global_setting(HOST_BUILD_TYPE_SETTING):
-                self.dut.set_build_options(
-                    dict([(sw[7:], "n") for sw in self.compile_switch])
-                )
-            else:
-                for sw in self.compile_switch:
-                    cmd = (
-                        "sed -i -e " "'s/{0}=y$/{0}=n/' " "{1}/config/common_base"
-                    ).format(sw, self.target_dir)
-                    self.d_a_con(cmd)
-            # re-compile dpdk source code
-            self.dut.build_install_dpdk(self.target)
 
     def restore_port_drv(self):
         driver = self.drivername
@@ -532,8 +497,6 @@ class TestPowerBranchRatio(TestCase):
         # modprobe msr module to let the application can get the CPU HW info
         self.d_a_con("modprobe msr")
         self.d_a_con("cpupower frequency-set -g userspace > /dev/null 2>&1")
-        # compile
-        self.preset_compilation()
         # init binary
         self.init_vm_power_mgr()
         self.init_testpmd()
diff --git a/tests/TestSuite_power_telemetry.py b/tests/TestSuite_power_telemetry.py
index afb55262..39acdef2 100644
--- a/tests/TestSuite_power_telemetry.py
+++ b/tests/TestSuite_power_telemetry.py
@@ -45,7 +45,7 @@ from pprint import pformat
 from framework.exception import VerifyFailure
 from framework.packet import Packet
 from framework.pktgen import TRANSMIT_CONT
-from framework.settings import HEADER_SIZE, HOST_BUILD_TYPE_SETTING, load_global_setting
+from framework.settings import HEADER_SIZE
 from framework.test_case import TestCase
 from framework.utils import create_mask as dts_create_mask
 
@@ -125,20 +125,6 @@ class TestPowerTelemetry(TestCase):
 
         return result
 
-    def preset_compilation(self):
-        if self.dut.skip_setup:
-            return
-        SW = "CONFIG_RTE_LIBRTE_TELEMETRY"
-        if "meson" == load_global_setting(HOST_BUILD_TYPE_SETTING):
-            self.dut.set_build_options({SW[7:]: "y"})
-        else:
-            cmd = "sed -i -e 's/{0}=n$/{0}=y/' {1}/config/common_base".format(
-                SW, self.target_dir
-            )
-            self.d_a_con(cmd)
-        # re-compile dpdk source code
-        self.dut.build_install_dpdk(self.target)
-
     def prepare_binary(self, name):
         example_dir = "examples/" + name
         out = self.dut.build_dpdk_apps("./" + example_dir)
@@ -445,8 +431,6 @@ class TestPowerTelemetry(TestCase):
 
     def preset_test_environment(self):
         self.is_l3fwd_on = None
-        # open compile switch and re-compile target source code
-        self.preset_compilation()
         # init binary
         self.init_l3fwd_power()
         self.init_telemetry()
-- 
2.25.1

RE: [dts][V3 0/2] Remove old DPDK flags from power tests

[Dong, JunX]

Acked-by: Jun Dong <junx.dong@intel.com>

> -----Original Message-----
> From: Tadhg Kearney <tadhg.kearney@intel.com>
> Sent: Tuesday, March 29, 2022 6:24 PM
> To: dts@dpdk.org
> Cc: Pattan, Reshma <reshma.pattan@intel.com>; Kearney, Tadhg
> <tadhg.kearney@intel.com>
> Subject: [dts][V3 0/2] Remove old DPDK flags from power tests

RE: [dts][V3 2/2] tests/*: Remove old DPDK flags from power tests

[Dong, JunX]

Acked-by: Jun Dong <junx.dong@intel.com>

> -----Original Message-----
> From: Tadhg Kearney <tadhg.kearney@intel.com>
> Sent: Tuesday, March 29, 2022 6:24 PM
> To: dts@dpdk.org
> Cc: Pattan, Reshma <reshma.pattan@intel.com>; Kearney, Tadhg
> <tadhg.kearney@intel.com>
> Subject: [dts][V3 2/2] tests/*: Remove old DPDK flags from power tests
> 
> * CONFIG_RTE_LIBRTE_I40E_PMD, CONFIG_RTE_LIBRTE_POWER + _CONFIG
> option do not exist anymore
> * Telemetry is built by default + _LIBRTE_ option also does not exist anymore
> 
> Signed-off-by: Tadhg Kearney <tadhg.kearney@intel.com>

[dts][V3 2/2] tests/*: Remove old DPDK flags from power tests

[lijuan.tu]

On Tue, 29 Mar 2022 10:24:08 +0000, Tadhg Kearney <tadhg.kearney@intel.com> wrote:
> * CONFIG_RTE_LIBRTE_I40E_PMD, CONFIG_RTE_LIBRTE_POWER + _CONFIG option do not exist anymore
> * Telemetry is built by default + _LIBRTE_ option also does not exist anymore
> 
> Signed-off-by: Tadhg Kearney <tadhg.kearney@intel.com>


Series applied, thanks