sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-10-29 22:24:51 +00:00
Code Issues Releases Wiki Activity

Merge pull request #500 from setrofim/next

Browse Source 
memcopy workload + fix gem5 support.
This commit is contained in:
setrofim
2017-10-10 08:58:24 +01:00
committed by GitHub
parent 590309b6be 287ab8d565
commit c3438b6814
10 changed files with 299 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wa/instrumentation/misc.py
View File

@@ -40,6 +40,7 @@ from devlib.utils.android import ApkInfo
from wa import Instrument, Parameter, very_fast
from wa.framework import signal
from wa.framework.exception import ConfigError
from wa.framework.instrumentation import slow
from wa.utils.misc import diff_tokens, write_table, check_output, as_relative
from wa.utils.misc import ensure_file_directory_exists as _f
from wa.utils.misc import ensure_directory_exists as _d
@@ -127,7 +128,8 @@ class SysfsExtractor(Instrument):
self.target.execute('rm -rf {}'.format(after_dir), as_root=True)
self.target.execute('mkdir -p {}'.format(after_dir), as_root=True)
def slow_start(self, context):
@slow
def start(self, context):
if self.use_tmpfs:
for d in self.paths:
dest_dir = self.target.path.join(self.on_device_before, as_relative(d))
@@ -139,7 +141,8 @@ class SysfsExtractor(Instrument):
for dev_dir, before_dir, _, _ in self.device_and_host_paths:
self.target.pull(dev_dir, before_dir)
def slow_stop(self, context):
@slow
def stop(self, context):
if self.use_tmpfs:
for d in self.paths:
dest_dir = self.target.path.join(self.on_device_after, as_relative(d))
@@ -192,7 +195,7 @@ class SysfsExtractor(Instrument):
def validate(self):
if not self.tmpfs_mount_point: # pylint: disable=access-member-before-definition
self.tmpfs_mount_point = self.target.path.join(self.target.working_directory, 'temp-fs')
self.tmpfs_mount_point = self.target.get_workpath('temp-fs')
def _local_dir(self, directory):
return os.path.dirname(as_relative(directory).replace(self.target.path.sep, os.sep))
@@ -256,8 +259,8 @@ class InterruptStatsInstrument(Instrument):
"""
def __init__(self, device, **kwargs):
super(InterruptStatsInstrument, self).__init__(device, **kwargs)
def __init__(self, target, **kwargs):
super(InterruptStatsInstrument, self).__init__(target, **kwargs)
self.before_file = None
self.after_file = None
self.diff_file = None
@@ -269,11 +272,11 @@ class InterruptStatsInstrument(Instrument):
def start(self, context):
with open(_f(self.before_file), 'w') as wfh:
wfh.write(self.device.execute('cat /proc/interrupts'))
wfh.write(self.target.execute('cat /proc/interrupts'))
def stop(self, context):
with open(_f(self.after_file), 'w') as wfh:
wfh.write(self.device.execute('cat /proc/interrupts'))
wfh.write(self.target.execute('cat /proc/interrupts'))
def update_result(self, context):
# If workload execution failed, the after_file may not have been created.
@@ -302,7 +305,7 @@ class DynamicFrequencyInstrument(SysfsExtractor):
super(DynamicFrequencyInstrument, self).setup(context)
def validate(self):
# temp-fs would have been set in super's validate, if not explicitly specified.
super(DynamicFrequencyInstrument, self).validate()
if not self.tmpfs_mount_point.endswith('-cpufreq'): # pylint: disable=access-member-before-definition
self.tmpfs_mount_point += '-cpufreq'