diff options
Diffstat (limited to 'crosperf/suite_runner.py')
| -rw-r--r-- | crosperf/suite_runner.py | 52 |
1 files changed, 28 insertions, 24 deletions
diff --git a/crosperf/suite_runner.py b/crosperf/suite_runner.py index 678113a7..bd27f282 100644 --- a/crosperf/suite_runner.py +++ b/crosperf/suite_runner.py @@ -78,8 +78,8 @@ class SuiteRunner(object): (benchmark.name, i)) break else: - self.logger.LogOutput('benchmark %s succeded on first try' % - benchmark.name) + self.logger.LogOutput( + 'benchmark %s succeded on first try' % benchmark.name) break return ret_tup @@ -88,32 +88,37 @@ class SuiteRunner(object): # pyformat: disable set_cpu_freq = ( 'set -e && ' + # Disable Turbo in Intel pstate driver + 'if [[ -e /sys/devices/system/cpu/intel_pstate/no_turbo ]]; then ' + 'echo -n 1 > /sys/devices/system/cpu/intel_pstate/no_turbo; fi; ' + # Set governor to performance for each cpu 'for f in /sys/devices/system/cpu/cpu*/cpufreq; do ' 'cd $f; ' - 'val=0; ' - 'if [[ -e scaling_available_frequencies ]]; then ' - # pylint: disable=line-too-long - ' val=`cat scaling_available_frequencies | tr " " "\\n" | sort -n -b -r`; ' - 'else ' - ' val=`cat scaling_max_freq | tr " " "\\n" | sort -n -b -r`; fi ; ' - 'set -- $val; ' - 'highest=$1; ' - 'if [[ $# -gt 1 ]]; then ' - ' case $highest in *1000) highest=$2;; esac; ' - 'fi ;' - 'echo $highest > scaling_max_freq; ' - 'echo $highest > scaling_min_freq; ' 'echo performance > scaling_governor; ' + # Uncomment rest of lines to enable setting frequency by crosperf + #'val=0; ' + #'if [[ -e scaling_available_frequencies ]]; then ' + # pylint: disable=line-too-long + #' val=`cat scaling_available_frequencies | tr " " "\\n" | sort -n -b -r`; ' + #'else ' + #' val=`cat scaling_max_freq | tr " " "\\n" | sort -n -b -r`; fi ; ' + #'set -- $val; ' + #'highest=$1; ' + #'if [[ $# -gt 1 ]]; then ' + #' case $highest in *1000) highest=$2;; esac; ' + #'fi ;' + #'echo $highest > scaling_max_freq; ' + #'echo $highest > scaling_min_freq; ' 'done' ) # pyformat: enable if self.log_level == 'average': - self.logger.LogOutput('Pinning governor execution frequencies for %s' % - machine_name) + self.logger.LogOutput( + 'Pinning governor execution frequencies for %s' % machine_name) ret = self._ce.CrosRunCommand( set_cpu_freq, machine=machine_name, chromeos_root=chromeos_root) - self.logger.LogFatalIf(ret, 'Could not pin frequencies on machine: %s' % - machine_name) + self.logger.LogFatalIf( + ret, 'Could not pin frequencies on machine: %s' % machine_name) def DecreaseWaitTime(self, machine_name, chromeos_root): """Change the ten seconds wait time for pagecycler to two seconds.""" @@ -218,11 +223,10 @@ class SuiteRunner(object): args_string = "test_args='%s'" % test_args cmd = ('{} {} {} --board={} --args="{} run_local={} test={} ' - '{}" {} telemetry_Crosperf'.format(TEST_THAT_PATH, autotest_dir_arg, - fast_arg, label.board, - args_string, benchmark.run_local, - benchmark.test_name, - profiler_args, machine)) + '{}" {} telemetry_Crosperf'.format( + TEST_THAT_PATH, autotest_dir_arg, fast_arg, label.board, + args_string, benchmark.run_local, benchmark.test_name, + profiler_args, machine)) # Use --no-ns-pid so that cros_sdk does not create a different # process namespace and we can kill process created easily by their |