normalized agenda files

47 files changed, 651 insertions, 466 deletions

diff --git a/templates/15only_quadrant.yaml b/templates/15only_quadrant.yaml
deleted file mode 100644
index 1231e97..0000000
--- a/templates/15only_quadrant.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-global: 
-        iterations: 1
-workloads:
-        - id: 1j_a15
-          workload_name: quadrant
-          boot_parameters:
-                os_mode: mp_a15_only
-          runtime_parameters:
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
-
diff --git a/templates/a15only_andbench.yaml b/templates/a15only_andbench.yaml
deleted file mode 100644
index b1eb08a..0000000
--- a/templates/a15only_andbench.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-global: 
-        iterations: 1
-workloads:
-        - id: 1a_a15
-          workload_name: andebench
-          workload_parameters:
-                number_of_threads: 1
-          boot_parameters:
-                os_mode: mp_a15_only
-          runtime_parameters:
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
diff --git a/templates/a15only_andbench_5t.yaml b/templates/a15only_andbench_5t.yaml
deleted file mode 100644
index 81a5fdf..0000000
--- a/templates/a15only_andbench_5t.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-global: 
-        iterations: 1
-workloads:
-        - id: 1a_a15
-          workload_name: andebench
-          workload_parameters:
-                number_of_threads: 5
-          boot_parameters:
-                os_mode: mp_a15_only
-          runtime_parameters:
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
diff --git a/templates/a15only_andbench_t1.yaml b/templates/a15only_andbench_t1.yaml
new file mode 100644
index 0000000..583821c
--- /dev/null
+++ b/templates/a15only_andbench_t1.yaml
@@ -0,0 +1,17 @@
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
+workloads:
+-   boot_parameters:
+        os_mode: mp_a15_only
+    id: 1a_a15
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+    workload_name: andebench
+    workload_parameters:
+        number_of_threads: 1
diff --git a/templates/a15only_andbench_t5.yaml b/templates/a15only_andbench_t5.yaml
new file mode 100644
index 0000000..58e0c2f
--- /dev/null
+++ b/templates/a15only_andbench_t5.yaml
@@ -0,0 +1,17 @@
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
+workloads:
+-   boot_parameters:
+        os_mode: mp_a15_only
+    id: 1a_a15
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+    workload_name: andebench
+    workload_parameters:
+        number_of_threads: 5
diff --git a/templates/a15only_antutu_4.0.3.yaml b/templates/a15only_antutu_4.0.3.yaml
index 8110fba..9513fc6 100644
--- a/templates/a15only_antutu_4.0.3.yaml
+++ b/templates/a15only_antutu_4.0.3.yaml
@@ -1,13 +1,18 @@
-global: 
-        iterations: 5
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 5
 workloads:
-        - id: 1c_a15
-          workload_name: antutu
-          label: antutu4.0.3
-          workload_parameters:
-                version: 4.0.3
-          boot_parameters:
-                os_mode: mp_a15_only
-          runtime_parameters:
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
+-   boot_parameters:
+        os_mode: mp_a15_only
+    id: 1c_a15
+    label: antutu4.0.3
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+    workload_name: antutu
+    workload_parameters:
+        version: 4.0.3
diff --git a/templates/a15only_audio.yaml b/templates/a15only_audio.yaml
index c2cf759..11e15fe 100644
--- a/templates/a15only_audio.yaml
+++ b/templates/a15only_audio.yaml
@@ -1,13 +1,15 @@
-global: 
-        iterations: 1
 config:
-        result_processors: [csv, sqlite]
-        sqlite_database: ~/my_results.db
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 1b_a15_audio
-          workload_name: audio
-          boot_parameters:
-                os_mode: mp_a15_only
-          runtime_parameters:
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
+-   boot_parameters:
+        os_mode: mp_a15_only
+    id: 1b_a15_audio
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+    workload_name: audio
diff --git a/templates/a15only_bbench_audio.yaml b/templates/a15only_bbench_audio.yaml
index b5137c6..292b506 100644
--- a/templates/a15only_bbench_audio.yaml
+++ b/templates/a15only_bbench_audio.yaml
@@ -1,15 +1,17 @@
-global: 
-        iterations: 1 
 config:
-        result_processors: [csv, sqlite]
-        sqlite_database: ~/my_results.db
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 1a_a15_bbench_audio
-          workload_name: bbench
-          workload_parameters:
-                    with_audio: true
-          boot_parameters:
-                os_mode: mp_a15_only
-          runtime_parameters:
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
+-   boot_parameters:
+        os_mode: mp_a15_only
+    id: 1a_a15_bbench_audio
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+    workload_name: bbench
+    workload_parameters:
+        with_audio: true
diff --git a/templates/a15only_benchmarkpi.yaml b/templates/a15only_benchmarkpi.yaml
index ee249c9..1f7395b 100644
--- a/templates/a15only_benchmarkpi.yaml
+++ b/templates/a15only_benchmarkpi.yaml
@@ -1,11 +1,15 @@
-global: 
-        iterations: 5
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 5
 workloads:
-        - id: 1e_a15
-          workload_name: benchmarkpi
-          boot_parameters:
-                os_mode: mp_a15_only
-          runtime_parameters:
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
-
+-   boot_parameters:
+        os_mode: mp_a15_only
+    id: 1e_a15
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+    workload_name: benchmarkpi
diff --git a/templates/a15only_caffeinemark.yaml b/templates/a15only_caffeinemark.yaml
index 7c5aa85..aacc195 100644
--- a/templates/a15only_caffeinemark.yaml
+++ b/templates/a15only_caffeinemark.yaml
@@ -1,11 +1,15 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 1f_a15
-          workload_name: caffeinemark
-          boot_parameters:
-                os_mode: mp_a15_only
-          runtime_parameters:
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
-
+-   boot_parameters:
+        os_mode: mp_a15_only
+    id: 1f_a15
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+    workload_name: caffeinemark
diff --git a/templates/a15only_cfbench.yaml b/templates/a15only_cfbench.yaml
index 6d194e4..9d9af28 100644
--- a/templates/a15only_cfbench.yaml
+++ b/templates/a15only_cfbench.yaml
@@ -1,11 +1,15 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 1g_a15
-          workload_name: cfbench
-          boot_parameters:
-                os_mode: mp_a15_only
-          runtime_parameters:
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
-
+-   boot_parameters:
+        os_mode: mp_a15_only
+    id: 1g_a15
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+    workload_name: cfbench
diff --git a/templates/a15only_geekbench3.yaml b/templates/a15only_geekbench3.yaml
index 6b3d1d4..6fadee0 100644
--- a/templates/a15only_geekbench3.yaml
+++ b/templates/a15only_geekbench3.yaml
@@ -1,14 +1,18 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 1h_a15
-          workload_name: geekbench
-          label: geekbench3
-          workload_parameters:
-                version: 3
-          boot_parameters:
-                os_mode: mp_a15_only
-          runtime_parameters:
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
-
+-   boot_parameters:
+        os_mode: mp_a15_only
+    id: 1h_a15
+    label: geekbench3
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+    workload_name: geekbench
+    workload_parameters:
+        version: 3
diff --git a/templates/a15only_linpack.yaml b/templates/a15only_linpack.yaml
index c9a5ca0..4e2328b 100644
--- a/templates/a15only_linpack.yaml
+++ b/templates/a15only_linpack.yaml
@@ -1,11 +1,15 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 1i_a15
-          workload_name: linpack
-          boot_parameters:
-                os_mode: mp_a15_only
-          runtime_parameters:
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
-
+-   boot_parameters:
+        os_mode: mp_a15_only
+    id: 1i_a15
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+    workload_name: linpack
diff --git a/templates/a15only_quadrant.yaml b/templates/a15only_quadrant.yaml
new file mode 100644
index 0000000..bb9eca7
--- /dev/null
+++ b/templates/a15only_quadrant.yaml
@@ -0,0 +1,15 @@
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
+workloads:
+-   boot_parameters:
+        os_mode: mp_a15_only
+    id: 1j_a15
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+    workload_name: quadrant
diff --git a/templates/a15only_smartbench.yaml b/templates/a15only_smartbench.yaml
index daba20f..1ffe1d5 100644
--- a/templates/a15only_smartbench.yaml
+++ b/templates/a15only_smartbench.yaml
@@ -1,11 +1,15 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 1k_a15
-          workload_name: smartbench
-          boot_parameters:
-                os_mode: mp_a15_only
-          runtime_parameters:
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
-
+-   boot_parameters:
+        os_mode: mp_a15_only
+    id: 1k_a15
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+    workload_name: smartbench
diff --git a/templates/a15only_sqlite.yaml b/templates/a15only_sqlite.yaml
index 0892038..0a36f4c 100644
--- a/templates/a15only_sqlite.yaml
+++ b/templates/a15only_sqlite.yaml
@@ -1,11 +1,15 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 1l_a15
-          workload_name: sqlite
-          boot_parameters:
-                os_mode: mp_a15_only
-          runtime_parameters:
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
-
+-   boot_parameters:
+        os_mode: mp_a15_only
+    id: 1l_a15
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+    workload_name: sqlite
diff --git a/templates/a15only_vellamo.yaml b/templates/a15only_vellamo.yaml
index 6888356..135c4bd 100644
--- a/templates/a15only_vellamo.yaml
+++ b/templates/a15only_vellamo.yaml
@@ -1,11 +1,15 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 1o_a15
-          workload_name: vellamo
-          boot_parameters:
-                os_mode: mp_a15_only
-          runtime_parameters:
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
-
+-   boot_parameters:
+        os_mode: mp_a15_only
+    id: 1o_a15
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+    workload_name: vellamo
diff --git a/templates/a7only_audio.yaml b/templates/a7only_audio.yaml
index 32ffbbf..f0be43e 100644
--- a/templates/a7only_audio.yaml
+++ b/templates/a7only_audio.yaml
@@ -1,14 +1,16 @@
-global: 
-        iterations: 1
 config:
