From 5b03ac3afdd6f51c842b1369bd8389aa0e683ec3 Mon Sep 17 00:00:00 2001
From: sergei Trofimov <sergei.trofimov@arm.com>
Date: Fri, 27 Apr 2018 14:15:20 +0100
Subject: [PATCH] config/core: JobsGenerator: delay augmentation split

Delay the split of augmentations into instruments and output processors
until they are actually being accessed; keep them as a single set until
then. This makes tracking of merges from various configurations sources
easier
---
 wa/framework/configuration/core.py | 50 ++++++++++++++----------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/wa/framework/configuration/core.py b/wa/framework/configuration/core.py
index 233ef8de..e335d829 100644
--- a/wa/framework/configuration/core.py
+++ b/wa/framework/configuration/core.py
@@ -897,23 +897,35 @@ class JobGenerator(object):
 
     @property
     def enabled_instruments(self):
-        self._read_enabled_instruments = True
-        return self._enabled_instruments.values()
+        self._read_augmentations = True
+        if self._enabled_instruments is None:
+            self._enabled_instruments = []
+            for entry in self._enabled_augmentations.merge_with(self.disabled_augmentations).values():
+                entry_cls = self.plugin_cache.get_plugin_class(entry)
+                if entry_cls.kind == 'instrument':
+                    self._enabled_instruments.append(entry)
+        return self._enabled_instruments
 
     @property
     def enabled_processors(self):
-        self._read_enabled_processors = True
-        return self._enabled_processors.values()
+        self._read_augmentations = True
+        if self._enabled_processors is None:
+            self._enabled_processors = []
+            for entry in self._enabled_augmentations.merge_with(self.disabled_augmentations).values():
+                entry_cls = self.plugin_cache.get_plugin_class(entry)
+                if entry_cls.kind == 'output_processor':
+                    self._enabled_processors.append(entry)
+        return self._enabled_processors
 
     def __init__(self, plugin_cache):
         self.plugin_cache = plugin_cache
         self.ids_to_run = []
         self.sections = []
         self.workloads = []
-        self._enabled_instruments = toggle_set()
-        self._enabled_processors = toggle_set()
-        self._read_enabled_instruments = False
-        self._read_enabled_processors = False
+        self._enabled_augmentations = toggle_set()
+        self._enabled_instruments = None
+        self._enabled_processors = None
+        self._read_augmentations = False
         self.disabled_augmentations = set()
 
         self.job_spec_template = obj_dict(not_in_dict=['name'])
@@ -954,24 +966,10 @@ class JobGenerator(object):
         self.disabled_augmentations = self.disabled_augmentations.union(augmentations)
 
     def update_augmentations(self, value):
-        for entry in value:
-            entry_name = entry[1:] if entry.startswith('~') else entry
-            entry_cls = self.plugin_cache.get_plugin_class(entry_name)
-            if entry_cls.kind == 'instrument':
-                if self._read_enabled_instruments:
-                    msg = "'enabled_instruments' cannot be updated after it has been accessed"
-                    raise RuntimeError(msg)
-                self._enabled_instruments.add(entry)
-            elif entry_cls.kind == 'output_processor':
-                if self._read_enabled_processors:
-                    msg = "'enabled_processors' cannot be updated after it has been accessed"
-                    raise RuntimeError(msg)
-                self._enabled_processors.add(entry)
-            else:
-                msg = 'Unknown augmentation type: {}'
-                raise ConfigError(msg.format(entry_cls.kind))
-        self._enabled_instruments = self._enabled_instruments.merge_with(self.disabled_augmentations)
-        self._enabled_processors = self._enabled_processors.merge_with(self.disabled_augmentations)
+        if self._read_augmentations:
+            msg = 'Cannot update augmentations after they have been accessed'
+            raise RuntimeError(msg)
+        self._enabled_augmentations = self._enabled_augmentations.merge_with(value)
 
     def only_run_ids(self, ids):
         if isinstance(ids, str):