diff --git a/ipynb/tutorial/example_results/platform.json b/ipynb/tutorial/example_results/platform.json index a459f502e734d3cbb33468b47e5f86ec4ed95eda..60ab1ccd4bb0e055bbd36fc5e7080a066ec678c5 100644 --- a/ipynb/tutorial/example_results/platform.json +++ b/ipynb/tutorial/example_results/platform.json @@ -1,61 +1,61 @@ { "clusters": { "big": [ - 2, + 2, 3 - ], + ], "little": [ - 0, + 0, 1 ] - }, - "cpus_count": 4, + }, + "cpus_count": 4, "freqs": { "big": [ - 507000, - 702000, - 1001000, - 1209000, - 1404000, - 1612000, + 507000, + 702000, + 1001000, + 1209000, + 1404000, + 1612000, 1807000 - ], + ], "little": [ - 507000, - 702000, - 1001000, - 1105000, - 1183000, + 507000, + 702000, + 1001000, + 1105000, + 1183000, 1404000 ] - }, + }, "nrg_model": { "big": { "cluster": { "nrg_max": 252 - }, + }, "cpu": { - "cap_max": 1024, + "cap_max": 1024, "nrg_max": 1098 } - }, + }, "little": { "cluster": { "nrg_max": 220 - }, + }, "cpu": { - "cap_max": 591, + "cap_max": 591, "nrg_max": 217 } } - }, + }, "topology": [ [ - 0, + 0, 1 - ], + ], [ - 2, + 2, 3 ] ] diff --git a/libs/utils/analysis/frequency_analysis.py b/libs/utils/analysis/frequency_analysis.py index 2f2c1c74d4b3ff692f35778a0f50125bcb60b3f2..c079e24af0db42423fca9f71744319f208b0ec36 100644 --- a/libs/utils/analysis/frequency_analysis.py +++ b/libs/utils/analysis/frequency_analysis.py @@ -231,9 +231,9 @@ class FrequencyAnalysis(AnalysisModule): # Plot time period that the clock state was unknown from the trace indeterminate = pd.concat([on, off]).sort_index() if indeterminate.empty: - indet_range_max = self._trace.x_max + indet_range_max = self._trace.x_max else: - indet_range_max = indeterminate.index[0] + indet_range_max = indeterminate.index[0] state_axis.hlines(0, 0, indet_range_max, linewidth = 1.0, label='indeterminate clock state', linestyle='--') state_axis.legend(bbox_to_anchor=(0., 1.02, 1., 0.102), loc=3, ncol=3, mode='expand') state_axis.set_yticks([]) diff --git a/libs/utils/android/viewer.py b/libs/utils/android/viewer.py index 4133ff606f5a5c108542b350c2719ae738159157..eafec5268b575bab5a0bee37ae8eabf121bd3530 100644 --- a/libs/utils/android/viewer.py +++ b/libs/utils/android/viewer.py @@ -50,9 +50,9 @@ class ViewerWorkload(Workload): ---------- wload = Workload.getInstance(te, 'Example') wload.run(out_dir=te.res_dir, - uri="https://media.giphy.com/media/XIqCQx02E1U9W/giphy.gif") + uri="https://media.giphy.com/media/XIqCQx02E1U9W/giphy.gif") """ - + # Let the system pick the best package package = '' diff --git a/libs/utils/target_script.py b/libs/utils/target_script.py index 585326d7599163981e3330d7b9be7582920ee94b..15f712abce96de77bd5584443c144d0e18838e7d 100644 --- a/libs/utils/target_script.py +++ b/libs/utils/target_script.py @@ -44,7 +44,7 @@ class TargetScript(object): self._target = env.target self._script_name = script_name self.commands = [] - + # This is made to look like the devlib Target execute() def execute(self, cmd): """ @@ -75,7 +75,7 @@ class TargetScript(object): return getattr(self._target, name) return getattr(super, name) - + def push(self): """ Push a script to the target @@ -109,7 +109,7 @@ class TargetScript(object): self._run_as_root = as_root self._bg_shell = None if background: - self._bg_shell = self._target.background(self._remote_path, + self._bg_shell = self._target.background(self._remote_path, as_root=self._run_as_root) else: self._target.execute(self._remote_path, as_root=self._run_as_root) diff --git a/libs/utils/trace.py b/libs/utils/trace.py index ced81136786471725d732ad128c076fd3ffe0082..e6c059374d479c64a18d5c62c15964a3e0406f00 100644 --- a/libs/utils/trace.py +++ b/libs/utils/trace.py @@ -876,7 +876,7 @@ class Trace(object): @memoized def getPeripheralClockEffectiveRate(self, clk_name): - if clk_name is None: + if clk_name is None: self._log.warning('no specified clk_name in computing peripheral clock, returning None') return if not self.hasEvents('clock_set_rate'): diff --git a/results/LisaInANutshell_Backup/energy.json b/results/LisaInANutshell_Backup/energy.json index 22eb5867f4911f4528822b5f5a60298300f83fef..cabd974e16ed079b966a4a7c19277a334cf655b7 100644 --- a/results/LisaInANutshell_Backup/energy.json +++ b/results/LisaInANutshell_Backup/energy.json @@ -1,4 +1,4 @@ { - "LITTLE": "5.530500", + "LITTLE": "5.530500", "a57": "2.019339" } \ No newline at end of file diff --git a/results/LisaInANutshell_Backup/platform.json b/results/LisaInANutshell_Backup/platform.json index 4587db3d64506e1b73227bb3c427ccf9927dd489..98405b38466c7439b875d37942efcfc21528f2c6 100644 --- a/results/LisaInANutshell_Backup/platform.json +++ b/results/LisaInANutshell_Backup/platform.json @@ -1,58 +1,58 @@ { "clusters": { "big": [ - 1, + 1, 2 - ], + ], "little": [ - 0, - 3, - 4, + 0, + 3, + 4, 5 ] - }, - "cpus_count": 6, + }, + "cpus_count": 6, "freqs": { "big": [ - 600000, - 1000000, + 600000, + 1000000, 1200000 - ], + ], "little": [ - 450000, - 800000, + 450000, + 800000, 950000 ] - }, + }, "nrg_model": { "big": { "cluster": { "nrg_max": 64 - }, + }, "cpu": { - "cap_max": 1024, + "cap_max": 1024, "nrg_max": 616 } - }, + }, "little": { "cluster": { "nrg_max": 57 - }, + }, "cpu": { - "cap_max": 447, + "cap_max": 447, "nrg_max": 93 } } - }, + }, "topology": [ [ - 0, - 3, - 4, + 0, + 3, + 4, 5 - ], + ], [ - 1, + 1, 2 ] ] diff --git a/tests/lisa/traces/sched_load/platform.json b/tests/lisa/traces/sched_load/platform.json index d2c02c7a20a4b9a126d20fbd9c6a1d1ff334121b..5e8e6cbb9e8905df5b2c817c62b3fb8b7644d73f 100644 --- a/tests/lisa/traces/sched_load/platform.json +++ b/tests/lisa/traces/sched_load/platform.json @@ -1,78 +1,78 @@ { - "abi": "arm64", + "abi": "arm64", "clusters": { "big": [ - 1, + 1, 2 - ], + ], "little": [ - 0, - 3, - 4, + 0, + 3, + 4, 5 ] - }, - "cpus_count": 6, + }, + "cpus_count": 6, "freqs": { "big": [ - 450000, - 625000, - 800000, - 950000, + 450000, + 625000, + 800000, + 950000, 1100000 - ], + ], "little": [ - 450000, - 575000, - 700000, - 775000, + 450000, + 575000, + 700000, + 775000, 850000 ] - }, + }, "kernel": { - "major": 11, - "minor": 0, + "major": 11, + "minor": 0, "parts": [ - 4, - 11, + 4, + 11, 0 - ], - "rc": 6, - "release": "4.11.0-rc6-00092-g9cc3141d9e4f-dirty", - "sha1": "9cc3141d9e4f", - "version": "58 SMP PREEMPT Wed May 24 18:37:50 BST 2017", + ], + "rc": 6, + "release": "4.11.0-rc6-00092-g9cc3141d9e4f-dirty", + "sha1": "9cc3141d9e4f", + "version": "58 SMP PREEMPT Wed May 24 18:37:50 BST 2017", "version_number": 4 - }, + }, "nrg_model": { "big": { "cluster": { "nrg_max": 64 - }, + }, "cpu": { - "cap_max": 1024, + "cap_max": 1024, "nrg_max": 616 } - }, + }, "little": { "cluster": { "nrg_max": 57 - }, + }, "cpu": { - "cap_max": 447, + "cap_max": 447, "nrg_max": 93 } } - }, - "os": "linux", + }, + "os": "linux", "topology": [ [ - 0, - 3, - 4, + 0, + 3, + 4, 5 - ], + ], [ - 1, + 1, 2 ] ] diff --git a/tests/lisa/traces/sched_load_avg/platform.json b/tests/lisa/traces/sched_load_avg/platform.json index 80e06149bb0f004c999a48dd1c0cf7f3c1b665b2..97f0bc3e6855412c9b21dbb6f40cd7a1c98e6950 100644 --- a/tests/lisa/traces/sched_load_avg/platform.json +++ b/tests/lisa/traces/sched_load_avg/platform.json @@ -1,107 +1,107 @@ { - "abi": "arm64", + "abi": "arm64", "clusters": { "big": [ - 2, + 2, 3 - ], + ], "little": [ - 0, + 0, 1 ] - }, - "cpus_count": 4, + }, + "cpus_count": 4, "freqs": { "big": [ - 307200, - 384000, - 460800, - 537600, - 614400, - 691200, - 748800, - 825600, - 902400, - 979200, - 1056000, - 1132800, - 1209600, - 1286400, - 1363200, - 1440000, - 1516800, - 1593600, - 1670400, - 1747200, - 1824000, - 1900800, - 1977600, - 2054400, + 307200, + 384000, + 460800, + 537600, + 614400, + 691200, + 748800, + 825600, + 902400, + 979200, + 1056000, + 1132800, + 1209600, + 1286400, + 1363200, + 1440000, + 1516800, + 1593600, + 1670400, + 1747200, + 1824000, + 1900800, + 1977600, + 2054400, 2150400 - ], + ], "little": [ - 307200, - 384000, - 460800, - 537600, - 614400, - 691200, - 768000, - 844800, - 902400, - 979200, - 1056000, - 1132800, - 1209600, - 1286400, - 1363200, - 1440000, - 1516800, + 307200, + 384000, + 460800, + 537600, + 614400, + 691200, + 768000, + 844800, + 902400, + 979200, + 1056000, + 1132800, + 1209600, + 1286400, + 1363200, + 1440000, + 1516800, 1593600 ] - }, + }, "kernel": { - "major": 18, - "minor": 31, + "major": 18, + "minor": 31, "parts": [ - 3, - 18, + 3, + 18, 31 - ], - "rc": null, - "release": "3.18.31-gbd96fbf", - "sha1": "bd96fbf", - "version": "1 SMP PREEMPT Mon Nov 7 20:29:14 UTC 2016", + ], + "rc": null, + "release": "3.18.31-gbd96fbf", + "sha1": "bd96fbf", + "version": "1 SMP PREEMPT Mon Nov 7 20:29:14 UTC 2016", "version_number": 3 - }, + }, "nrg_model": { "big": { "cluster": { "nrg_max": 96 - }, + }, "cpu": { - "cap_max": 1024, + "cap_max": 1024, "nrg_max": 1715 } - }, + }, "little": { "cluster": { "nrg_max": 52 - }, + }, "cpu": { - "cap_max": 763, + "cap_max": 763, "nrg_max": 925 } } - }, - "os": "android", + }, + "os": "android", "topology": [ [ - 0, + 0, 1 - ], + ], [ - 2, + 2, 3 ] ]