1
0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-09-24 22:22:38 +01:00
This commit is contained in:
Sebastian Goscik
2016-06-30 17:29:59 +01:00
parent e258999e0a
commit b0e500e2a8
11 changed files with 301 additions and 41 deletions

View File

@@ -17,7 +17,6 @@ import os
from collections import OrderedDict
from wlauto import Instrument, Parameter
from wlauto.exceptions import ConfigError, InstrumentError
from wlauto.utils.misc import merge_dicts
from wlauto.utils.types import caseless_string
@@ -132,13 +131,13 @@ class FreqSweep(Instrument):
for freq in sweep_spec['frequencies']:
spec = old_spec.copy()
if 'runtime_params' in sweep_spec:
spec.runtime_parameters = merge_dicts(spec.runtime_parameters,
sweep_spec['runtime_params'],
dict_type=OrderedDict)
spec.runtime_parameters = spec.runtime_parameters.copy()
spec.runtime_parameters.update(sweep_spec['runtime_params'])
if 'workload_params' in sweep_spec:
spec.workload_parameters = merge_dicts(spec.workload_parameters,
sweep_spec['workload_params'],
dict_type=OrderedDict)
spec.workload_parameters = spec.workload_parameters.copy()
spec.workload_parameters.update(sweep_spec['workload_params'])
spec.runtime_parameters['{}_governor'.format(sweep_spec['cluster'])] = "userspace"
spec.runtime_parameters['{}_frequency'.format(sweep_spec['cluster'])] = freq
spec.id = '{}_{}_{}'.format(spec.id, sweep_spec['label'], freq)