sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-02-20 20:09:11 +00:00
Code Issues Releases Wiki Activity

Spec2000 Workload: Updated to use busybox provided from WA.

Browse Source 
Commands have been updated to use the busybox executable that
is installed via WA rather than relying on it already being in
PATH on the device as this would fail for devices that it was
not installed on.
This commit is contained in:
Marc Bonnici 2016-12-20 16:20:59 +00:00
parent d493b1e790
commit 807003128e
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wlauto/workloads/spec2000/__init__.py
View File

@ -151,8 +151,8 @@ class Spec2000(Workload):
speed_run_template = 'cd {datadir}; time ({launch_command})'
rate_run_template = 'cd {datadir}; time ({loop}; wait)'
loop_template = 'for i in $(busybox seq 1 {threads}); do {launch_command} 1>/dev/null 2>&1 & done'
launch_template = 'busybox taskset {cpumask} {command} 1>/dev/null 2>&1'
loop_template = 'for i in $({busybox} seq 1 {threads}); do {launch_command} 1>/dev/null 2>&1 & done'
launch_template = '{busybox} taskset {cpumask} {command} 1>/dev/null 2>&1'
timing_regex = re.compile(r'(?P<minutes>\d+)m(?P<seconds>[\d.]+)s\s+(?P<category>\w+)')
@ -287,18 +287,19 @@ class Spec2000(Workload):
if len(commandspecs) != 1:
raise AssertionError('Must be exactly one command spec specifed in speed mode.')
spec = commandspecs[0]
launch_command = self.launch_template.format(command=spec.command, cpumask=spec.cpumask)
self.commands.append((name,
self.speed_run_template.format(datadir=spec.datadir,
launch_command=launch_command)))
launch_command = self.launch_template.format(busybox=self.device.busybox,
command=spec.command, cpumask=spec.cpumask)
self.commands.append((name, self.speed_run_template.format(datadir=spec.datadir,
launch_command=launch_command)))
elif self.mode == 'rate':
loops = []
for spec in commandspecs:
launch_command = self.launch_template.format(command=spec.command, cpumask=spec.cpumask)
loops.append(self.loop_template.format(launch_command=launch_command, threads=spec.threads))
self.commands.append((name,
self.rate_run_template.format(datadir=spec.datadir,
loop='; '.join(loops))))
launch_command = self.launch_template.format(busybox=self.device.busybox,
command=spec.command, cpumask=spec.cpumask)
loops.append(self.loop_template.format(busybox=self.device.busybox,
launch_command=launch_command, threads=spec.threads))
self.commands.append((name, self.rate_run_template.format(datadir=spec.datadir,
loop='; '.join(loops))))
else:
raise ValueError('Unexpected SPEC2000 mode: {}'.format(self.mode)) # Should never get here