Chromium Code Reviews| Index: build/android/pylib/perf/perf_control.py |
| diff --git a/build/android/pylib/perf/perf_control.py b/build/android/pylib/perf/perf_control.py |
| index d90edf45fc92779b183fa80d1c924cc0a757f051..0693e36a3d2d068957b242701176c0ee37008dcf 100644 |
| --- a/build/android/pylib/perf/perf_control.py |
| +++ b/build/android/pylib/perf/perf_control.py |
| @@ -28,7 +28,7 @@ class PerfControl(object): |
| self._have_mpdecision = self._device.FileExists('/system/bin/mpdecision') |
| def SetHighPerfMode(self): |
| - """Sets the highest possible performance mode for the device.""" |
| + """Sets the highest stable performance mode for the device.""" |
| if not self._device.old_interface.IsRootEnabled(): |
| message = 'Need root for performance mode. Results may be NOISY!!' |
| logging.warning(message) |
| @@ -36,12 +36,23 @@ class PerfControl(object): |
| # may be different/noisy (due to the lack of intended performance mode). |
| atexit.register(logging.warning, message) |
| return |
| + |
| + product_model = self._device.old_interface.GetProductModel() |
| # TODO(epenner): Enable on all devices (http://crbug.com/383566) |
| - if 'Nexus 4' == self._device.old_interface.GetProductModel(): |
| + if 'Nexus 4' == product_model: |
| self._ForceAllCpusOnline(True) |
| if not self._AllCpusAreOnline(): |
| logging.warning('Failed to force CPUs online. Results may be NOISY!') |
| - self._SetScalingGovernorInternal('performance') |
| + self._SetScalingGovernorInternal('performance') |
| + elif 'Nexus 5' == product_model: |
| + self._ForceAllCpusOnline(True) |
| + if not self._AllCpusAreOnline(): |
| + logging.warning('Failed to force CPUs online. Results may be NOISY!') |
| + self._SetScalingGovernorInternal('performance') |
| + self._SetScalingMaxFreq(1190400) |
| + self._SetMaxGpuClock(200000000) |
| + else: |
| + self._SetScalingGovernorInternal('performance') |
| def SetPerfProfilingMode(self): |
| """Enables all cores for reliable perf profiling.""" |
| @@ -56,7 +67,12 @@ class PerfControl(object): |
| """Sets the performance mode for the device to its default mode.""" |
| if not self._device.old_interface.IsRootEnabled(): |
| return |
| - product_model = self._device.GetProp('ro.product.model') |
| + product_model = self._device.old_interface.GetProductModel() |
| + if 'Nexus 5' == product_model: |
| + if self._AllCpusAreOnline(): |
| + self._SetScalingMaxFreq(2265600) |
| + self._SetMaxGpuClock(450000000) |
| + |
| governor_mode = { |
| 'GT-I9300': 'pegasusq', |
| 'Galaxy Nexus': 'interactive', |
| @@ -76,6 +92,19 @@ class PerfControl(object): |
| logging.info('Setting scaling governor mode: %s', value) |
| self._device.RunShellCommand(script, as_root=True) |
| + def _SetScalingMaxFreq(self, value): |
| + cpu_cores = ' '.join([str(x) for x in range(self._num_cpu_cores)]) |
| + script = ('for CPU in %s; do\n' |
| + ' FILE="/sys/devices/system/cpu/cpu$CPU/cpufreq/scaling_max_freq"\n' |
| + ' test -e $FILE && echo %s > $FILE\n' |
|
Sami
2014/10/15 13:29:17
nit: %s should really be a %d here, right?
vmiura
2014/10/15 20:15:01
Done.
|
| + 'done\n') % (cpu_cores, str(value)) |
|
Sami
2014/10/15 13:29:17
Remove str() if you agree with above.
vmiura
2014/10/15 20:15:01
Done.
|
| + self._device.RunShellCommand(script, as_root=True) |
| + |
| + def _SetMaxGpuClock(self, value): |
| + self._device.WriteFile('/sys/class/kgsl/kgsl-3d0/max_gpuclk', |
| + str(value), |
| + as_root=True) |
| + |
| def _AllCpusAreOnline(self): |
| for cpu in range(1, self._num_cpu_cores): |
| online_path = PerfControl._CPU_ONLINE_FMT % cpu |
| @@ -113,3 +142,4 @@ class PerfControl(object): |
| for cpu in range(self._num_cpu_cores): |
| online_path = PerfControl._CPU_ONLINE_FMT % cpu |
| self._device.WriteFile(online_path, '1', as_root=True) |
| + |