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

Gem5Device: Allowed the gem5 binary to be specified in the agenda

Browse Source 
- Added the gem5_binary option to the agenda which allows a different
  gem5 binary to be specified. This allows WA to be used with
  different levels of gem5 debugging. as well as allowing non-standard
  gem5 binary names and locations.
This commit is contained in:
Sascha Bischoff 2015-11-04 10:38:50 +00:00
parent 29abd290f4
commit 3a8eed1062
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wlauto/devices/android/gem5/__init__.py
View File

@ -102,6 +102,10 @@ class Gem5Device(AndroidDevice):
parameters = [ parameters = [
Parameter('core_names', default=[], override=True), Parameter('core_names', default=[], override=True),
Parameter('core_clusters', default=[], override=True), Parameter('core_clusters', default=[], override=True),
Parameter('gem5_binary', kind=str, default='./build/ARM/gem5.fast',
override=True, mandatory=False,
description="Command used to execute gem5. Adjust according "
"to needs."),
Parameter('gem5_description', kind=str, default='', override=True, Parameter('gem5_description', kind=str, default='', override=True,
description="Command line passed to the gem5 simulation. This" description="Command line passed to the gem5 simulation. This"
" command line is used to set up the simulated system, and " " command line is used to set up the simulated system, and "
@ -180,6 +184,8 @@ class Gem5Device(AndroidDevice):
self.checkpoint = False self.checkpoint = False
self.sckt = None self.sckt = None
self.gem5_binary = kwargs.get('gem5_binary')
if not kwargs.get('gem5_description'): if not kwargs.get('gem5_description'):
raise ConfigError('Please specify the system configuration with gem5_description') raise ConfigError('Please specify the system configuration with gem5_description')
self.gem5_args = kwargs.get('gem5_description') self.gem5_args = kwargs.get('gem5_description')
@ -250,9 +256,10 @@ class Gem5Device(AndroidDevice):
""" """
self.logger.info("Starting the gem5 simulator") self.logger.info("Starting the gem5 simulator")
command_line = "./build/ARM/gem5.fast --outdir={}/gem5 {} {}".format(settings.output_directory, command_line = "{} --outdir={}/gem5 {} {}".format(self.gem5_binary,
self.gem5_args, settings.output_directory,
self.gem5_vio_arg) self.gem5_args,
self.gem5_vio_arg)
self.logger.debug("gem5 command line: {}".format(command_line)) self.logger.debug("gem5 command line: {}".format(command_line))
self.gem5 = subprocess.Popen(command_line.split(), self.gem5 = subprocess.Popen(command_line.split(),
stdout=self.stdout_file, stdout=self.stdout_file,