finish merge

android-driver/benchmark.py

@@ -21,7 +21,7 @@ class Benchmark:
                 os.unlink("results")
 
             engine.run(utils.config.get('main', 'serverURL')+self.page)
-            timeout = 60*3
+            timeout = 60*10
             while not os.path.exists("results") and timeout > 0:
                 time.sleep(10)
                 timeout -= 10
@@ -72,6 +72,15 @@ class Dromaeo(Benchmark):
     def __init__(self):
         Benchmark.__init__(self, "dromaeo", "1.0", "desktop-driver/dromaeo.html")
 
+    def processResults(self, results):
+        ret = []
+        for key in results:
+            if key == "total":
+                ret.append({'name': "__total__", 'time': results[key]})
+            else:
+                ret.append({'name': key, 'time': results[key]})
+        return ret
+
 Benchmarks = [Octane(), SunSpider(), Kraken(), WebGLSamples()]
 
 # Test if server is running and start server if needed.

android-driver/engine.py

@@ -127,7 +127,7 @@ class Chrome(Engine):
 
         # Step 2: Get v8 revision
         response = urllib2.urlopen(self.nightly_dir + "/Android/"+chromium_rev+"/REVISIONS")
-        self.cset = re.findall('"v8_revision": ([a-z0-9]*),', response.read())[0]
+        self.cset = re.findall('"v8_revision_git": "([a-z0-9]*)",', response.read())[0]
 
         # Step 3: Test if there is a new revision
         old_revision = ""

benchmarks/misc/tests/assorted/LIST

@@ -24,3 +24,5 @@ misc-typedobj-utf8array-typedobj
 misc-typedobj-utf8array-standard
 misc-typedobj-write-struct-field-typedobj
 misc-typedobj-write-struct-field-standard
+misc-typedobj-simple-struct-typedobj
+misc-typedobj-simple-struct-standard

benchmarks/misc/tests/assorted/misc-bugs-652377-jslint-on-jslint.js

@@ -2842,7 +2842,7 @@ loop:   for (;;) {
         x.thru = 1;
         x.line = 0;
         x.edge = true;
-        s.value = s;
+        //s.value = s;
         return postscript(x);
     }
 

benchmarks/misc/tests/assorted/misc-typedobj-simple-struct-standard.js

@@ -0,0 +1,22 @@
+// Paired with misc-typedobj-simple-struct-typedobj.js
+
+function do_test() {
+    var arr1 = new Array(100000);
+    var arr2 = new Array(100000);
+    for (var i = 0; i < arr1.length; i++) {
+        arr1[i] = {a:1,b:2};
+        arr2[i] = {a:2,b:1};
+    }
+
+    for (var i = 0; i < 100; i++) {
+        for (var j = 0; j < arr1.length; j++) {
+            var a = arr1[j].a;
+            var b = arr1[j].b;
+            arr1[j].a = arr2[j].b;
+            arr1[j].b = arr2[j].a;
+            arr2[j].a = a;
+            arr2[j].b = b;
+        }
+    }
+}
+do_test();

benchmarks/misc/tests/assorted/misc-typedobj-simple-struct-typedobj.js

@@ -0,0 +1,34 @@
+// Paired with misc-typedobj-simple-struct-standard.js
+
+if (typeof TypedObject != "undefined") {
+    var T = TypedObject;
+
+    var Struct = new T.StructType({a: T.int32, b:T.int32});
+    var ObjectArray = T.Object.array(100000);
+
+    function do_test() {
+        var arr1 = new ObjectArray();
+        var arr2 = new ObjectArray();
+        for (var i = 0; i < arr1.length; i++) {
+            arr1[i] = new Struct();
+            arr1[i].a = 1;
+            arr1[i].b = 2;
+            arr2[i] = new Struct();
+            arr2[i].a = 2;
+            arr2[i].b = 1;
+        }
+
+        for (var i = 0; i < 100; i++) {
+            for (var j = 0; j < arr1.length; j++) {
+                var a = arr1[j].a;
+                var b = arr1[j].b;
+                arr1[j].a = arr2[j].b;
+                arr1[j].b = arr2[j].a;
+                arr2[j].a = a;
+                arr2[j].b = b;
+            }
+        }
+    }
+
+    do_test();
+}

benchmarks/misc/tests/assorted/misc-typedobj-utf8array-typedobj.js

@@ -16,5 +16,6 @@ function do_test() {
     }
   }
 }
-do_test();
+if (typeof TypedObject != "undefined")
+  do_test();
 

benchmarks/misc/tests/assorted/misc-typedobj-write-struct-field-typedobj.js

@@ -1,43 +1,44 @@
 // Paired with misc-typedobj-write-struct-field-standard.js
-
-var T = TypedObject;
-
-var ThreeVector = T.float64.array(3);
-var ThreeVectorArray = ThreeVector.array();
-var DisplaceResult = new T.StructType({pos: ThreeVector, nor: ThreeVector});
-var DisplaceResultArray = DisplaceResult.array();
-
-function write(out, v0) {
-  out.pos[0] = v0[0];
-  out.pos[1] = v0[1];
-  out.pos[2] = v0[2];
-
-  out.nor[0] += v0[0];
-  out.nor[1] += v0[1];
-  out.nor[2] += v0[2];
-}
-
-function main() {
-  var start_time, end_time;
-
-  var p = new DisplaceResult();
-  var v = [1, 2, 3];
-  var len = 192 * 10 * 1024;
-
-  if (typeof TIME !== "undefined")
-    start_time = Date.now();
-
-  for (var i = 0; i < len; i++) {
-    v[0] = i+0.5;
-    v[1] = i+1.5;
-    v[2] = i+2.5;
-    write(p, v);
+if (typeof TypedObject != "undefined") {
+  var T = TypedObject;
+  
+  var ThreeVector = T.float64.array(3);
+  var ThreeVectorArray = ThreeVector.array();
+  var DisplaceResult = new T.StructType({pos: ThreeVector, nor: ThreeVector});
+  var DisplaceResultArray = DisplaceResult.array();
+  
+  function write(out, v0) {
+    out.pos[0] = v0[0];
+    out.pos[1] = v0[1];
+    out.pos[2] = v0[2];
+  
+    out.nor[0] += v0[0];
+    out.nor[1] += v0[1];
+    out.nor[2] += v0[2];
   }
-
-  if (typeof TIME !== "undefined") {
-    end_time = Date.now();
-    print("Elapsed:", (end_time - start_time));
+  
+  function main() {
+    var start_time, end_time;
+  
+    var p = new DisplaceResult();
+    var v = [1, 2, 3];
+    var len = 192 * 10 * 1024;
+  
+    if (typeof TIME !== "undefined")
+      start_time = Date.now();
+  
+    for (var i = 0; i < len; i++) {
+      v[0] = i+0.5;
+      v[1] = i+1.5;
+      v[2] = i+2.5;
+      write(p, v);
+    }
+  
+    if (typeof TIME !== "undefined") {
+      end_time = Date.now();
+      print("Elapsed:", (end_time - start_time));
+    }
   }
+  
+  main();
 }
-
-main();

browser-driver/browserbenchmarks.py

@@ -71,9 +71,21 @@ class WebGLSamples(Benchmark):
 
 class Dromaeo(Benchmark):
     def __init__(self):
-        Benchmark.__init__(self, "dromaeo", "1.0", "browser-driver/dromaeo.html")
+        Benchmark.__init__(self, "dromaeo", "1.0", "desktop-driver/dromaeo.html")
+        
+    def processResults(self, results):
+        ret = []
+        for key in results:
+            if key == "total":
+                ret.append({'name': "__total__", 'time': results[key]})
+            else:
+                ret.append({'name': key, 'time': results[key]})
+        return ret
 
-Benchmarks = [Octane(), SunSpider(), Kraken(), Dromaeo(), WebGLSamples()]
+if utils.config.get('main', 'slaveType') is "android":
+    Benchmarks = [Octane(), SunSpider(), Kraken(), WebGLSamples()]
+else:
+    Benchmarks = [Octane(), SunSpider(), Kraken(), Dromaeo(), WebGLSamples()]
 
 # Test if server is running and start server if needed.
 s =  socket.socket(socket.AF_INET, socket.SOCK_STREAM)

database/schema.sql

@@ -205,9 +205,11 @@ CREATE TABLE `awfy_machine` (
   `description` varchar(255) NOT NULL,
   `active` tinyint(1) NOT NULL,
   `frontpage` tinyint(1) NOT NULL DEFAULT '1',
+  `pushed_separate` tinyint(1) NOT NULL,
   `last_checked` int(10) unsigned NOT NULL,
   `timeout` int(11) unsigned NOT NULL,
   `contact` mediumtext NOT NULL,
+  `message` text NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
 

driver/builders.py

@@ -131,12 +131,13 @@ class V8(Engine):
         self.important = True
         self.hardfp = (utils.config.has_option('main', 'flags')) and \
                        ("hardfp" in utils.config.get('main', 'flags'))
-        self.modes = [
-                {
-                    'mode': 'v8git',
-                    'args': None
-                }
-            ]
+        self.modes = [{
+                        'mode': 'v8',
+                        'args': None
+                      }, {
+                        'mode': 'v8-turbofan',
+                        'args': ['--turbo-filter=*', '--turbo-asm'] 
+                      }]
 
     def build(self):
         env = os.environ.copy()

server/data.py

@@ -45,7 +45,7 @@ class Vendor(object):
         self.rangeURL = rangeURL
 
 class Machine(object):
-    def __init__(self, id, os, cpu, description, active, frontpage, pushed_separate):
+    def __init__(self, id, os, cpu, description, active, frontpage, pushed_separate, message):
         self.id = id
         self.os = os
         self.cpu = cpu
@@ -53,6 +53,7 @@ class Machine(object):
         self.active = active
         self.frontpage = frontpage
         self.pushed_separate = pushed_separate
+        self.message = message
 
         self.suites = []
         c = awfy.db.cursor()
@@ -75,6 +76,7 @@ class Machine(object):
                  "description": self.description,
                  "frontpage": self.frontpage,
                  "pushed_separate": self.pushed_separate,
+                 "message": self.message,
                  "suites": self.suites
                }
 
@@ -160,9 +162,9 @@ class Context(object):
 
         # Get a list of machines.
         self.machines = []
-        c.execute("SELECT id, os, cpu, description, active, frontpage, pushed_separate FROM awfy_machine WHERE active >= 1")
+        c.execute("SELECT id, os, cpu, description, active, frontpage, pushed_separate, message FROM awfy_machine WHERE active >= 1")
         for row in c.fetchall():
-            m = Machine(row[0], row[1], row[2], row[3], row[4], row[5], row[6])
+            m = Machine(row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7])
             self.machines.append(m)
 
     def exportModes(self):

website/awfy.js

@@ -840,6 +840,7 @@ AWFY.updateMachineList = function (machineId) {
         a.appendTo(li);
         li.appendTo(menu);
     }
+    $('#message').html(AWFYMaster.machines[machineId].message+"<br />&nbsp;");
 }
 
 AWFY.updateSuiteList = function (machineId) {

website/index.html

@@ -30,6 +30,7 @@
     });
   </script>
  <div class="graph-row">
+  <div id="message"></div>
   <div id="navcontainer">
     <ul id="legend"></ul>
     <br><br>

website/style.css

@@ -121,6 +121,9 @@ h1 {
  font-weight: bold;
 }
 
+#message {
+  font-style: italic;
+}
 
 .axisLabel {
 	position: absolute;