From 1ca9f82c89e5cc00183d152621f3e62a38667aeb Mon Sep 17 00:00:00 2001
From: Benjamin Bouvier <public@benj.me>
Date: Wed, 23 Nov 2016 16:58:35 +0100
Subject: [PATCH] Create a new config for wasm and wasm-baseline;

---
 .gitignore                 |  2 ++
 slave/benchmarks_remote.py |  2 +-
 slave/configs.py           | 23 +++++++++++++++++++----
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 92ce860..52eba09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,8 @@ benchmarks/asmjs-apps/zlib/minigzipsh
 
 driver/awfy.config
 slave/awfy.config
+slave/results
+slave/profile
 **/*-results/
 
 output/
diff --git a/slave/benchmarks_remote.py b/slave/benchmarks_remote.py
index de50741..e25c1f7 100644
--- a/slave/benchmarks_remote.py
+++ b/slave/benchmarks_remote.py
@@ -176,7 +176,7 @@ class Browsermark(Benchmark):
 
 class WasmMisc(Benchmark):
     def __init__(self):
-        Benchmark.__init__(self, "0.1")
+        Benchmark.__init__(self, "0.2")
         self.url = "http://wasm.local"
 
     @staticmethod
diff --git a/slave/configs.py b/slave/configs.py
index d3545f6..e0b9bd1 100644
--- a/slave/configs.py
+++ b/slave/configs.py
@@ -19,7 +19,6 @@ 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":
@@ -35,7 +34,7 @@ class Default(object):
 
     def omit(self):
         return self.omit_
-        
+
     def args(self):
         return self.args_
 
@@ -46,6 +45,18 @@ 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"
+
+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)
@@ -71,7 +82,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)
@@ -80,7 +91,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)
@@ -148,6 +159,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":