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

framework/config: rename instrumenation --> augmentations

Browse Source 
Rename ConfigurationPoint "instrumenation" to "augmentations". Unlike
WA2, in W3, instruments and result_porcessors are handled identically in
configuration (though there're still distinct pulgin types).
"instrumentation" and "result_porcessors" entries in configuration are
now aliases for the same configuration point, which is renamed to
"augmentations" to reflect the fact that it contains both types of
plugins.
This commit is contained in:
Sergei Trofimov 2017-11-03 15:52:49 +00:00 committed by setrofim
parent 2ff1a87e53
commit 337c5e5e1d
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wa/framework/configuration/core.py
View File

@ -894,11 +894,15 @@ class JobSpec(Configuration):
name. For example, the csv result processor will put
the label in the "workload" column of the CSV file.
'''),
ConfigurationPoint('instrumentation', kind=toggle_set, merge=True,
aliases=["instruments"],
ConfigurationPoint('augmentations', kind=toggle_set, merge=True,
aliases=["instruments", "processors", "instrumentation",
"result_processors", "augment"],
description='''
The instruments to enable (or disabled using a ~)
during this workload spec.
The instruments and result processors to enable (or
disabled using a ~) during this workload spec. This combines the
"instrumentation" and "result_processors" from
previous versions of WA (the old entries are now
aliases for this).
'''),
ConfigurationPoint('flash', kind=dict, merge=True,
description='''
@ -1039,7 +1043,7 @@ class JobGenerator(object):
def set_global_value(self, name, value):
JobSpec.configuration[name].set_value(self.job_spec_template, value,
check_mandatory=False)
if name == "instrumentation":
if name == "augmentations":
self.update_enabled_instruments(value)
def add_section(self, section, workloads):
@ -1090,7 +1094,7 @@ class JobGenerator(object):
def create_job_spec(workload_entry, sections, target_manager, plugin_cache,
disabled_instruments):
disabled_augmentations):
job_spec = JobSpec()
# PHASE 2.1: Merge general job spec configuration
@ -1105,8 +1109,8 @@ def create_job_spec(workload_entry, sections, target_manager, plugin_cache,
job_spec.merge_runtime_parameters(plugin_cache, target_manager)
target_manager.validate_runtime_parameters(job_spec.runtime_parameters)
# PHASE 2.4: Disable globally disabled instrumentation
job_spec.set("instrumentation", disabled_instruments)
# PHASE 2.4: Disable globally disabled augmentations
job_spec.set("augmentations", disabled_augmentations)
job_spec.finalize()
return job_spec

8
wa/framework/configuration/parsers.py
View File

@ -207,7 +207,7 @@ def _load_file(filepath, error_name):
def merge_result_processors_instruments(raw):
instr_config = JobSpec.configuration['instrumentation']
instr_config = JobSpec.configuration['augmentations']
instruments = toggle_set(pop_aliased_param(instr_config, raw, default=[]))
result_processors = toggle_set(raw.pop('result_processors', []))
if instruments and result_processors:
@ -217,7 +217,7 @@ def merge_result_processors_instruments(raw):
'conflicting entries: {}'
entires = ', '.join('"{}"'.format(c.strip("~")) for c in conflicts)
raise ConfigError(msg.format(entires))
raw['instrumentation'] = instruments.merge_with(result_processors)
raw['augmentations'] = instruments.merge_with(result_processors)
def _pop_aliased(d, names, entry_id):
@ -257,8 +257,8 @@ def _construct_valid_entry(raw, seen_ids, prefix, jobs_config):
cfg_point.validate_value(name, value)
workload_entry[name] = value
if "instrumentation" in workload_entry:
jobs_config.update_enabled_instruments(workload_entry["instrumentation"])
if "augmentations" in workload_entry:
jobs_config.update_enabled_augmentations(workload_entry["augmentations"])
# error if there are unknown workload_entry
if raw: