Move the logic to the instance

Author: rafaelfranca

lib/cpu_config.rb

@@ -2,106 +2,113 @@
 
 # Manages CPU frequency and turbo boost configuration for benchmark consistency
 class CPUConfig
-  class << self
-    # Configure CPU for benchmarking: disable frequency scaling and verify settings
-    def configure_for_benchmarking(turbo:)
-      disable_frequency_scaling(turbo: turbo)
-      check_pstate(turbo: turbo)
-    end
+  # Configure CPU for benchmarking: disable frequency scaling and verify settings
+  def self.configure_for_benchmarking(turbo:)
+    new.configure_for_benchmarking(turbo: turbo)
+  end
 
-    private
+  def initialize
+    @intel_cpu = File.exist?('/sys/devices/system/cpu/intel_pstate')
+    @amd_cpu = File.exist?('/sys/devices/system/cpu/cpufreq/boost')
+  end
 
-    # Disable Turbo Boost while running benchmarks. Maximize the CPU frequency.
-    def disable_frequency_scaling(turbo:)
-      if intel_cpu?
-        disable_intel_turbo unless turbo
-        maximize_intel_frequency
-      elsif amd_cpu?
-        disable_amd_boost unless turbo
-        set_performance_governor
-      end
-    end
+  def configure_for_benchmarking(turbo:)
+    disable_frequency_scaling(turbo: turbo)
+    check_pstate(turbo: turbo)
+  end
 
-    def intel_cpu?
-      File.exist?('/sys/devices/system/cpu/intel_pstate')
-    end
+  private
 
-    def amd_cpu?
-      File.exist?('/sys/devices/system/cpu/cpufreq/boost')
+  # Disable Turbo Boost while running benchmarks. Maximize the CPU frequency.
+  def disable_frequency_scaling(turbo:)
+    if intel_cpu?
+      disable_intel_turbo unless turbo
+      maximize_intel_frequency
+    elsif amd_cpu?
+      disable_amd_boost unless turbo
+      set_performance_governor
     end
+  end
 
-    def disable_intel_turbo
-      return if intel_no_turbo?
-      # sudo requires the flag '-S' in order to take input from stdin
-      BenchmarkRunner.check_call("sudo -S sh -c 'echo 1 > /sys/devices/system/cpu/intel_pstate/no_turbo'")
-      at_exit { BenchmarkRunner.check_call("sudo -S sh -c 'echo 0 > /sys/devices/system/cpu/intel_pstate/no_turbo'", quiet: true) }
-    end
+  def intel_cpu?
+    @intel_cpu
+  end
 
-    def maximize_intel_frequency
-      return if intel_perf_100pct?
-      # Disabling Turbo Boost reduces the CPU frequency, so this should be run after that.
-      BenchmarkRunner.check_call("sudo -S sh -c 'echo 100 > /sys/devices/system/cpu/intel_pstate/min_perf_pct'")
-    end
+  def amd_cpu?
+    @amd_cpu
+  end
 
-    def disable_amd_boost
-      return if amd_no_boost?
-      # sudo requires the flag '-S' in order to take input from stdin
-      BenchmarkRunner.check_call("sudo -S sh -c 'echo 0 > /sys/devices/system/cpu/cpufreq/boost'")
-      at_exit { BenchmarkRunner.check_call("sudo -S sh -c 'echo 1 > /sys/devices/system/cpu/cpufreq/boost'", quiet: true) }
-    end
+  def disable_intel_turbo
+    return if intel_no_turbo?
+    # sudo requires the flag '-S' in order to take input from stdin
+    BenchmarkRunner.check_call("sudo -S sh -c 'echo 1 > /sys/devices/system/cpu/intel_pstate/no_turbo'")
+    at_exit { BenchmarkRunner.check_call("sudo -S sh -c 'echo 0 > /sys/devices/system/cpu/intel_pstate/no_turbo'", quiet: true) }
+  end
 
-    def set_performance_governor
-      return if performance_governor?
-      BenchmarkRunner.check_call("sudo -S cpupower frequency-set -g performance")
-    end
+  def maximize_intel_frequency
+    return if intel_perf_100pct?
+    # Disabling Turbo Boost reduces the CPU frequency, so this should be run after that.
+    BenchmarkRunner.check_call("sudo -S sh -c 'echo 100 > /sys/devices/system/cpu/intel_pstate/min_perf_pct'")
+  end
 