-        result_processors: [csv, sqlite]
-        sqlite_database: ~/my_results.db
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 4b_a7_audio
-          workload_name: audio
-          boot_parameters:
-                os_mode: mp_a7_only
-          runtime_parameters:
-                a7_min_frequency: 500000
-                a7_governor_tunables:
-                        above_hispeed_delay: 20000
+-   boot_parameters:
+        os_mode: mp_a7_only
+    id: 4b_a7_audio
+    runtime_parameters:
+        a7_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_min_frequency: 500000
+    workload_name: audio
diff --git a/templates/a7only_bbench_audio.yaml b/templates/a7only_bbench_audio.yaml
index 4f835f9..3a2586d 100644
--- a/templates/a7only_bbench_audio.yaml
+++ b/templates/a7only_bbench_audio.yaml
@@ -1,16 +1,18 @@
-global: 
-        iterations: 1
 config:
-        result_processors: [csv, sqlite]
-        sqlite_database: ~/my_results.db
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 4a_a7_bbench_audio
-          workload_name: bbench
-          workload_parameters:
-                    with_audio: true
-          boot_parameters:
-                os_mode: mp_a7_only
-          runtime_parameters:
-                a7_min_frequency: 500000
-                a7_governor_tunables:
-                        above_hispeed_delay: 20000
+-   boot_parameters:
+        os_mode: mp_a7_only
+    id: 4a_a7_bbench_audio
+    runtime_parameters:
+        a7_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_min_frequency: 500000
+    workload_name: bbench
+    workload_parameters:
+        with_audio: true
diff --git a/templates/hmp_andbench_t1.yaml b/templates/hmp_andbench_t1.yaml
index aa8d3e8..8e95d52 100644
--- a/templates/hmp_andbench_t1.yaml
+++ b/templates/hmp_andbench_t1.yaml
@@ -1,16 +1,20 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 2a_a7bc
-          workload_name: andebench
-          workload_parameters:
-                number_of_threads: 1
-          boot_parameters:
-                os_mode: mp_a7_bootcluster
-          runtime_parameters:
-                a7_min_frequency: 500000
-                a7_governor_tunables:
-                        above_hispeed_delay: 20000
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
-
+-   boot_parameters:
+        os_mode: mp_a7_bootcluster
+    id: 2a_a7bc
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_min_frequency: 500000
+    workload_name: andebench
+    workload_parameters:
+        number_of_threads: 1
diff --git a/templates/hmp_andbench_t5.yaml b/templates/hmp_andbench_t5.yaml
index 1e7ade9..d031404 100644
--- a/templates/hmp_andbench_t5.yaml
+++ b/templates/hmp_andbench_t5.yaml
@@ -1,16 +1,20 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 2a_a7bc
-          workload_name: andebench
-          workload_parameters:
-                number_of_threads: 5
-          boot_parameters:
-                os_mode: mp_a7_bootcluster
-          runtime_parameters:
-                a7_min_frequency: 500000
-                a7_governor_tunables:
-                        above_hispeed_delay: 20000
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
-
+-   boot_parameters:
+        os_mode: mp_a7_bootcluster
+    id: 2a_a7bc
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_min_frequency: 500000
+    workload_name: andebench
+    workload_parameters:
+        number_of_threads: 5
diff --git a/templates/hmp_antutu_4.0.3.yaml b/templates/hmp_antutu_4.0.3.yaml
index 59da903..0f6a7f0 100644
--- a/templates/hmp_antutu_4.0.3.yaml
+++ b/templates/hmp_antutu_4.0.3.yaml
@@ -1,16 +1,21 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 2c_a7bc
-          workload_name: antutu
-          label: antutu4.0.3
-          workload_parameters:
-                version: 4.0.3
-          boot_parameters:
-                os_mode: mp_a7_bootcluster
-          runtime_parameters:
-                a7_min_frequency: 500000
-                a7_governor_tunables:
-                        above_hispeed_delay: 20000
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
+-   boot_parameters:
+        os_mode: mp_a7_bootcluster
+    id: 2c_a7bc
+    label: antutu4.0.3
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_min_frequency: 500000
+    workload_name: antutu
+    workload_parameters:
+        version: 4.0.3
diff --git a/templates/hmp_audio.yaml b/templates/hmp_audio.yaml
index c0188b6..83431a4 100644
--- a/templates/hmp_audio.yaml
+++ b/templates/hmp_audio.yaml
@@ -1,16 +1,18 @@
-global: 
-        iterations: 1 
 config:
