Attachment 879211 Details for Bug 1072209 – patch fixing power save test to load only one cpu

[patch] patch fixing power save test to load only one cpu

0001-1072209-In-CPUSCLAING-test-Single-CPU-Power-Save-Tes.patch (text/plain), 5.90 KB, created by Greg Nichols on 2014-03-26 20:05:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2014-03-26 20:05:44 UTC

Size: 5.90 KB

patch

obsolete

>From 283f9c6d1639ffe548f4e589dfc4e3f286cf4409 Mon Sep 17 00:00:00 2001
>From: Greg Nichols <gnichols@redhat.com>
>Date: Wed, 26 Mar 2014 16:03:41 -0400
>Subject: [PATCH] 1072209 - In CPUSCLAING test 'Single CPU Power Save Test'
> section, all cpus will be load test
>
>---
> tests/cpuscaling/cpuscaling.py | 43 ++++++++++++++++++++++++++++--------------
> 1 file changed, 29 insertions(+), 14 deletions(-)
>
>diff --git a/tests/cpuscaling/cpuscaling.py b/tests/cpuscaling/cpuscaling.py
>index b14264f..cd8c9df 100644
>--- a/tests/cpuscaling/cpuscaling.py
>+++ b/tests/cpuscaling/cpuscaling.py
>@@ -235,13 +235,17 @@ class CPUScalingTest(Test):
> 
>     def runLoadTest(self, cpu=None):
>         """ run package load test, cpu default None means for all cpus """
>-        print "Running CPU load test..."
>+        sys.stdout.write("Running CPU load test - ")
>+        if cpu != None:
>+            print "for only cpu %s" % cpu
>+        else:
>+            print "for all cpus in the package"
> 
>         runTime = None
>         tries = 0
>         while tries < self.retryLimit:
>             sys.stdout.flush()
>-            averageProcessTime = self.__runSubprocessLoadTest(cpu)
>+            averageProcessTime = self.__runSubprocessLoadTest(singleCpu=cpu)
>             if averageProcessTime:
>                 print "average worker process time: %.2f seconds" % averageProcessTime
>                 if not runTime:
>@@ -264,7 +268,8 @@ class CPUScalingTest(Test):
>         self.loadProcesses = dict()
> 
>         # if cpu is set, just load that one
>-        if singleCpu:
>+        if singleCpu != None:
>+            print "Single CPU Test: Loading only cpu%s" % singleCpu
>             loadProcess = LoadProcess(self, singleCpu, aperfmperfSupport=self.effectiveFrequencySupport)
>             loadProcess.start()
>             self.loadProcesses[singleCpu] = loadProcess
>@@ -306,7 +311,7 @@ class CPUScalingTest(Test):
> 
>             time.sleep(1) # poll once per second
>             # if doing a single cpu, log its current freq while waiting
>-            if singleCpu:
>+            if singleCpu != None:
>                 runningFreq = self.__getCurrentFrequency(cpu)
> 
>         print "processes complete"
>@@ -330,6 +335,8 @@ class CPUScalingTest(Test):
>         sys.stdout.write(" done.\n")
>         minimumFrequency = self.cpuPower.getMinimumFrequency()
>         currentFrequency = self.cpuPower.getCurrentFrequency(self.sysCPUFreq.getCPUs(self.currentPackage)[0])
>+        if self.debug != Constants.off:
>+            print "%s vs. %s (min.)" % (currentFrequency, minimumFrequency)
>         if not minimumFrequency or not currentFrequency or not self.checkFrequency(minimumFrequency, currentFrequency):
>             return False
> 
>@@ -619,17 +626,25 @@ class CPUScalingTest(Test):
> 
>         """ test one cpu in the package while others are idle, and verify that its speedup is greater than when all 
>             cpus in the package are loaded """
>+        governor = "powersave"
>         print ""
>-        print "Single CPU Power Save Test:"
>+        print "Single CPU %s Test:" % self.workloadNames[governor]
>         print "-------------------------------------------------"
>-        # 30. Set and verify the govr. to "performance"
>-        governor = "powersave"
>+        # 30. Set and verify the govr.
>         success = True
> 
>-        print "Setting governor to %s" % governor
>-        if not self.cpuPower.setGovernor(governor):
>+        # set the policy for max boost freq if available
>+        if self.debug != Constants.off:
>+            print "Max: %s MHz vs. Max Boost: %s MHz" % (self.cpuPower.getMaximumFrequency(), self.cpuPower.getMaximumBoostFrequency())
>+        maximumFrequency = self.cpuPower.getMaximumFrequency()
>+        if self.cpuPower.getMaximumBoostFrequency() and self.cpuPower.getMaximumBoostFrequency() > maximumFrequency:
>+            print "Using maximum boost frequency."
>+            maximumFrequency = self.cpuPower.getMaximumBoostFrequency()
>+
>+        print "Setting governor to %s   (min: %s MHz, max: %s MHz)" % ( governor,self.cpuPower.getMinimumFrequency()/1000, maximumFrequency/1000)
>+        if not self.cpuPower.setPolicy(self.cpuPower.getMinimumFrequency(), maximumFrequency, governor):
>             success = False
>-        self.currentWorkload = "powersave"
>+        self.currentWorkload = governor
> 
>         # 16. Wait a fixed period of time, then verify current speed is the slowest in as before
>         if not self.verifyMinimumFrequency():
>@@ -661,7 +676,7 @@ class CPUScalingTest(Test):
>     def getSingleCpu(self):
>         # 32 Pick a cpu other than cpu0 to load
>         for cpu in self.sysCPUFreq.getCPUs(self.currentPackage):
>-            if cpu != "0":
>+            if cpu != 0:
>                 break
>         return cpu
> 
>@@ -703,12 +718,12 @@ class CPUScalingTest(Test):
>             print "Expected Speedup: %.2f" % self.predictedSpeedup
>             print "Allowable Speedup: %.2f to %.2f" % (self.minimumRequiredSpeedup(), self.maximumRequiredSpeedup())
>             print ""
>-            print "           On Demand "
>+            print "           Power Save"
>             print "-------- -------------- "
> 
>             #actual values, one row per cpu
>             workload = "powersave"
>-            for cpu in self.sysCPUFreq.getPackages():
>+            for cpu in self.sysCPUFreq.getCPUs(package):
>                 workloadTime = self.getWorkloadTime(workload, cpu)
>                 if workloadTime:
>                     sys.stdout.write("cpu %-3s  " % cpu)
>@@ -788,7 +803,7 @@ class CPUScalingTest(Test):
>             if not self.runSubTest(self.runUserSpaceTests, "User Space, package %s" % package):
>                 result = FAILED
> 
>-            if not self.runSubTest(self.runPowerSaveTests, "On Demand, package %s" % package):
>+            if not self.runSubTest(self.runPowerSaveTests, "Power Save, package %s" % package):
>                 result =  FAILED   
> 
>             if not self.runSubTest(self.runPerformanceTests, "Performance, package %s" % package):
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1072209: 870261 | 879211