Merge pull request #968 from douglas-raillard-arm/_pr216

lisa.tests.base: Introduce RTATestBundle.rtapp_tasks property

lisa/tests/base.py

@@ -579,9 +579,9 @@ def trace_window(self, trace):
         sdf = trace.df_events('sched_switch')
 
         # Find when the first task starts running
-        rta_start = sdf[sdf.next_comm.isin(self.rtapp_profile.keys())].index[0]
+        rta_start = sdf[sdf.next_comm.isin(self.rtapp_tasks)].index[0]
         # Find when the last task stops running
-        rta_stop = sdf[sdf.prev_comm.isin(self.rtapp_profile.keys())].index[-1]
+        rta_stop = sdf[sdf.prev_comm.isin(self.rtapp_tasks)].index[-1]
 
         return (rta_start, rta_stop)
 
@@ -628,6 +628,14 @@ def rtapp_profile(self):
         """
         return self.get_rtapp_profile(self.plat_info)
 
+    @property
+    def rtapp_tasks(self):
+        """
+        Sorted list of rtapp task names, as defined in ``rtapp_profile``
+        attribute.
+        """
+        return sorted(self.rtapp_profile.keys())
+
     @property
     def cgroup_configuration(self):
         """
@@ -665,7 +673,7 @@ def test_noisy_tasks(self, noise_threshold_pct=None, noise_threshold_ms=None):
         df = self.trace.analysis.tasks.df_tasks_runtime()
 
         # We don't want to account the test tasks
-        ignored_pids = list(map(self.trace.get_task_pid, self.rtapp_profile.keys()))
+        ignored_pids = list(map(self.trace.get_task_pid, self.rtapp_tasks))
 
         def compute_duration_pct(row):
             return row.runtime * 100 / self.trace.time_range

lisa/tests/scheduler/eas_behaviour.py

@@ -134,7 +134,7 @@ def _get_task_cpu_df(self):
         :returns: A Pandas DataFrame with a column for each task, showing the
                   CPU that the task was "on" at each moment in time
         """
-        tasks = list(self.rtapp_profile.keys())
+        tasks = self.rtapp_tasks
 
         df = self.trace.ftrace.sched_switch.data_frame[['next_comm', '__cpu']]
         df = df[df['next_comm'].isin(tasks)]
@@ -264,7 +264,7 @@ def _get_estimated_power_df(self, nrg_model):
         task_cpu_df = self._get_task_cpu_df()
         task_utils_df = self._get_expected_task_utils_df(nrg_model)
         task_utils_df.index = [time + self.trace.start for time in task_utils_df.index]
-        tasks = list(self.rtapp_profile.keys())
+        tasks = self.rtapp_tasks
 
         # Create a combined DataFrame with the utilization of a task and the CPU
         # it was running on at each moment. Looks like:

lisa/tests/scheduler/load_tracking.py

@@ -686,7 +686,7 @@ def task_name(self):
         """
         The name of the only task this test uses
         """
-        return list(self.rtapp_profile.keys())[0]
+        return self.rtapp_tasks[0]
 
     @LoadTrackingBase.get_task_sched_signal.used_events
     def get_task_sched_signal(self, cpu, signal):

lisa/tests/scheduler/misfit.py

@@ -127,7 +127,7 @@ def __init__(self, res_dir, plat_info):
 
         sdf = sdf[self.trace.start + self.IDLING_DELAY_S * 0.9:]
 
-        for task in self.rtapp_profile.keys():
+        for task in self.rtapp_tasks:
             task_cpu = int(task.strip("{}_".format(self.task_prefix)))
             task_start = sdf[(sdf.next_comm == task) & (sdf["__cpu"] == task_cpu)].index[0]
             last_start = max(last_start, task_start)
@@ -197,7 +197,7 @@ def test_preempt_time(self, allowed_preempt_pct=1) -> ResultBundle:
         sdf = self.trace.df_events('sched_switch')
         task_state_dfs = {
             task : self.trace.analysis.tasks.df_task_states(task)
-            for task in self.rtapp_profile.keys()
+            for task in self.rtapp_tasks
         }
 
         res = ResultBundle.from_bool(True)
@@ -314,7 +314,7 @@ def test_throughput(self, allowed_idle_time_s=None) -> ResultBundle:
         :type allowed_idle_time_s: int
         """
         task_state_dfs = {}
-        for task in self.rtapp_profile.keys():
+        for task in self.rtapp_tasks:
             # This test is all about throughput: check that every time a task
             # runs on a little it's because bigs are busy
             df = self.trace.analysis.tasks.df_task_states(task)

lisa/tests/staging/sched_android.py

@@ -259,8 +259,8 @@ def test_stune_task_placement(self, bad_cpu_margin_pct=10) -> ResultBundle:
         their time on CPUs that don't have enough capacity to serve their
         boost.
         """
-        assert len(self.rtapp_profile) == 1
-        task = list(self.rtapp_profile.keys())[0]
+        assert len(self.rtapp_tasks) == 1
+        task = self.rtapp_tasks[0]
         df = self.trace.analysis.tasks.df_task_total_residency(task)
 
         # Find CPUs without enough capacity to meet the boost