changeset 24765:1e533bcca9f8

8043611: Move timing dependent benchmark for apply2call specialization to currently_failing. It is dependent that nothing takes machine time when doing the two runs, causing spurious assertions. Suggest running octane.raytrace manually instead to verify that this works, or incorporating it in the nightly test suite Reviewed-by: sundar, attila
author lagergren
date Wed, 21 May 2014 16:12:40 +0200
parents 722a9603b237
children 7b54e2362c6c
files nashorn/test/script/basic/apply_to_call/apply_to_call_bench.js nashorn/test/script/basic/apply_to_call/apply_to_call_bench.js.EXPECTED nashorn/test/script/currently-failing/apply_to_call_bench.js nashorn/test/script/currently-failing/apply_to_call_bench.js.EXPECTED
diffstat 4 files changed, 99 insertions(+), 99 deletions(-) [+]
line wrap: on
line diff
--- a/nashorn/test/script/basic/apply_to_call/apply_to_call_bench.js	Wed May 21 16:12:40 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- * 
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- * 
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- * 
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * sanity check that apply to call specialization is faster than apply.
- *
- * @test
-  * @run
- */
-
-var Class = {
-    create: function() {
-	return function() { //vararg
-	    this.initialize.apply(this, arguments);
-	}
-    }
-};
-
-Color = Class.create();
-Color.prototype = {
-    red: 0, green: 0, blue: 0,
-    initialize: function(r,g,b) {
-	this.red = r;
-	this.green = g;
-	this.blue = b;
-    }
-};
-
-var time1 = 0;
-var time2 = 0;
-
-function set_time1(t) {
-    time1 = t;
-}
-
-function set_time2(t) {
-    time2 = t;
-}
-
-function bench(x, set_time) {
-    var d = new Date;
-    var colors = new Array(16);
-    for (var i=0;i<1e8;i++) {
-	colors[i & 0xf] = new Color(1,2,3);
-    }
-    var t = new Date - d;
-    set_time(t);
-    return colors;
-}
-
-//warmup
-print("Running warmup");
-bench(17, set_time1);
-
-print("Running sharp run");
-bench(17, set_time1);
-
-print("Swapping out call");
-Function.prototype.call = function() {
-    throw "This should not happen, apply should be called instead";
-};
-
-print("Rerunning invalidated");
-bench(17, set_time2);
-
-print("All done!");
-
-if (time1 > time2) {
-    print("ERROR: time1 > time2 (" + time1 + " > " + time2 + ")");
-} else {
-    print("Times OK");
-}
-
--- a/nashorn/test/script/basic/apply_to_call/apply_to_call_bench.js.EXPECTED	Wed May 21 16:12:40 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Running warmup
-Running sharp run
-Swapping out call
-Rerunning invalidated
-All done!
-Times OK
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/currently-failing/apply_to_call_bench.js	Wed May 21 16:12:40 2014 +0200
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * sanity check that apply to call specialization is faster than apply.
+ *
+ * @test
+  * @run
+ */
+
+var Class = {
+    create: function() {
+	return function() { //vararg
+	    this.initialize.apply(this, arguments);
+	}
+    }
+};
+
+Color = Class.create();
+Color.prototype = {
+    red: 0, green: 0, blue: 0,
+    initialize: function(r,g,b) {
+	this.red = r;
+	this.green = g;
+	this.blue = b;
+    }
+};
+
+var time1 = 0;
+var time2 = 0;
+
+function set_time1(t) {
+    time1 = t;
+}
+
+function set_time2(t) {
+    time2 = t;
+}
+
+function bench(x, set_time) {
+    var d = new Date;
+    var colors = new Array(16);
+    for (var i=0;i<1e8;i++) {
+	colors[i & 0xf] = new Color(1,2,3);
+    }
+    var t = new Date - d;
+    set_time(t);
+    return colors;
+}
+
+//warmup
+print("Running warmup");
+bench(17, set_time1);
+
+print("Running sharp run");
+bench(17, set_time1);
+
+print("Swapping out call");
+Function.prototype.call = function() {
+    throw "This should not happen, apply should be called instead";
+};
+
+print("Rerunning invalidated");
+bench(17, set_time2);
+
+print("All done!");
+
+if (time1 > time2) {
+    print("ERROR: time1 > time2 (" + time1 + " > " + time2 + ")");
+} else {
+    print("Times OK");
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/currently-failing/apply_to_call_bench.js.EXPECTED	Wed May 21 16:12:40 2014 +0200
@@ -0,0 +1,6 @@
+Running warmup
+Running sharp run
+Swapping out call
+Rerunning invalidated
+All done!
+Times OK