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

fw/descriptor: Add unsupported_platforms for a particular target

Browse Source 
Allow for specifying a list of `Platforms` that a particular target does
not support, e.g. 'local_juno'
This commit is contained in:
Marc Bonnici 2020-02-07 17:48:46 +00:00 committed by setrofim
parent dad0a28b5e
commit a8abf24db0
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wa/framework/target/descriptor.py
View File

@ -464,16 +464,16 @@ CONNECTION_PARAMS['ChromeOsConnection'] = \
CONNECTION_PARAMS[AdbConnection] + CONNECTION_PARAMS[SshConnection] CONNECTION_PARAMS[AdbConnection] + CONNECTION_PARAMS[SshConnection]
# name --> ((target_class, conn_class), params_list, defaults) # name --> ((target_class, conn_class, unsupported_platforms), params_list, defaults)
TARGETS = { TARGETS = {
'linux': ((LinuxTarget, SshConnection), COMMON_TARGET_PARAMS, None), 'linux': ((LinuxTarget, SshConnection, []), COMMON_TARGET_PARAMS, None),
'android': ((AndroidTarget, AdbConnection), COMMON_TARGET_PARAMS + 'android': ((AndroidTarget, AdbConnection, []), COMMON_TARGET_PARAMS +
[Parameter('package_data_directory', kind=str, default='/data/data', [Parameter('package_data_directory', kind=str, default='/data/data',
description=''' description='''
Directory containing Android data Directory containing Android data
'''), '''),
], None), ], None),
'chromeos': ((ChromeOsTarget, 'ChromeOsConnection'), COMMON_TARGET_PARAMS + 'chromeos': ((ChromeOsTarget, 'ChromeOsConnection', []), COMMON_TARGET_PARAMS +
[Parameter('package_data_directory', kind=str, default='/data/data', [Parameter('package_data_directory', kind=str, default='/data/data',
description=''' description='''
Directory containing Android data Directory containing Android data
@ -494,7 +494,8 @@ TARGETS = {
the need for privilege elevation. the need for privilege elevation.
'''), '''),
], None), ], None),
'local': ((LocalLinuxTarget, LocalConnection), COMMON_TARGET_PARAMS, None), 'local': ((LocalLinuxTarget, LocalConnection, [Juno, Gem5SimulationPlatform, TC2]),
COMMON_TARGET_PARAMS, None),
} }
# name --> assistant # name --> assistant
@ -549,13 +550,15 @@ class DefaultTargetDescriptor(TargetDescriptor):
# pylint: disable=attribute-defined-outside-init,too-many-locals # pylint: disable=attribute-defined-outside-init,too-many-locals
result = [] result = []
for target_name, target_tuple in TARGETS.items(): for target_name, target_tuple in TARGETS.items():
(target, conn), target_params = self._get_item(target_tuple) (target, conn, unsupported_platforms), target_params = self._get_item(target_tuple)
assistant = ASSISTANTS[target_name] assistant = ASSISTANTS[target_name]
conn_params = CONNECTION_PARAMS[conn] conn_params = CONNECTION_PARAMS[conn]
for platform_name, platform_tuple in PLATFORMS.items(): for platform_name, platform_tuple in PLATFORMS.items():
platform_target_defaults = platform_tuple[-1] platform_target_defaults = platform_tuple[-1]
platform_tuple = platform_tuple[0:-1] platform_tuple = platform_tuple[0:-1]
(platform, plat_conn), platform_params = self._get_item(platform_tuple) (platform, plat_conn), platform_params = self._get_item(platform_tuple)
if platform in unsupported_platforms:
continue
# Add target defaults specified in the Platform tuple # Add target defaults specified in the Platform tuple
target_params = self._apply_param_defaults(target_params, target_params = self._apply_param_defaults(target_params,
platform_target_defaults) platform_target_defaults)