Bug 1501788 - godot tweaks r=jmaher jmaher
authorflorin.strugariu <bebe@mozilla.ro>
Thu, 25 Oct 2018 11:34:21 +0000
changeset 491316 1975b2a668a4c78f3a463fedbfc366a90ff48a5a
parent 491315 0fc121f7a403b4dfef2efc11a48da848f60bd473
child 491317 88e1ecec651d2b23cf6aa3efd89f059fc9966468
push id247
push userfmarier@mozilla.com
push dateSat, 27 Oct 2018 01:06:44 +0000
reviewersjmaher
bugs1501788
milestone65.0a1
Bug 1501788 - godot tweaks r=jmaher jmaher Differential Revision: https://phabricator.services.mozilla.com/D9754
taskcluster/ci/test/raptor.yml
taskcluster/ci/test/test-sets.yml
testing/raptor/raptor/output.py
testing/raptor/raptor/raptor.ini
testing/raptor/raptor/tests/raptor-wasm-godot-baseline.ini
testing/raptor/raptor/tests/raptor-wasm-godot-ion.ini
--- a/taskcluster/ci/test/raptor.yml
+++ b/taskcluster/ci/test/raptor.yml
@@ -342,29 +342,51 @@ raptor-assorted-dom-chrome:
         extra-options:
             - --test=raptor-assorted-dom
             - --app=chrome
     fetches:
         fetch:
             - assorted-dom
 
 raptor-wasm-godot-firefox:
-    description: "Raptor Wasm GoDot on Firefox"
+    description: "Raptor Wasm Godot on Firefox"
     try-name: raptor-wasm-godot-firefox
     treeherder-symbol: Rap(godot)
     run-on-projects: ['try', 'mozilla-central']
     tier: 2
     max-run-time: 1500
     mozharness:
         extra-options:
             - --test=raptor-wasm-godot
 
 raptor-wasm-godot-chrome:
-    description: "Raptor Wasm GoDot on Chrome"
+    description: "Raptor Wasm Godot on Chrome"
     try-name: raptor-wasm-godot-chrome
     treeherder-symbol: Rap-C(godot)
     run-on-projects: ['try', 'mozilla-central']
     tier: 2
     max-run-time: 1500
     mozharness:
         extra-options:
             - --test=raptor-wasm-godot
             - --app=chrome
+
+raptor-wasm-godot-baseline-firefox:
+    description: "Raptor Wasm Godot on Firefox with baseline JIT"
+    try-name: raptor-wasm-godot-baseline-firefox
+    treeherder-symbol: Rap(godot-b)
+    run-on-projects: ['try', 'mozilla-central']
+    tier: 2
+    max-run-time: 1500
+    mozharness:
+        extra-options:
+            - --test=raptor-wasm-godot-baseline
+
+raptor-wasm-godot-ion-firefox:
+    description: "Raptor WASM godot on Firefox with ION Monkey"
+    try-name: raptor-wasm-godot-ion-firefox
+    treeherder-symbol: Rap(godot-i)
+    run-on-projects: ['try', 'mozilla-central']
+    tier: 2
+    max-run-time: 1500
+    mozharness:
+        extra-options:
+            - --test=raptor-wasm-godot-ion
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -103,16 +103,18 @@ raptor-chrome:
 
 # Fetch tasks are only supported on Linux for now,
 # so these need to be separate sets.
 raptor-fetch-firefox:
     - raptor-unity-webgl-firefox
     - raptor-wasm-misc-firefox
     - raptor-wasm-misc-baseline-firefox
     - raptor-wasm-misc-ion-firefox
+    - raptor-wasm-godot-baseline-firefox
+    - raptor-wasm-godot-ion-firefox
     - raptor-assorted-dom-firefox
 
 raptor-fetch-geckoview:
     - raptor-unity-webgl-geckoview
 
 raptor-fetch-chrome:
     - raptor-unity-webgl-chrome
     - raptor-wasm-misc-chrome
--- a/testing/raptor/raptor/output.py
+++ b/testing/raptor/raptor/output.py
@@ -113,17 +113,17 @@ class Output(object):
                     subtests, vals = self.parseWebaudioOutput(test)
                 elif 'unity-webgl' in test.measurements:
                     subtests, vals = self.parseUnityWebGLOutput(test)
                 elif 'assorted-dom' in test.measurements:
                     subtests, vals = self.parseAssortedDomOutput(test)
                 elif 'wasm-misc' in test.measurements:
                     subtests, vals = self.parseWASMMiscOutput(test)
                 elif 'wasm-godot' in test.measurements:
-                    subtests, vals = self.parseWASMGoDotOutput(test)
+                    subtests, vals = self.parseWASMGodotOutput(test)
                 suite['subtests'] = subtests
 
             else:
                 LOG.error("output.summarize received unsupported test results type")
                 return
 
             # for pageload tests, if there are > 1 subtests here, that means there
             # were multiple measurements captured in each single pageload; we want
@@ -214,17 +214,17 @@ class Output(object):
         names.sort(reverse=True)
         for name in names:
             _subtests[name]['value'] = filter.median(_subtests[name]['replicates'])
             subtests.append(_subtests[name])
             vals.append([_subtests[name]['value'], name])
 
         return subtests, vals
 
-    def parseWASMGoDotOutput(self, test):
+    def parseWASMGodotOutput(self, test):
         '''
             {u'wasm-godot': [
                 {
                   "name": "wasm-instantiate",
                   "time": 349
                 },{
                   "name": "engine-instantiate",
                   "time": 1263
--- a/testing/raptor/raptor/raptor.ini
+++ b/testing/raptor/raptor/raptor.ini
@@ -7,9 +7,11 @@
 [include:tests/raptor-motionmark-animometer.ini]
 [include:tests/raptor-unity-webgl.ini]
 [include:tests/raptor-webaudio.ini]
 [include:tests/raptor-gdocs.ini]
 [include:tests/raptor-wasm-misc.ini]
 [include:tests/raptor-wasm-misc-baseline.ini]
 [include:tests/raptor-wasm-misc-ion.ini]
 [include:tests/raptor-wasm-godot.ini]
+[include:tests/raptor-wasm-godot-baseline.ini]
+[include:tests/raptor-wasm-godot-ion.ini]
 [include:tests/raptor-assorted-dom.ini]
new file mode 100644
--- /dev/null
+++ b/testing/raptor/raptor/tests/raptor-wasm-godot-baseline.ini
@@ -0,0 +1,20 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Wasm-godot benchmark for firefox and chrome
+
+[DEFAULT]
+type =  benchmark
+test_url = http://localhost:<port>/wasm-godot/index.html
+page_cycles = 5
+page_timeout = 120000
+unit = ms
+lower_is_better = true
+alert_threshold = 2.0
+newtab_per_cycle = true
+
+[raptor-wasm-godot-baseline-firefox]
+apps = firefox
+preferences = {"javascript.options.wasm_baselinejit": true,
+               "javascript.options.wasm_ionjit": false}
new file mode 100644
--- /dev/null
+++ b/testing/raptor/raptor/tests/raptor-wasm-godot-ion.ini
@@ -0,0 +1,20 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Wasm-godot benchmark for firefox and chrome
+
+[DEFAULT]
+type =  benchmark
+test_url = http://localhost:<port>/wasm-godot/index.html
+page_cycles = 5
+page_timeout = 120000
+unit = ms
+lower_is_better = true
+alert_threshold = 2.0
+newtab_per_cycle = true
+
+[raptor-wasm-godot-ion-firefox]
+apps = firefox
+preferences = {"javascript.options.wasm_baselinejit": false,
+               "javascript.options.wasm_ionjit": true}