Merge "TC2: set interactive governor for all tests"

30 files changed, 287 insertions, 107 deletions

diff --git a/templates/a15only_andbench_t1.yaml b/templates/a15only_andbench_t1.yaml
index 89af235..f68888a 100644
--- a/templates/a15only_andbench_t1.yaml
+++ b/templates/a15only_andbench_t1.yaml
@@ -6,8 +6,14 @@ global:
 workloads:
   - id: 1a_a15
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 0
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 0
+            /sys/devices/system/cpu/cpu4/online: 0
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/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
index bfc4673..7739801 100644
--- a/templates/a15only_andbench_t5.yaml
+++ b/templates/a15only_andbench_t5.yaml
@@ -6,8 +6,14 @@ global:
 workloads:
   - id: 1a_a15
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 0
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 0
+            /sys/devices/system/cpu/cpu4/online: 0
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/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 72f4239..f4e57b0 100644
--- a/templates/a15only_antutu_4.0.3.yaml
+++ b/templates/a15only_antutu_4.0.3.yaml
@@ -7,8 +7,14 @@ workloads:
   - id: 1c_a15
     label: antutu4.0.3
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 0
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 0
+            /sys/devices/system/cpu/cpu4/online: 0
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/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 36bb106..e70255c 100644
--- a/templates/a15only_audio.yaml
+++ b/templates/a15only_audio.yaml
@@ -6,6 +6,12 @@ global:
 workloads:
   - id: 1b_a15_audio
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 0
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 0
+            /sys/devices/system/cpu/cpu4/online: 0
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: audio
diff --git a/templates/a15only_bbench_audio.yaml b/templates/a15only_bbench_audio.yaml
index bf2858e..0680976 100644
--- a/templates/a15only_bbench_audio.yaml
+++ b/templates/a15only_bbench_audio.yaml
@@ -6,8 +6,14 @@ global:
 workloads:
   - id: 1a_a15_bbench_audio
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 0
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 0
+            /sys/devices/system/cpu/cpu4/online: 0
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/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 ebbd5af..612ad42 100644
--- a/templates/a15only_benchmarkpi.yaml
+++ b/templates/a15only_benchmarkpi.yaml
@@ -6,6 +6,12 @@ global:
 workloads:
   - id: 1e_a15
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 0
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 0
+            /sys/devices/system/cpu/cpu4/online: 0
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: benchmarkpi
diff --git a/templates/a15only_caffeinemark.yaml b/templates/a15only_caffeinemark.yaml
index 803c615..c4ba8f9 100644
--- a/templates/a15only_caffeinemark.yaml
+++ b/templates/a15only_caffeinemark.yaml
@@ -6,6 +6,12 @@ global:
 workloads:
   - id: 1f_a15
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 0
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 0
+            /sys/devices/system/cpu/cpu4/online: 0
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: caffeinemark
diff --git a/templates/a15only_cfbench.yaml b/templates/a15only_cfbench.yaml
index 34649bf..726978b 100644
--- a/templates/a15only_cfbench.yaml
+++ b/templates/a15only_cfbench.yaml
@@ -6,6 +6,12 @@ global:
 workloads:
   - id: 1g_a15
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 0
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 0
+            /sys/devices/system/cpu/cpu4/online: 0
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: cfbench
diff --git a/templates/a15only_geekbench3.yaml b/templates/a15only_geekbench3.yaml
index 024d43b..4539a73 100644
--- a/templates/a15only_geekbench3.yaml
+++ b/templates/a15only_geekbench3.yaml
@@ -5,10 +5,16 @@ global:
     iterations: 1
 workloads:
   - id: 1h_a15
-    label: geekbench3
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 0
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 0
+            /sys/devices/system/cpu/cpu4/online: 0
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
+    label: geekbench3
     workload_name: geekbench
     workload_parameters:
         version: 3
diff --git a/templates/a15only_linpack.yaml b/templates/a15only_linpack.yaml
index bf70c59..58aa7de 100644
--- a/templates/a15only_linpack.yaml
+++ b/templates/a15only_linpack.yaml
@@ -6,6 +6,12 @@ global:
 workloads:
   - id: 1i_a15
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 0
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 0
+            /sys/devices/system/cpu/cpu4/online: 0
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: linpack
diff --git a/templates/a15only_quadrant.yaml b/templates/a15only_quadrant.yaml
index d62910f..0300b06 100644
--- a/templates/a15only_quadrant.yaml
+++ b/templates/a15only_quadrant.yaml
@@ -6,6 +6,12 @@ global:
 workloads:
   - id: 1j_a15
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 0
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 0
+            /sys/devices/system/cpu/cpu4/online: 0
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: quadrant
diff --git a/templates/a15only_smartbench.yaml b/templates/a15only_smartbench.yaml
index 3e2bc87..9424ba4 100644
--- a/templates/a15only_smartbench.yaml
+++ b/templates/a15only_smartbench.yaml
@@ -6,6 +6,12 @@ global:
 workloads:
   - id: 1k_a15
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 0
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 0
+            /sys/devices/system/cpu/cpu4/online: 0
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: smartbench
diff --git a/templates/a15only_sqlite.yaml b/templates/a15only_sqlite.yaml
index ee2744d..79a9153 100644
--- a/templates/a15only_sqlite.yaml
+++ b/templates/a15only_sqlite.yaml
@@ -6,6 +6,12 @@ global:
 workloads:
   - id: 1l_a15
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 0
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 0
+            /sys/devices/system/cpu/cpu4/online: 0
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: sqlite
diff --git a/templates/a15only_vellamo.yaml b/templates/a15only_vellamo.yaml
index 743c150..514fd75 100644
--- a/templates/a15only_vellamo.yaml
+++ b/templates/a15only_vellamo.yaml
@@ -6,6 +6,12 @@ global:
 workloads:
   - id: 1o_a15
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 0
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 0
+            /sys/devices/system/cpu/cpu4/online: 0
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: vellamo
diff --git a/templates/a7only_audio.yaml b/templates/a7only_audio.yaml
index d6753fc..b632b78 100644
--- a/templates/a7only_audio.yaml
+++ b/templates/a7only_audio.yaml
@@ -6,7 +6,13 @@ global:
 workloads:
   - id: 4b_a7_audio
     runtime_parameters:
-        a7_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_min_frequency: 500000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 1
+            /sys/devices/system/cpu/cpu1/online: 0
+            /sys/devices/system/cpu/cpu2/online: 0
+            /sys/devices/system/cpu/cpu3/online: 1
+            /sys/devices/system/cpu/cpu4/online: 1
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq: 500000
+            /sys/devices/system/cpu/cpu0/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: audio
diff --git a/templates/a7only_bbench_audio.yaml b/templates/a7only_bbench_audio.yaml
index a976118..82dce39 100644
--- a/templates/a7only_bbench_audio.yaml
+++ b/templates/a7only_bbench_audio.yaml
@@ -6,9 +6,15 @@ global:
 workloads:
   - id: 4a_a7_bbench_audio
     runtime_parameters:
-        a7_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_min_frequency: 500000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 1
+            /sys/devices/system/cpu/cpu1/online: 0
+            /sys/devices/system/cpu/cpu2/online: 0
+            /sys/devices/system/cpu/cpu3/online: 1
+            /sys/devices/system/cpu/cpu4/online: 1
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq: 500000
+            /sys/devices/system/cpu/cpu0/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: bbench
     workload_parameters:
         with_audio: true
diff --git a/templates/hmp_andbench_t1.yaml b/templates/hmp_andbench_t1.yaml
index 6b4bbf8..398718e 100644
--- a/templates/hmp_andbench_t1.yaml
+++ b/templates/hmp_andbench_t1.yaml
@@ -6,11 +6,17 @@ global:
 workloads:
   - id: 2a_a7bc
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_min_frequency: 500000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 1
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 1
+            /sys/devices/system/cpu/cpu4/online: 1
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu0/cpufreq/interactive/above_hispeed_delay: 20000
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq: 500000
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: andebench
     workload_parameters:
         number_of_threads: 1
diff --git a/templates/hmp_andbench_t5.yaml b/templates/hmp_andbench_t5.yaml
index 2d7690b..d9e907f 100644
--- a/templates/hmp_andbench_t5.yaml
+++ b/templates/hmp_andbench_t5.yaml
@@ -6,11 +6,17 @@ global:
 workloads:
   - id: 2a_a7bc
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_min_frequency: 500000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 1
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 1
+            /sys/devices/system/cpu/cpu4/online: 1
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu0/cpufreq/interactive/above_hispeed_delay: 20000
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq: 500000
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     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 6e56df9..9c7ca6f 100644
--- a/templates/hmp_antutu_4.0.3.yaml
+++ b/templates/hmp_antutu_4.0.3.yaml
@@ -5,13 +5,19 @@ global:
     iterations: 1
 workloads:
   - 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
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 1
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 1
+            /sys/devices/system/cpu/cpu4/online: 1
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu0/cpufreq/interactive/above_hispeed_delay: 20000
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq: 500000
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
+    label: antutu4.0.3
     workload_name: antutu
     workload_parameters:
         version: 4.0.3
diff --git a/templates/hmp_audio.yaml b/templates/hmp_audio.yaml
index b65f3ea..8608b4c 100644
--- a/templates/hmp_audio.yaml
+++ b/templates/hmp_audio.yaml
@@ -6,9 +6,15 @@ global:
 workloads:
   - id: 2b_a7bc_audio
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_min_frequency: 500000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 1
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 1
+            /sys/devices/system/cpu/cpu4/online: 1
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu0/cpufreq/interactive/above_hispeed_delay: 20000
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq: 500000
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: audio
diff --git a/templates/hmp_bbench_audio.yaml b/templates/hmp_bbench_audio.yaml
index cf670cb..cf8fc74 100644
--- a/templates/hmp_bbench_audio.yaml
+++ b/templates/hmp_bbench_audio.yaml
@@ -6,11 +6,17 @@ global:
 workloads:
   - 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
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 1
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 1
+            /sys/devices/system/cpu/cpu4/online: 1
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu0/cpufreq/interactive/above_hispeed_delay: 20000
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq: 500000
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: bbench
     workload_parameters:
         with_audio: true
diff --git a/templates/hmp_benchmarkpi.yaml b/templates/hmp_benchmarkpi.yaml
index 7c3b3b2..7132f80 100644
--- a/templates/hmp_benchmarkpi.yaml
+++ b/templates/hmp_benchmarkpi.yaml
@@ -6,9 +6,15 @@ global:
 workloads:
   - id: 2e_a7bc
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_min_frequency: 500000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 1
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 1
+            /sys/devices/system/cpu/cpu4/online: 1
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu0/cpufreq/interactive/above_hispeed_delay: 20000
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq: 500000
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: benchmarkpi
diff --git a/templates/hmp_caffeinemark.yaml b/templates/hmp_caffeinemark.yaml
index e0fd7b3..cf7e3e0 100644
--- a/templates/hmp_caffeinemark.yaml
+++ b/templates/hmp_caffeinemark.yaml
@@ -6,9 +6,15 @@ global:
 workloads:
   - id: 2f_a7bc
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_min_frequency: 500000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 1
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 1
+            /sys/devices/system/cpu/cpu4/online: 1
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu0/cpufreq/interactive/above_hispeed_delay: 20000
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq: 500000
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: caffeinemark
diff --git a/templates/hmp_cfbench.yaml b/templates/hmp_cfbench.yaml
index 79102d2..89c883a 100644
--- a/templates/hmp_cfbench.yaml
+++ b/templates/hmp_cfbench.yaml
@@ -6,9 +6,15 @@ global:
 workloads:
   - id: 2g_a7bc
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_min_frequency: 500000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 1
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 1
+            /sys/devices/system/cpu/cpu4/online: 1
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu0/cpufreq/interactive/above_hispeed_delay: 20000
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq: 500000
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: cfbench
diff --git a/templates/hmp_geekbench3.yaml b/templates/hmp_geekbench3.yaml
index ca45947..1fcf38c 100644
--- a/templates/hmp_geekbench3.yaml
+++ b/templates/hmp_geekbench3.yaml
@@ -5,13 +5,19 @@ global:
     iterations: 1
 workloads:
   - 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
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 1
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 1
+            /sys/devices/system/cpu/cpu4/online: 1
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu0/cpufreq/interactive/above_hispeed_delay: 20000
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq: 500000
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
+    label: geekbench3
     workload_name: geekbench
     workload_parameters:
         version: 3