-        result_processors: [csv, sqlite]
-        sqlite_database: ~/my_results.db
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 2b_a7bc_audio
-          workload_name: audio
-          boot_parameters:
-                os_mode: mp_a7_bootcluster
-          runtime_parameters:
-                a7_min_frequency: 500000
-                a7_governor_tunables:
-                        above_hispeed_delay: 20000
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
+-   boot_parameters:
+        os_mode: mp_a7_bootcluster
+    id: 2b_a7bc_audio
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_min_frequency: 500000
+    workload_name: audio
diff --git a/templates/hmp_bbench_audio.yaml b/templates/hmp_bbench_audio.yaml
index 9255d5c..68e3a10 100644
--- a/templates/hmp_bbench_audio.yaml
+++ b/templates/hmp_bbench_audio.yaml
@@ -1,18 +1,20 @@
-global: 
-        iterations: 1
 config:
-        result_processors: [csv, sqlite]
-        sqlite_database: ~/my_results.db
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 2a_a7bc_bbench_audio
-          workload_name: bbench
-          workload_parameters:
-                    with_audio: true
-          boot_parameters:
-                os_mode: mp_a7_bootcluster
-          runtime_parameters:
-                a7_min_frequency: 500000
-                a7_governor_tunables:
-                        above_hispeed_delay: 20000
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
+-   boot_parameters:
+        os_mode: mp_a7_bootcluster
+    id: 2a_a7bc_bbench_audio
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_min_frequency: 500000
+    workload_name: bbench
+    workload_parameters:
+        with_audio: true
diff --git a/templates/hmp_benchmarkpi.yaml b/templates/hmp_benchmarkpi.yaml
index 52426b0..3c13d58 100644
--- a/templates/hmp_benchmarkpi.yaml
+++ b/templates/hmp_benchmarkpi.yaml
@@ -1,13 +1,18 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 2e_a7bc
-          workload_name: benchmarkpi
-          boot_parameters:
-                os_mode: mp_a7_bootcluster
-          runtime_parameters:
-                a7_min_frequency: 500000
-                a7_governor_tunables:
-                        above_hispeed_delay: 20000
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
+-   boot_parameters:
+        os_mode: mp_a7_bootcluster
+    id: 2e_a7bc
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_min_frequency: 500000
+    workload_name: benchmarkpi
diff --git a/templates/hmp_caffeinemark.yaml b/templates/hmp_caffeinemark.yaml
index 04a0a2f..573ddf5 100644
--- a/templates/hmp_caffeinemark.yaml
+++ b/templates/hmp_caffeinemark.yaml
@@ -1,13 +1,18 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 2f_a7bc
-          workload_name: caffeinemark
-          boot_parameters:
-                os_mode: mp_a7_bootcluster
-          runtime_parameters:
-                a7_min_frequency: 500000
-                a7_governor_tunables:
-                        above_hispeed_delay: 20000
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
+-   boot_parameters:
+        os_mode: mp_a7_bootcluster
+    id: 2f_a7bc
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_min_frequency: 500000
+    workload_name: caffeinemark
diff --git a/templates/hmp_cfbench.yaml b/templates/hmp_cfbench.yaml
index 48772e2..665d79a 100644
--- a/templates/hmp_cfbench.yaml
+++ b/templates/hmp_cfbench.yaml
@@ -1,13 +1,18 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 2g_a7bc
-          workload_name: cfbench
-          boot_parameters:
-                os_mode: mp_a7_bootcluster
-          runtime_parameters:
-                a7_min_frequency: 500000
-                a7_governor_tunables:
-                        above_hispeed_delay: 20000
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
+-   boot_parameters:
+        os_mode: mp_a7_bootcluster
+    id: 2g_a7bc
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_min_frequency: 500000
+    workload_name: cfbench
diff --git a/templates/hmp_geekbench3.yaml b/templates/hmp_geekbench3.yaml
index 6c96657..4ab86c9 100644
--- a/templates/hmp_geekbench3.yaml
+++ b/templates/hmp_geekbench3.yaml
@@ -1,16 +1,21 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 2h_a7bc
-          workload_name: geekbench
-          label: geekbench3
-          workload_parameters:
-                version: 3
-          boot_parameters:
-                os_mode: mp_a7_bootcluster
-          runtime_parameters:
-                a7_min_frequency: 500000
-                a7_governor_tunables:
-                        above_hispeed_delay: 20000
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
+-   boot_parameters:
+        os_mode: mp_a7_bootcluster
+    id: 2h_a7bc
+    label: geekbench3
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_min_frequency: 500000
+    workload_name: geekbench
+    workload_parameters:
+        version: 3
diff --git a/templates/hmp_linpack.yaml b/templates/hmp_linpack.yaml
index 567f9ef..7019653 100644
--- a/templates/hmp_linpack.yaml
+++ b/templates/hmp_linpack.yaml
@@ -1,13 +1,18 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 2i_a7bc
-          workload_name: linpack
-          boot_parameters:
-                os_mode: mp_a7_bootcluster
-          runtime_parameters:
-                a7_min_frequency: 500000
-                a7_governor_tunables:
-                        above_hispeed_delay: 20000
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
+-   boot_parameters:
+        os_mode: mp_a7_bootcluster
+    id: 2i_a7bc
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_min_frequency: 500000
+    workload_name: linpack
diff --git a/templates/hmp_quadrant.yaml b/templates/hmp_quadrant.yaml
index 737c49e..a0ca5ea 100644
--- a/templates/hmp_quadrant.yaml
+++ b/templates/hmp_quadrant.yaml
@@ -1,13 +1,18 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 2j_a7bc
-          workload_name: quadrant
-          boot_parameters:
-                os_mode: mp_a7_bootcluster
-          runtime_parameters:
-                a7_min_frequency: 500000
-                a7_governor_tunables:
-                        above_hispeed_delay: 20000
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
+-   boot_parameters:
+        os_mode: mp_a7_bootcluster
+    id: 2j_a7bc
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_min_frequency: 500000
+    workload_name: quadrant
diff --git a/templates/hmp_smartbench.yaml b/templates/hmp_smartbench.yaml
index c5d2f34..41d4acf 100644
--- a/templates/hmp_smartbench.yaml
+++ b/templates/hmp_smartbench.yaml
@@ -1,13 +1,18 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 2k_a7bc
-          workload_name: smartbench
-          boot_parameters:
-                os_mode: mp_a7_bootcluster
-          runtime_parameters:
-                a7_min_frequency: 500000
-                a7_governor_tunables:
-                        above_hispeed_delay: 20000
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
+-   boot_parameters:
+        os_mode: mp_a7_bootcluster
+    id: 2k_a7bc
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_min_frequency: 500000
+    workload_name: smartbench
diff --git a/templates/hmp_sqlite.yaml b/templates/hmp_sqlite.yaml
index 3357bd6..7ec5565 100644
--- a/templates/hmp_sqlite.yaml
+++ b/templates/hmp_sqlite.yaml
@@ -1,13 +1,18 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 2l_a7bc
-          workload_name: sqlite
-          boot_parameters:
-                os_mode: mp_a7_bootcluster
-          runtime_parameters:
-                a7_min_frequency: 500000
-                a7_governor_tunables:
-                        above_hispeed_delay: 20000
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
+-   boot_parameters:
+        os_mode: mp_a7_bootcluster
+    id: 2l_a7bc
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_min_frequency: 500000
+    workload_name: sqlite
diff --git a/templates/hmp_vellamo.yaml b/templates/hmp_vellamo.yaml
index 5f94e43..b5b883e 100644
--- a/templates/hmp_vellamo.yaml
+++ b/templates/hmp_vellamo.yaml
@@ -1,13 +1,18 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 2o_a7bc
-          workload_name: vellamo
-          boot_parameters:
-                os_mode: mp_a7_bootcluster
-          runtime_parameters:
-                a7_min_frequency: 500000
-                a7_governor_tunables:
-                        above_hispeed_delay: 20000
-                a15_governor_tunables:
-                        above_hispeed_delay: 20000
+-   boot_parameters:
+        os_mode: mp_a7_bootcluster
+    id: 2o_a7bc
+    runtime_parameters:
+        a15_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_governor_tunables:
+            above_hispeed_delay: 20000
+        a7_min_frequency: 500000
+    workload_name: vellamo
diff --git a/templates/iks_andbench_t1.yaml b/templates/iks_andbench_t1.yaml
index 7f16616..d086720 100644
--- a/templates/iks_andbench_t1.yaml
+++ b/templates/iks_andbench_t1.yaml
@@ -1,9 +1,14 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 3a_iks
-          workload_name: andebench
-          workload_parameters:
-                number_of_threads: 1
-          boot_parameters:
-                os_mode: iks_cpu
+-   boot_parameters:
+        os_mode: iks_cpu
+    id: 3a_iks
+    workload_name: andebench
+    workload_parameters:
+        number_of_threads: 1
diff --git a/templates/iks_andbench_t5.yaml b/templates/iks_andbench_t5.yaml
index dcd7ed8..f91ede0 100644
--- a/templates/iks_andbench_t5.yaml
+++ b/templates/iks_andbench_t5.yaml
@@ -1,9 +1,14 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 3b_iks
-          workload_name: andebench
-          workload_parameters:
-                number_of_threads: 1
-          boot_parameters:
-                os_mode: iks_cpu
+-   boot_parameters:
+        os_mode: iks_cpu
+    id: 3b_iks
+    workload_name: andebench
+    workload_parameters:
+        number_of_threads: 1
diff --git a/templates/iks_antutu_4.0.3.yaml b/templates/iks_antutu_4.0.3.yaml
index bd739ae..9f170af 100644
--- a/templates/iks_antutu_4.0.3.yaml
+++ b/templates/iks_antutu_4.0.3.yaml
@@ -1,10 +1,15 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 3c_iks
-          workload_name: antutu
-          label: antutu4.0.3
-          workload_parameters:
-                version: 4.0.3
-          boot_parameters:
-                os_mode: iks_cpu
+-   boot_parameters:
+        os_mode: iks_cpu
+    id: 3c_iks
+    label: antutu4.0.3
+    workload_name: antutu
+    workload_parameters:
+        version: 4.0.3
diff --git a/templates/iks_audio.yaml b/templates/iks_audio.yaml
index 7e51a55..8af2972 100644
--- a/templates/iks_audio.yaml
+++ b/templates/iks_audio.yaml
@@ -1,10 +1,12 @@
-global: 
-        iterations: 1 
 config:
-        result_processors: [csv, sqlite]
-        sqlite_database: ~/my_results.db
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 3b_iks_audio
-          workload_name: audio
-          boot_parameters:
-                os_mode: iks_cpu
+-   boot_parameters:
+        os_mode: iks_cpu
+    id: 3b_iks_audio
+    workload_name: audio
diff --git a/templates/iks_bbench_audio.yaml b/templates/iks_bbench_audio.yaml
index 20b649b..8979f50 100644
--- a/templates/iks_bbench_audio.yaml
+++ b/templates/iks_bbench_audio.yaml
@@ -1,12 +1,14 @@
-global: 
-        iterations: 1 
 config:
-        result_processors: [csv, sqlite]
-        sqlite_database: ~/my_results.db
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 3a_iks_bbench_audio
-          workload_name: bbench
-          workload_parameters:
-                    with_audio: true
-          boot_parameters:
-                os_mode: iks_cpu
+-   boot_parameters:
+        os_mode: iks_cpu
+    id: 3a_iks_bbench_audio
+    workload_name: bbench
+    workload_parameters:
+        with_audio: true
diff --git a/templates/iks_benchmarkpi.yaml b/templates/iks_benchmarkpi.yaml
index e34dbf2..a77daa5 100644
--- a/templates/iks_benchmarkpi.yaml
+++ b/templates/iks_benchmarkpi.yaml
@@ -1,7 +1,12 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 3e_iks
-          workload_name: benchmarkpi
-          boot_parameters:
-                os_mode: iks_cpu
+-   boot_parameters:
+        os_mode: iks_cpu
+    id: 3e_iks
+    workload_name: benchmarkpi
diff --git a/templates/iks_caffeinemark.yaml b/templates/iks_caffeinemark.yaml
index 0fb40ce..7e5e7a6 100644
--- a/templates/iks_caffeinemark.yaml
+++ b/templates/iks_caffeinemark.yaml
@@ -1,7 +1,12 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 3f_iks
-          workload_name: caffeinemark
-          boot_parameters:
-                os_mode: iks_cpu
+-   boot_parameters:
+        os_mode: iks_cpu
+    id: 3f_iks
+    workload_name: caffeinemark
diff --git a/templates/iks_cfbench.yaml b/templates/iks_cfbench.yaml
index 3244d8b..3d4621f 100644
--- a/templates/iks_cfbench.yaml
+++ b/templates/iks_cfbench.yaml
@@ -1,7 +1,12 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 3g_iks
-          workload_name: cfbench
-          boot_parameters:
-                os_mode: iks_cpu
+-   boot_parameters:
+        os_mode: iks_cpu
+    id: 3g_iks
+    workload_name: cfbench
diff --git a/templates/iks_geekbench3.yaml b/templates/iks_geekbench3.yaml
index 3dc56e0..6418148 100644
--- a/templates/iks_geekbench3.yaml
+++ b/templates/iks_geekbench3.yaml
@@ -1,10 +1,15 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 3h_iks
-          workload_name: geekbench
-          label: geekbench3
-          workload_parameters:
-                version: 3
-          boot_parameters:
-                os_mode: iks_cpu
+-   boot_parameters:
+        os_mode: iks_cpu
+    id: 3h_iks
+    label: geekbench3
+    workload_name: geekbench
+    workload_parameters:
+        version: 3
diff --git a/templates/iks_linpack.yaml b/templates/iks_linpack.yaml
index 320adad..49093a7 100644
--- a/templates/iks_linpack.yaml
+++ b/templates/iks_linpack.yaml
@@ -1,7 +1,12 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 3i_iks
-          workload_name: linpack
-          boot_parameters:
-                os_mode: iks_cpu
+-   boot_parameters:
+        os_mode: iks_cpu
+    id: 3i_iks
+    workload_name: linpack
diff --git a/templates/iks_quadrant.yaml b/templates/iks_quadrant.yaml
index 2131a16..87299bd 100644
--- a/templates/iks_quadrant.yaml
+++ b/templates/iks_quadrant.yaml
@@ -1,7 +1,12 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 3j_iks
-          workload_name: quadrant
-          boot_parameters:
-                os_mode: iks_cpu
+-   boot_parameters:
+        os_mode: iks_cpu
+    id: 3j_iks
+    workload_name: quadrant
diff --git a/templates/iks_smartbench.yaml b/templates/iks_smartbench.yaml
index c8eff1b..dcee398 100644
--- a/templates/iks_smartbench.yaml
+++ b/templates/iks_smartbench.yaml
@@ -1,7 +1,12 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 3k_iks
-          workload_name: smartbench
-          boot_parameters:
-                os_mode: iks_cpu
+-   boot_parameters:
+        os_mode: iks_cpu
+    id: 3k_iks
+    workload_name: smartbench
diff --git a/templates/iks_sqlite.yaml b/templates/iks_sqlite.yaml
index b8b5753..fb7965c 100644
--- a/templates/iks_sqlite.yaml
+++ b/templates/iks_sqlite.yaml
@@ -1,7 +1,12 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 3l_iks
-          workload_name: sqlite
-          boot_parameters:
-                os_mode: iks_cpu
+-   boot_parameters:
+        os_mode: iks_cpu
+    id: 3l_iks
+    workload_name: sqlite
diff --git a/templates/iks_vellamo.yaml b/templates/iks_vellamo.yaml
index 43ff067..25cddad 100644
--- a/templates/iks_vellamo.yaml
+++ b/templates/iks_vellamo.yaml
@@ -1,7 +1,12 @@
-global: 
-        iterations: 1
+config:
+    result_processors:
+    - csv
+    - sqlite
+    sqlite_database: my_database.db
+global:
+    iterations: 1
 workloads:
-        - id: 3o_iks
-          workload_name: vellamo
-          boot_parameters:
-                os_mode: iks_cpu
+-   boot_parameters:
+        os_mode: iks_cpu
+    id: 3o_iks
+    workload_name: vellamo