Merge pull request #109 from bnjbvr/wasm-misc
A few cleanups and a new remote benchmark
This commit is contained in:
Hannes Verschore
GitHub
Коммит
d80104e97e
|
|
@ -25,6 +25,8 @@ benchmarks/asmjs-apps/zlib/minigzipsh
|
|||
|
||||
driver/awfy.config
|
||||
slave/awfy.config
|
||||
slave/results
|
||||
slave/profile
|
||||
**/*-results/
|
||||
|
||||
output/
|
||||
|
|
|
|||
|
|
@ -3,12 +3,13 @@ def getBenchmark(benchmark):
|
|||
section, name = benchmark.split(".")
|
||||
if section == "local":
|
||||
import benchmarks_local
|
||||
return benchmarks_local.getBenchmark(name);
|
||||
return benchmarks_local.getBenchmark(name)
|
||||
elif section == "remote":
|
||||
import benchmarks_remote
|
||||
return benchmarks_remote.getBenchmark(name);
|
||||
return benchmarks_remote.getBenchmark(name)
|
||||
elif section == "shell":
|
||||
import benchmarks_shell
|
||||
return benchmarks_shell.getBenchmark(name);
|
||||
return benchmarks_shell.getBenchmark(name)
|
||||
else:
|
||||
raise Exception("Unknown benchmark type")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,27 +1,32 @@
|
|||
import subprocess
|
||||
import socket
|
||||
import os
|
||||
import time
|
||||
import json
|
||||
import os
|
||||
import socket
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
|
||||
sys.path.insert(1, '../driver')
|
||||
|
||||
import utils
|
||||
|
||||
class Benchmark:
|
||||
""" timeout is in minutes """
|
||||
def __init__(self, suite, version, timeout=2):
|
||||
self.suite = suite
|
||||
self.version = suite+" "+version
|
||||
def __init__(self, version, timeout=2, suite=None):
|
||||
self.suite = suite if suite is not None else self.name()
|
||||
self.version = self.suite + " " + version
|
||||
self.url = 'http://' + self.suite + ".localhost:8000"
|
||||
self.timeout = timeout
|
||||
|
||||
def processResults(self, results):
|
||||
return results
|
||||
|
||||
@staticmethod
|
||||
def name(self):
|
||||
raise Exception("NYI")
|
||||
|
||||
class Octane(Benchmark):
|
||||
def __init__(self):
|
||||
Benchmark.__init__(self, "octane", "2.0.1")
|
||||
Benchmark.__init__(self, "2.0.1")
|
||||
|
||||
def processResults(self, results):
|
||||
ret = []
|
||||
|
|
@ -32,9 +37,13 @@ class Octane(Benchmark):
|
|||
ret.append({'name': key, 'time': results[key]})
|
||||
return ret
|
||||
|
||||
@staticmethod
|
||||
def name():
|
||||
return "octane"
|
||||
|
||||
class Dromaeo(Benchmark):
|
||||
def __init__(self):
|
||||
Benchmark.__init__(self, "dromaeo", "1.0", 17)
|
||||
Benchmark.__init__(self, "1.0", 17)
|
||||
self.url = 'http://' + self.suite + ".localhost:8000/?recommended"
|
||||
|
||||
def processResults(self, results):
|
||||
|
|
@ -46,9 +55,13 @@ class Dromaeo(Benchmark):
|
|||
ret.append({'name': key, 'time': results[key]})
|
||||
return ret
|
||||
|
||||
@staticmethod
|
||||
def name():
|
||||
return "dromaeo"
|
||||
|
||||
class Massive(Benchmark):
|
||||
def __init__(self):
|
||||
Benchmark.__init__(self, "massive", "1.2", 9)
|
||||
Benchmark.__init__(self, "1.2", 9)
|
||||
|
||||
def processResults(self, results):
|
||||
ret = []
|
||||
|
|
@ -61,9 +74,13 @@ class Massive(Benchmark):
|
|||
ret.append({'name': item["benchmark"], 'time': item["result"]})
|
||||
return ret
|
||||
|
||||
@staticmethod
|
||||
def name():
|
||||
return "massive"
|
||||
|
||||
class JetStream(Benchmark):
|
||||
def __init__(self):
|
||||
Benchmark.__init__(self, "jetstream", "1.0", 5)
|
||||
Benchmark.__init__(self, "1.0", 5)
|
||||
|
||||
def processResults(self, results):
|
||||
ret = []
|
||||
|
|
@ -74,13 +91,21 @@ class JetStream(Benchmark):
|
|||
ret.append({'name': item, 'time': results[item]["statistics"]["mean"]})
|
||||
return ret
|
||||
|
||||
@staticmethod
|
||||
def name():
|
||||
return "jetstream"
|
||||
|
||||
class Speedometer(Benchmark):
|
||||
def __init__(self):
|
||||
Benchmark.__init__(self, "speedometer", "1.0", 4)
|
||||
Benchmark.__init__(self, "1.0", 4)
|
||||
|
||||
@staticmethod
|
||||
def name():
|
||||
return "speedometer"
|
||||
|
||||
class Kraken(Benchmark):
|
||||
def __init__(self):
|
||||
Benchmark.__init__(self, "kraken", "1.1")
|
||||
Benchmark.__init__(self, "1.1")
|
||||
|
||||
def processResults(self, results):
|
||||
ret = []
|
||||
|
|
@ -100,9 +125,13 @@ class Kraken(Benchmark):
|
|||
ret.append({'name': "__total__", 'time': total })
|
||||
return ret
|
||||
|
||||
@staticmethod
|
||||
def name():
|
||||
return "kraken"
|
||||
|
||||
class SunSpider(Benchmark):
|
||||
def __init__(self):
|
||||
Benchmark.__init__(self, "ss", "1.0.2", 1)
|
||||
Benchmark.__init__(self, "1.0.2", 1, suite="ss")
|
||||
self.url = "http://sunspider.localhost:8000/"
|
||||
|
||||
def processResults(self, results):
|
||||
|
|
@ -123,9 +152,13 @@ class SunSpider(Benchmark):
|
|||
ret.append({'name': "__total__", 'time': total })
|
||||
return ret
|
||||
|
||||
@staticmethod
|
||||
def name():
|
||||
return "sunspider"
|
||||
|
||||
class Browsermark(Benchmark):
|
||||
def __init__(self):
|
||||
Benchmark.__init__(self, "browsermark", "2.1", 5)
|
||||
Benchmark.__init__(self, "2.1", 5)
|
||||
self.url = "http://browsermark.local:8082/"
|
||||
|
||||
def processResults(self, results):
|
||||
|
|
@ -137,27 +170,43 @@ class Browsermark(Benchmark):
|
|||
ret.append({'name': item[0], 'time': item[1]})
|
||||
return ret
|
||||
|
||||
@staticmethod
|
||||
def name():
|
||||
return "browsermark"
|
||||
|
||||
class WasmMisc(Benchmark):
|
||||
def __init__(self):
|
||||
Benchmark.__init__(self, "0.2")
|
||||
self.url = "http://wasm.local"
|
||||
|
||||
@staticmethod
|
||||
def name():
|
||||
return "wasm"
|
||||
|
||||
KnownBenchmarks = [
|
||||
Octane,
|
||||
Dromaeo,
|
||||
Massive,
|
||||
JetStream,
|
||||
Speedometer,
|
||||
Kraken,
|
||||
SunSpider,
|
||||
Browsermark,
|
||||
WasmMisc,
|
||||
]
|
||||
|
||||
# TODO use this when showing execute.py's help.
|
||||
def get_all_known_benchmark_names():
|
||||
return [b.name() for b in KnownBenchmarks]
|
||||
|
||||
def getBenchmark(name):
|
||||
if name == "octane":
|
||||
return Octane()
|
||||
if name == "dromaeo":
|
||||
return Dromaeo()
|
||||
if name == "massive":
|
||||
return Massive()
|
||||
if name == "jetstream":
|
||||
return JetStream()
|
||||
if name == "speedometer":
|
||||
return Speedometer()
|
||||
if name == "kraken":
|
||||
return Kraken()
|
||||
if name == "sunspider":
|
||||
return SunSpider()
|
||||
if name == "browsermark":
|
||||
return Browsermark()
|
||||
for b in KnownBenchmarks:
|
||||
if name == b.name():
|
||||
return b()
|
||||
raise Exception("Unknown benchmark")
|
||||
|
||||
# Test if server is running and start server if needed.
|
||||
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
result = s.connect_ex(("localhost", 8000))
|
||||
s.close()
|
||||
if result > 0:
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ class Default(object):
|
|||
|
||||
def omit(self):
|
||||
return self.omit_
|
||||
|
||||
|
||||
def args(self):
|
||||
return self.args_
|
||||
|
||||
|
|
@ -45,6 +45,20 @@ class Default(object):
|
|||
# Currently only for firefox profile js file.
|
||||
return self.profile_
|
||||
|
||||
class Wasm(Default):
|
||||
def __init__(self, engine, shell):
|
||||
super(Wasm, self).__init__(engine, shell)
|
||||
if engine == "firefox":
|
||||
self.profile_ += "user_pref(\"javascript.options.wasm\", true);\n"
|
||||
elif engine == "chrome":
|
||||
self.args_ += ['--js-flags=--expose_wasm']
|
||||
|
||||
class WasmBaseline(Wasm):
|
||||
def __init__(self, engine, shell):
|
||||
super(WasmBaseline, self).__init__(engine, shell)
|
||||
if engine == "firefox":
|
||||
self.profile_ += "user_pref(\"javascript.options.wasm_baselinejit\", true);\n"
|
||||
|
||||
class UnboxedObjects(Default):
|
||||
def __init__(self, engine, shell):
|
||||
super(UnboxedObjects, self).__init__(engine, shell)
|
||||
|
|
@ -70,7 +84,7 @@ class TurboFan(Default):
|
|||
self.args_.append("--turbo");
|
||||
else:
|
||||
self.omit_ = True
|
||||
|
||||
|
||||
class TurboIgnition(Default):
|
||||
def __init__(self, engine, shell):
|
||||
super(TurboIgnition, self).__init__(engine, shell)
|
||||
|
|
@ -79,7 +93,7 @@ class TurboIgnition(Default):
|
|||
self.args_.append("--ignition-staging");
|
||||
else:
|
||||
self.omit_ = True
|
||||
|
||||
|
||||
class Ignition(Default):
|
||||
def __init__(self, engine, shell):
|
||||
super(Ignition, self).__init__(engine, shell)
|
||||
|
|
@ -147,6 +161,10 @@ class E10S(Default):
|
|||
def getConfig(name, info):
|
||||
if name == "default":
|
||||
return Default(info["engine_type"], info["shell"])
|
||||
if name == "wasm":
|
||||
return Wasm(info["engine_type"], info["shell"])
|
||||
if name == "wasm-baseline":
|
||||
return WasmBaseline(info["engine_type"], info["shell"])
|
||||
if name == "unboxedobjects":
|
||||
return UnboxedObjects(info["engine_type"], info["shell"])
|
||||
if name == "testbedregalloc":
|
||||
|
|
|
|||
|
|
@ -1,18 +1,19 @@
|
|||
import json
|
||||
import urllib2
|
||||
import urllib
|
||||
import re
|
||||
import os
|
||||
import platform
|
||||
import re
|
||||
import shutil
|
||||
import socket
|
||||
import utils
|
||||
import platform
|
||||
import url_creator
|
||||
|
||||
import tarfile
|
||||
import urllib
|
||||
import urllib2
|
||||
import zipfile
|
||||
|
||||
socket.setdefaulttimeout(120)
|
||||
|
||||
import url_creator
|
||||
import utils
|
||||
|
||||
DEBUG = True
|
||||
|
||||
class DownloadTools(object):
|
||||
|
|
@ -58,13 +59,13 @@ class Downloader(object):
|
|||
def valid(self):
|
||||
return self.getfilename() != None
|
||||
|
||||
def setOutputFolder(self, folder):
|
||||
def set_output_folder(self, folder):
|
||||
if not folder.endswith("/"):
|
||||
folder += "/"
|
||||
self.folder = folder
|
||||
|
||||
def download(self):
|
||||
self.createOutputFolder()
|
||||
self.create_output_folder()
|
||||
|
||||
filename = self.getfilename()
|
||||
assert filename
|
||||
|
|
@ -76,7 +77,7 @@ class Downloader(object):
|
|||
json.dump(info, fp)
|
||||
fp.close()
|
||||
|
||||
def createOutputFolder(self):
|
||||
def create_output_folder(self):
|
||||
if os.path.isdir(self.folder):
|
||||
shutil.rmtree(self.folder)
|
||||
os.makedirs(self.folder)
|
||||
|
|
@ -218,11 +219,11 @@ class GoogleAPISDownloader(Downloader):
|
|||
|
||||
def getfilename(self):
|
||||
platform = self.url.split("/")[-3]
|
||||
if platform == "Linux":
|
||||
if platform.startswith("Linux"):
|
||||
return "chrome-linux.zip"
|
||||
elif platform == "Mac":
|
||||
return "chrome-mac.zip"
|
||||
elif platform.startswith("Win"): # Yeah chrome puts win64 in win32 folder
|
||||
elif platform.startswith("Win"): # Chrome puts win64 in win32 folder.
|
||||
return "chrome-win32.zip"
|
||||
elif platform == "Android":
|
||||
return "chrome-android.zip"
|
||||
|
|
@ -285,9 +286,9 @@ if __name__ == "__main__":
|
|||
parser.add_option("-u", "--url", dest="url",
|
||||
help="Specify a specific url to download.", default=None)
|
||||
parser.add_option("--repo", dest="repo",
|
||||
help="Specify a repo to download. Currently only mozilla-inbound supported.", default=None)
|
||||
help="Specify a repo to download. Currently supports: mozilla-inbound (cset?) | chrome", default=None)
|
||||
parser.add_option("-r", dest="cset",
|
||||
help="Specify the revision to download. Default to 'latest'", default='latest')
|
||||
help="Specify the revision to download. Defaults to 'latest'", default='latest')
|
||||
(options, args) = parser.parse_args()
|
||||
|
||||
if options.url:
|
||||
|
|
@ -295,7 +296,7 @@ if __name__ == "__main__":
|
|||
elif options.repo:
|
||||
downloader = DownloadTools.forRepo(options.repo, options.cset)
|
||||
else:
|
||||
raise Exception("You'll need to specify atleast an url or repo")
|
||||
raise Exception("You'll need to specify at least an url or repo")
|
||||
|
||||
downloader.setOutputFolder(options.output)
|
||||
downloader.set_output_folder(options.output)
|
||||
downloader.download()
|
||||
|
|
|
|||
|
|
@ -1,19 +1,20 @@
|
|||
import benchmarks
|
||||
import configs
|
||||
import executors
|
||||
import engineInfo
|
||||
import submitter
|
||||
import json
|
||||
import sys
|
||||
import traceback
|
||||
|
||||
import sys
|
||||
from optparse import OptionParser
|
||||
|
||||
import benchmarks
|
||||
import configs
|
||||
import engineInfo
|
||||
import executors
|
||||
import submitter
|
||||
import utils
|
||||
|
||||
from optparse import OptionParser
|
||||
parser = OptionParser(usage="usage: %prog url [options]")
|
||||
|
||||
parser.add_option("-b", "--benchmark", action="append", dest="benchmarks",
|
||||
help="Benchmark to run (the local ones are deprecated): remote.octane, remote.dromaeo, remote.massive, remote.jetstream, remote.speedometer, remote.kraken, remote.sunspider, remote.browsermark, shell.octane, shell.sunspider, shell.kraken, shell.assorted, shell.asmjsapps, shell.asmjsmicro, shell.shumway, shell.dart, local.octane, local.sunspider, local.kraken, local.weglsamples, local.assorteddom")
|
||||
help="Benchmark to run (the local ones are deprecated): remote.octane, remote.dromaeo, remote.massive, remote.jetstream, remote.speedometer, remote.kraken, remote.sunspider, remote.browsermark, remote.wasm, shell.octane, shell.sunspider, shell.kraken, shell.assorted, shell.asmjsapps, shell.asmjsmicro, shell.shumway, shell.dart, local.octane, local.sunspider, local.kraken, local.weglsamples, local.assorteddom")
|
||||
|
||||
parser.add_option("-s", "--submitter", dest="submitter", type="string", default="print",
|
||||
help="Submitter class ('remote' or 'print')")
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
import runners
|
||||
import time
|
||||
import os
|
||||
import sys
|
||||
import json
|
||||
|
||||
import utils
|
||||
import runners
|
||||
|
||||
class ShellExecutor(object):
|
||||
def __init__(self, engineInfo):
|
||||
|
|
@ -130,7 +130,7 @@ class FirefoxExecutor(BrowserExecutor):
|
|||
self.resetResults()
|
||||
|
||||
# start browser
|
||||
process = runner.start(binary, args + ["--profile", runner.getdir("profile")], env)
|
||||
process = runner.start(binary, args + ["--no-remote", "--profile", runner.getdir("profile")], env)
|
||||
|
||||
# wait for results
|
||||
self.waitForResults(benchmark.timeout)
|
||||
|
|
@ -235,13 +235,13 @@ class ServoExecutor(BrowserExecutor):
|
|||
def getExecutor(engineInfo):
|
||||
if engineInfo["shell"]:
|
||||
return ShellExecutor(engineInfo)
|
||||
if engineInfo["engine_type"] == "firefox" and not engineInfo["shell"]:
|
||||
if engineInfo["engine_type"] == "firefox":
|
||||
return FirefoxExecutor(engineInfo)
|
||||
if engineInfo["engine_type"] == "chrome" and not engineInfo["shell"]:
|
||||
if engineInfo["engine_type"] == "chrome":
|
||||
return ChromeExecutor(engineInfo)
|
||||
if engineInfo["engine_type"] == "webkit" and not engineInfo["shell"]:
|
||||
if engineInfo["engine_type"] == "webkit":
|
||||
return WebKitExecutor(engineInfo)
|
||||
if engineInfo["engine_type"] == "edge" and not engineInfo["shell"]:
|
||||
if engineInfo["engine_type"] == "edge":
|
||||
return EdgeExecutor(engineInfo)
|
||||
if engineInfo["engine_type"] == "servo":
|
||||
return ServoExecutor(engineInfo)
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
import sys
|
||||
import BaseHTTPServer
|
||||
from SimpleHTTPServer import SimpleHTTPRequestHandler
|
||||
import urlparse
|
||||
import os
|
||||
import json
|
||||
import urllib
|
||||
import httplib
|
||||
from SocketServer import ThreadingMixIn
|
||||
import hashlib
|
||||
import httplib
|
||||
import json
|
||||
import os
|
||||
import pickle
|
||||
import utils
|
||||
import signal
|
||||
import sys
|
||||
import urllib
|
||||
import urlparse
|
||||
|
||||
from SimpleHTTPServer import SimpleHTTPRequestHandler
|
||||
from SocketServer import ThreadingMixIn
|
||||
|
||||
import utils
|
||||
|
||||
class FakeHandler(SimpleHTTPRequestHandler):
|
||||
|
||||
|
|
@ -282,7 +284,6 @@ class FakeHandler(SimpleHTTPRequestHandler):
|
|||
if path == "/benchmarks/misc-desktop/hosted/assorted/driver.html":
|
||||
return data.replace('location = "results.html?" + encodeURI(outputString);',
|
||||
'location.href = "http://localhost:8000/submit?results=" + encodeURI(outputString);');
|
||||
if host == "localhost":
|
||||
if path == "/benchmarks/webaudio/webaudio-bench.js":
|
||||
return data.replace('xhr.open("POST", "/results", true);',
|
||||
'xhr.open("POST", "/submit", true);');
|
||||
|
|
@ -322,8 +323,6 @@ Protocol = "HTTP/1.0"
|
|||
Port = 8000
|
||||
ServerAddress = ('', Port)
|
||||
|
||||
import os
|
||||
import utils
|
||||
path = os.path.abspath(os.path.join(os.path.dirname(__file__),".."))
|
||||
with utils.FolderChanger(path):
|
||||
HandlerClass.protocol_version = Protocol
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ class Submitter(object):
|
|||
def mode(self, engine_type, config):
|
||||
name = engine_type + "," + config
|
||||
if name in self.rules:
|
||||
return self.rules[engine_type + "," + config]
|
||||
return self.rules[name]
|
||||
else:
|
||||
return name
|
||||
|
||||
|
|
|
|||
|
|
@ -19,19 +19,22 @@ class ChromeUrlCreator(UrlCreator):
|
|||
|
||||
def _url_base(self):
|
||||
platform = self._platform()
|
||||
return "http://commondatastorage.googleapis.com/chromium-browser-continuous/"+platform+"/"
|
||||
return "http://commondatastorage.googleapis.com/chromium-browser-snapshots/"+platform+"/"
|
||||
|
||||
def _platform(self):
|
||||
arch, _ = platform.architecture()
|
||||
arch = arch[0:2]
|
||||
if platform.system() == "Linux":
|
||||
return "Linux"
|
||||
if arch == '64':
|
||||
return "Linux_x64"
|
||||
if arch == '32':
|
||||
return "Linux"
|
||||
if platform.system() == "Darwin":
|
||||
return "Mac"
|
||||
if platform.system() == "Windows" or platform.system().startswith("CYGWIN"):
|
||||
if arch == '32':
|
||||
return "Win"
|
||||
elif arch == '64':
|
||||
if arch == '64':
|
||||
return "Win_x64"
|
||||
raise Exception("Unknown platform: " + platform.system())
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче