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>

1 files changed, 6 insertions, 36 deletions

diff --git a/tools/skpbench/_hardware_pixel_c.py b/tools/skpbench/_hardware_pixel_c.py
index cdd9ff602f..037ae215c2 100644
--- a/tools/skpbench/_hardware_pixel_c.py
+++ b/tools/skpbench/_hardware_pixel_c.py
@@ -16,22 +16,8 @@ class HardwarePixelC(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 filter_line(self, line):
-    JUNK = ['NvRmPrivGetChipPlatform: Could not read platform information',
-            'Expected on kernels without fuse support, using silicon']
-    return False if line in JUNK else HardwareAndroid.filter_line(self, line)
-
-  def _lock_clocks(self):
     if not self._adb.is_root():
-      return
+      return self
 
     self._adb.shell('\n'.join([
       # turn on and lock the first 3 cores.
@@ -53,28 +39,12 @@ class HardwarePixelC(HardwareAndroid):
       chown root:root /sys/devices/57000000.gpu/pstate
       echo %s > /sys/devices/57000000.gpu/pstate''' % GPU_EMC_PROFILE_ID]))
 
-  def _unlock_clocks(self):
-    if not self._adb.is_root():
-      return
-
-    self._adb.shell('\n'.join([
-      # unlock gpu/emc clocks.
-      '''
-      echo auto > /sys/devices/57000000.gpu/pstate
-      chown system:system /sys/devices/57000000.gpu/pstate''',
-
-      # turn the fourth core back on.
-      '''
-      echo 1 > /sys/devices/system/cpu/cpu3/online''',
+    return self
 
-      # unlock the first 3 cores.
-      '''
-      for N in 2 1 0; do
-        echo 1912500 > /sys/devices/system/cpu/cpu$N/cpufreq/scaling_max_freq
-        echo 51000 > /sys/devices/system/cpu/cpu$N/cpufreq/scaling_min_freq
-        echo 0 > /sys/devices/system/cpu/cpu$N/cpufreq/scaling_setspeed
-        echo interactive >/sys/devices/system/cpu/cpu$N/cpufreq/scaling_governor
-      done''']))
+  def filter_line(self, line):
+    JUNK = ['NvRmPrivGetChipPlatform: Could not read platform information',
+            'Expected on kernels without fuse support, using silicon']
+    return False if line in JUNK else HardwareAndroid.filter_line(self, line)
 
   def sanity_check(self):
     HardwareAndroid.sanity_check(self)