Diff
Modified: trunk/Tools/ChangeLog (185731 => 185732)
--- trunk/Tools/ChangeLog 2015-06-19 01:13:37 UTC (rev 185731)
+++ trunk/Tools/ChangeLog 2015-06-19 02:32:40 UTC (rev 185732)
@@ -1,3 +1,35 @@
+2015-06-18 Dewei Zhu <[email protected]>
+
+ Extend capability of run-benchmark script to support mobile device
+ https://bugs.webkit.org/show_bug.cgi?id=146125
+
+ Reviewed by Ryosuke Niwa.
+
+ Extend capability of run-benchmark to support mobile device, and move majority of run-benchmark script code to
+ benchmark_runner directory, and make run-benchmark a wrapping script. Also correct a typo.
+
+ * Scripts/run-benchmark:
+ (main): Deleted.
+ * Scripts/webkitpy/benchmark_runner/benchmark_runner.py:
+ (BenchmarkRunner.__init__):
+ (BenchmarkRunner.execute):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py:
+ (BrowserDriver.prepareEnv):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
+ (OSXBrowserDriver.prepareEnv):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
+ (OSXSafariDriver.prepareEnv):
+ * Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver.py:
+ (HTTPServerDriver.getReturnCode):
+ (HTTPServerDriver):
+ (HTTPServerDriver.setDeviceID):
+ * Scripts/webkitpy/benchmark_runner/run_benchmark.py: Copied from Tools/Scripts/run-benchmark.
+ (parse_args):
+ (start):
+ (main):
+ * Scripts/webkitpy/benchmark_runner/utils.py:
+ (getPathFromProjectRoot):
+
2015-06-18 Jon Lee <[email protected]>
Unreviewed. Add Matt Daiter as a contributor.
Modified: trunk/Tools/Scripts/run-benchmark (185731 => 185732)
--- trunk/Tools/Scripts/run-benchmark 2015-06-19 01:13:37 UTC (rev 185731)
+++ trunk/Tools/Scripts/run-benchmark 2015-06-19 02:32:40 UTC (rev 185732)
@@ -1,44 +1,13 @@
#!/usr/bin/env python
-import argparse
import logging
-import platform
import sys
-from webkitpy.benchmark_runner.benchmark_runner import BenchmarkRunner
-from webkitpy.benchmark_runner.browser_driver.browser_driver_factory import BrowserDriverFactory
+from webkitpy.benchmark_runner.run_benchmark import main, format_logger
_log = logging.getLogger()
-_log.setLevel(logging.INFO)
-ch = logging.StreamHandler()
-formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
-ch.setFormatter(formatter)
-_log.addHandler(ch)
-
-def main():
- parser = argparse.ArgumentParser(description='Automate the browser based performance benchmarks')
- parser.add_argument('--output-file', dest='output', default=None)
- parser.add_argument('--build-directory', dest='buildDir', help='Path to the browser executable. e.g. WebKitBuild/Release/')
- parser.add_argument('--plan', dest='plan', required=True, help='Benchmark plan to run. e.g. speedometer, jetstream')
- parser.add_argument('--platform', dest='platform', required=True, choices=BrowserDriverFactory.available_platforms())
- # FIXME: Should we add chrome as an option? Well, chrome uses webkit in iOS.
- parser.add_argument('--browser', dest='browser', required=True, choices=BrowserDriverFactory.available_browsers())
- parser.add_argument('--debug', action='')
- parser.add_argument('--local-copy', dest='localCopy', help='Path to a local copy of the benchmark. e.g. PerformanceTests/SunSpider/')
- parser.add_argument('--count', dest='countOverride', type=int, help='Number of times to run the benchmark. e.g. 5')
- args = parser.parse_args()
-
- if args.debug:
- _log.setLevel(logging.DEBUG)
- _log.debug('Initializing program with following parameters')
- _log.debug('\toutput file name\t: %s' % args.output)
- _log.debug('\tbuild directory\t: %s' % args.buildDir)
- _log.debug('\tplan name\t: %s', args.plan)
- runner = BenchmarkRunner(args.plan, args.localCopy, args.countOverride, args.buildDir, args.output, args.platform, args.browser)
- runner.execute()
-
-
if __name__ == '__main__':
+ format_logger(_log)
sys.exit(main())
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py (185731 => 185732)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py 2015-06-19 01:13:37 UTC (rev 185731)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py 2015-06-19 02:32:40 UTC (rev 185732)
@@ -25,8 +25,7 @@
class BenchmarkRunner(object):
- def __init__(self, planFile, localCopy, countOverride, buildDir, outputFile, platform, browser):
- _log.info('Initializing benchmark running')
+ def __init__(self, planFile, localCopy, countOverride, buildDir, outputFile, platform, browser, httpServerDriverOverride=None, deviceID=None):
try:
planFile = self._findPlanFile(planFile)
with open(planFile, 'r') as fp:
@@ -36,10 +35,14 @@
self.plan['local_copy'] = localCopy
if countOverride:
self.plan['count'] = countOverride
+ if httpServerDriverOverride:
+ self.plan['http_server_driver'] = httpServerDriverOverride
self.browserDriver = BrowserDriverFactory.create([platform, browser])
self.httpServerDriver = HTTPServerDriverFactory.create([self.plan['http_server_driver']])
+ self.httpServerDriver.setDeviceID(deviceID)
self.buildDir = os.path.abspath(buildDir) if buildDir else None
self.outputFile = outputFile
+ self.deviceID = deviceID
except IOError as error:
_log.error('Can not open plan file: %s - Error %s' % (planFile, error))
raise error
@@ -68,7 +71,7 @@
for x in xrange(int(self.plan['count'])):
_log.info('Start the iteration %d of current benchmark' % (x + 1))
self.httpServerDriver.serve(webRoot)
- self.browserDriver.prepareEnv()
+ self.browserDriver.prepareEnv(self.deviceID)
url = "" self.planName + '/' + self.plan['entry_point'])
self.browserDriver.launchUrl(url, self.buildDir)
result = None
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py (185731 => 185732)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py 2015-06-19 01:13:37 UTC (rev 185731)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py 2015-06-19 02:32:40 UTC (rev 185732)
@@ -6,7 +6,7 @@
class BrowserDriver(object):
@abc.abstractmethod
- def prepareEnv(self):
+ def prepareEnv(self, deviceID):
pass
@abc.abstractmethod
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py (185731 => 185732)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py 2015-06-19 01:13:37 UTC (rev 185731)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py 2015-06-19 02:32:40 UTC (rev 185732)
@@ -15,7 +15,7 @@
class OSXBrowserDriver(BrowserDriver):
bundleIdentifier = None
- def prepareEnv(self):
+ def prepareEnv(self, deviceID):
self.closeBrowsers()
CGWarpMouseCursorPosition((10, 0))
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py (185731 => 185732)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2015-06-19 01:13:37 UTC (rev 185731)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2015-06-19 02:32:40 UTC (rev 185732)
@@ -16,7 +16,7 @@
class OSXSafariDriver(OSXBrowserDriver):
bundleIdentifier = 'com.apple.Safari'
- def prepareEnv(self):
+ def prepareEnv(self, deviceID):
self.safariProcess = None
super(OSXSafariDriver, self).prepareEnv()
forceRemove(os.path.join(os.path.expanduser('~'), 'Library/Saved Application State/com.apple.Safari.savedState'))
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver.py (185731 => 185732)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver.py 2015-06-19 01:13:37 UTC (rev 185731)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver.py 2015-06-19 02:32:40 UTC (rev 185732)
@@ -19,3 +19,7 @@
@abstractmethod
def getReturnCode(self):
pass
+
+ @abstractmethod
+ def setDeviceID(self, deviceID):
+ pass
Copied: trunk/Tools/Scripts/webkitpy/benchmark_runner/run_benchmark.py (from rev 185731, trunk/Tools/Scripts/run-benchmark) (0 => 185732)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/run_benchmark.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/run_benchmark.py 2015-06-19 02:32:40 UTC (rev 185732)
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+
+import argparse
+import logging
+import platform
+import os
+
+from benchmark_runner import BenchmarkRunner
+from browser_driver.browser_driver_factory import BrowserDriverFactory
+
+
+_log = logging.getLogger(__name__)
+
+
+def parse_args():
+ parser = argparse.ArgumentParser(description='Automate the browser based performance benchmarks')
+ parser.add_argument('--output-file', dest='output', default=None)
+ parser.add_argument('--build-directory', dest='buildDir', help='Path to the browser executable. e.g. WebKitBuild/Release/')
+ parser.add_argument('--plan', dest='plan', required=True, help='Benchmark plan to run. e.g. speedometer, jetstream')
+ parser.add_argument('--platform', dest='platform', required=True, choices=BrowserDriverFactory.available_platforms())
+ # FIXME: Should we add chrome as an option? Well, chrome uses webkit in iOS.
+ parser.add_argument('--browser', dest='browser', required=True, choices=BrowserDriverFactory.available_browsers())
+ parser.add_argument('--debug', action='')
+ parser.add_argument('--local-copy', dest='localCopy', help='Path to a local copy of the benchmark. e.g. PerformanceTests/SunSpider/')
+ parser.add_argument('--count', dest='countOverride', type=int, help='Number of times to run the benchmark. e.g. 5')
+ parser.add_argument('--http-server-driver', dest='httpServerDriverOverride', default=None, help='Specify which HTTP server you wants to use')
+ parser.add_argument('--device-id', dest='device_id', default=None)
+
+ args = parser.parse_args()
+
+ if args.debug:
+ _log.setLevel(logging.DEBUG)
+ _log.debug('Initializing program with following parameters')
+ _log.debug('\toutput file name\t: %s' % args.output)
+ _log.debug('\tbuild directory\t: %s' % args.buildDir)
+ _log.debug('\tplan name\t: %s', args.plan)
+
+ return args
+
+
+def start(args):
+ runner = BenchmarkRunner(args.plan, args.localCopy, args.countOverride, args.buildDir, args.output, args.platform, args.browser, args.httpServerDriverOverride, args.device_id)
+ runner.execute()
+
+
+def format_logger(logger):
+ logger.setLevel(logging.INFO)
+ ch = logging.StreamHandler()
+ formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
+ ch.setFormatter(formatter)
+ logger.addHandler(ch)
+
+
+def main():
+ start(parse_args())
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/utils.py (185731 => 185732)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/utils.py 2015-06-19 01:13:37 UTC (rev 185731)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/utils.py 2015-06-19 02:32:40 UTC (rev 185732)
@@ -23,7 +23,7 @@
def getPathFromProjectRoot(relativePathToProjectRoot):
- # Choose the directory containning current file as start point,
+ # Choose the directory containing current file as start point,
# compute relative path base on the parameter,
# and return an absolute path
return os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), relativePathToProjectRoot))
