Add a remote wasm benchmark;

slave/benchmarks_remote.py

@@ -174,6 +174,15 @@ class Browsermark(Benchmark):
     def name():
         return "browsermark"
 
+class WasmMisc(Benchmark):
+    def __init__(self):
+        Benchmark.__init__(self, "0.1")
+        self.url = "http://wasm.local"
+
+    @staticmethod
+    def name():
+        return "wasm"
+
 KnownBenchmarks = [
     Octane,
     Dromaeo,
@@ -182,7 +191,8 @@ KnownBenchmarks = [
     Speedometer,
     Kraken,
     SunSpider,
-    Browsermark
+    Browsermark,
+    WasmMisc,
 ]
 
 # TODO use this when showing execute.py's help.

slave/configs.py

@@ -19,6 +19,7 @@ class Default(object):
         if engine == "firefox":
             self.env_["JSGC_DISABLE_POISONING"] = "1"
             self.profile_ += "user_pref(\"dom.max_script_run_time\", 0);\n"
+            self.profile_ += "user_pref(\"javascript.options.wasm\", true);\n"
         elif engine == "chrome":
             pass
         elif engine == "webkit":

slave/execute.py

@@ -14,7 +14,7 @@ import utils
 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')")

slave/executors.py

@@ -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)

slave/server.py

@@ -284,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);');