diff --git a/templates/hmp_linpack.yaml b/templates/hmp_linpack.yaml
index 2a2566a..589ebc5 100644
--- a/templates/hmp_linpack.yaml
+++ b/templates/hmp_linpack.yaml
@@ -6,9 +6,15 @@ global:
 workloads:
   - id: 2i_a7bc
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_min_frequency: 500000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 1
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 1
+            /sys/devices/system/cpu/cpu4/online: 1
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu0/cpufreq/interactive/above_hispeed_delay: 20000
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq: 500000
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: linpack
diff --git a/templates/hmp_quadrant.yaml b/templates/hmp_quadrant.yaml
index ac65bc4..189c3df 100644
--- a/templates/hmp_quadrant.yaml
+++ b/templates/hmp_quadrant.yaml
@@ -6,9 +6,15 @@ global:
 workloads:
   - id: 2j_a7bc
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_min_frequency: 500000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 1
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 1
+            /sys/devices/system/cpu/cpu4/online: 1
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu0/cpufreq/interactive/above_hispeed_delay: 20000
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq: 500000
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: quadrant
diff --git a/templates/hmp_smartbench.yaml b/templates/hmp_smartbench.yaml
index 4a944b6..49bf1f8 100644
--- a/templates/hmp_smartbench.yaml
+++ b/templates/hmp_smartbench.yaml
@@ -6,9 +6,15 @@ global:
 workloads:
   - id: 2k_a7bc
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_min_frequency: 500000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 1
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 1
+            /sys/devices/system/cpu/cpu4/online: 1
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu0/cpufreq/interactive/above_hispeed_delay: 20000
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq: 500000
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: smartbench
diff --git a/templates/hmp_sqlite.yaml b/templates/hmp_sqlite.yaml
index 4a46fc1..b05021c 100644
--- a/templates/hmp_sqlite.yaml
+++ b/templates/hmp_sqlite.yaml
@@ -6,9 +6,15 @@ global:
 workloads:
   - id: 2l_a7bc
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_min_frequency: 500000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 1
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 1
+            /sys/devices/system/cpu/cpu4/online: 1
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu0/cpufreq/interactive/above_hispeed_delay: 20000
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq: 500000
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: sqlite
diff --git a/templates/hmp_vellamo.yaml b/templates/hmp_vellamo.yaml
index 25c0d88..0934116 100644
--- a/templates/hmp_vellamo.yaml
+++ b/templates/hmp_vellamo.yaml
@@ -6,9 +6,15 @@ global:
 workloads:
   - id: 2o_a7bc
     runtime_parameters:
-        a15_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_governor_tunables:
-            above_hispeed_delay: 20000
-        a7_min_frequency: 500000
+        sysfile_values:
+            /sys/devices/system/cpu/cpu0/online: 1
+            /sys/devices/system/cpu/cpu1/online: 1
+            /sys/devices/system/cpu/cpu2/online: 1
+            /sys/devices/system/cpu/cpu3/online: 1
+            /sys/devices/system/cpu/cpu4/online: 1
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor: interactive
+            /sys/devices/system/cpu/cpu0/cpufreq/interactive/above_hispeed_delay: 20000
+            /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq: 500000
+            /sys/devices/system/cpu/cpu1/cpufreq/interactive/above_hispeed_delay: 20000
     workload_name: vellamo