diff options
| author |  Chris Dalton <csmartdalton@google.com> | 2017-10-23 17:19:37 -0600 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-24 15:54:31 +0000 |
| commit | 49b7ed30641916efdd7da76cad6af69ca621cc9b (patch) | |
| tree | 6c61299ec727dc386fb8a7ee0a3e2f0af9388f29 /tools/skpbench/_hardware_nexus_6p.py | |
| parent | c29bb571f7e3a82c3386a5b004cd84afdc88a0a2 (diff) | |
skpbench: always reboot instead of unlocking clocks
Bug: skia:
Change-Id: I2589c672823f1da8ea136e90fa083431b4f2e3b2
Reviewed-on: https://skia-review.googlesource.com/62945
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Diffstat (limited to 'tools/skpbench/_hardware_nexus_6p.py')
| -rw-r--r-- | tools/skpbench/_hardware_nexus_6p.py | 57 |
1 files changed, 2 insertions, 55 deletions
diff --git a/tools/skpbench/_hardware_nexus_6p.py b/tools/skpbench/_hardware_nexus_6p.py index 58eb52f925..5ca63fdeda 100644 --- a/tools/skpbench/_hardware_nexus_6p.py +++ b/tools/skpbench/_hardware_nexus_6p.py @@ -15,17 +15,8 @@ class HardwareNexus6P(HardwareAndroid): def __enter__(self): HardwareAndroid.__enter__(self) - self._lock_clocks() - return self - - def __exit__(self, exception_type, exception_value, exception_traceback): - self._unlock_clocks() - HardwareAndroid.__exit__(self, exception_type, - exception_value, exception_traceback) - - def _lock_clocks(self): if not self._adb.is_root(): - return + return self self._adb.shell('''\ stop thermal-engine @@ -73,51 +64,7 @@ class HardwareNexus6P(HardwareAndroid): echo 9887 > /sys/class/devfreq/qcom,gpubw.70/max_freq echo 9887 > /sys/class/devfreq/qcom,gpubw.70/min_freq''') - def _unlock_clocks(self): - if not self._adb.is_root(): - return - - # restore ddr settings to default. - self._adb.shell('''\ - echo 1525 > /sys/class/devfreq/qcom,cpubw.32/min_freq - echo 9887 > /sys/class/devfreq/qcom,cpubw.32/max_freq - echo bw_hwmon > /sys/class/devfreq/qcom,cpubw.32/governor - echo 1525 > /sys/class/devfreq/qcom,gpubw.70/min_freq - echo 9887 > /sys/class/devfreq/qcom,gpubw.70/max_freq - echo bw_hwmon > /sys/class/devfreq/qcom,gpubw.70/governor''') - - # restore gpu settings to default. - self._adb.shell('''\ - echo 180000000 > /sys/class/kgsl/kgsl-3d0/devfreq/min_freq - echo 600000000 > /sys/class/kgsl/kgsl-3d0/devfreq/max_freq - echo 180000000 > /sys/class/kgsl/kgsl-3d0/gpuclk - echo msm-adreno-tz > /sys/class/kgsl/kgsl-3d0/devfreq/governor - echo 0 > /sys/class/kgsl/kgsl-3d0/idle_timer - echo 0 > /sys/class/kgsl/kgsl-3d0/force_clk_on - echo 0 > /sys/class/kgsl/kgsl-3d0/force_rail_on - echo 0 > /sys/class/kgsl/kgsl-3d0/force_bus_on - echo 1 > /sys/class/kgsl/kgsl-3d0/bus_split''') - - # turn the disabled cores back on. - self._adb.shell('''\ - for N in 7 3 2 1 0; do - echo 1 > /sys/devices/system/cpu/cpu$N/online - done''') - - # unlock the 3 enabled big cores. - self._adb.shell('''\ - for N in 6 5 4; do - echo 633600 > /sys/devices/system/cpu/cpu$N/cpufreq/scaling_min_freq - echo 1958400 > /sys/devices/system/cpu/cpu$N/cpufreq/scaling_max_freq - echo 0 > /sys/devices/system/cpu/cpu$N/cpufreq/scaling_setspeed - echo interactive > /sys/devices/system/cpu/cpu$N/cpufreq/scaling_governor - done''') - - self._adb.shell('''\ - start mpdecision - start perfd - start thermald - start thermal-engine''') + return self def sanity_check(self): HardwareAndroid.sanity_check(self) |