-    def intel_no_turbo?
-      File.exist?('/sys/devices/system/cpu/intel_pstate/no_turbo') &&
-        File.read('/sys/devices/system/cpu/intel_pstate/no_turbo').strip == '1'
-    end
+  def disable_amd_boost
+    return if amd_no_boost?
+    # sudo requires the flag '-S' in order to take input from stdin
+    BenchmarkRunner.check_call("sudo -S sh -c 'echo 0 > /sys/devices/system/cpu/cpufreq/boost'")
+    at_exit { BenchmarkRunner.check_call("sudo -S sh -c 'echo 1 > /sys/devices/system/cpu/cpufreq/boost'", quiet: true) }
+  end
 
-    def intel_perf_100pct?
-      File.exist?('/sys/devices/system/cpu/intel_pstate/min_perf_pct') &&
-        File.read('/sys/devices/system/cpu/intel_pstate/min_perf_pct').strip == '100'
-    end
+  def set_performance_governor
+    return if performance_governor?
+    BenchmarkRunner.check_call("sudo -S cpupower frequency-set -g performance")
+  end
+
+  def intel_no_turbo?
+    File.exist?('/sys/devices/system/cpu/intel_pstate/no_turbo') &&
+      File.read('/sys/devices/system/cpu/intel_pstate/no_turbo').strip == '1'
+  end
+
+  def intel_perf_100pct?
+    File.exist?('/sys/devices/system/cpu/intel_pstate/min_perf_pct') &&
+      File.read('/sys/devices/system/cpu/intel_pstate/min_perf_pct').strip == '100'
+  end
 
-    def amd_no_boost?
-      File.exist?('/sys/devices/system/cpu/cpufreq/boost') &&
-        File.read('/sys/devices/system/cpu/cpufreq/boost').strip == '0'
+  def amd_no_boost?
+    File.exist?('/sys/devices/system/cpu/cpufreq/boost') &&
+      File.read('/sys/devices/system/cpu/cpufreq/boost').strip == '0'
+  end
+
+  def performance_governor?
+    Dir.glob('/sys/devices/system/cpu/cpu*/cpufreq/scaling_governor').all? do |governor|
+      File.read(governor).strip == 'performance'
     end
+  end
 
-    def performance_governor?
-      Dir.glob('/sys/devices/system/cpu/cpu*/cpufreq/scaling_governor').all? do |governor|
-        File.read(governor).strip == 'performance'
+  # Verify that CPU frequency settings have been configured correctly
+  def check_pstate(turbo:)
+    if intel_cpu?
+      unless turbo || intel_no_turbo?
+        puts("You forgot to disable turbo:")
+        puts("  sudo sh -c 'echo 1 > /sys/devices/system/cpu/intel_pstate/no_turbo'")
+        exit(-1)
+      end
+
+      unless intel_perf_100pct?
+        puts("You forgot to set the min perf percentage to 100:")
+        puts("  sudo sh -c 'echo 100 > /sys/devices/system/cpu/intel_pstate/min_perf_pct'")
+        exit(-1)
+      end
+    elsif amd_cpu?
+      unless turbo || amd_no_boost?
+        puts("You forgot to disable boost:")
+        puts("  sudo sh -c 'echo 0 > /sys/devices/system/cpu/cpufreq/boost'")
+        exit(-1)
       end
-    end
 
-    # Verify that CPU frequency settings have been configured correctly
-    def check_pstate(turbo:)
-      if File.exist?('/sys/devices/system/cpu/intel_pstate') # Intel
-        unless turbo || intel_no_turbo?
-          puts("You forgot to disable turbo:")
-          puts("  sudo sh -c 'echo 1 > /sys/devices/system/cpu/intel_pstate/no_turbo'")
-          exit(-1)
-        end
-
-        unless intel_perf_100pct?
-          puts("You forgot to set the min perf percentage to 100:")
-          puts("  sudo sh -c 'echo 100 > /sys/devices/system/cpu/intel_pstate/min_perf_pct'")
-          exit(-1)
-        end
-      elsif File.exist?('/sys/devices/system/cpu/cpufreq/boost') # AMD
-        unless turbo || amd_no_boost?
-          puts("You forgot to disable boost:")
-          puts("  sudo sh -c 'echo 0 > /sys/devices/system/cpu/cpufreq/boost'")
-          exit(-1)
-        end
-
-        unless performance_governor?
-          puts("You forgot to set the performance governor:")
-          puts("  sudo cpupower frequency-set -g performance")
-          exit(-1)
-        end
+      unless performance_governor?
+        puts("You forgot to set the performance governor:")
+        puts("  sudo cpupower frequency-set -g performance")
+        exit(-1)
       end
     end
   end