Title: [193855] trunk/LayoutTests
Revision
193855
Author
mark....@apple.com
Date
2015-12-09 13:07:23 -0800 (Wed, 09 Dec 2015)

Log Message

Rename ftl-object-* tests to ftl-polymorphic-*.
https://bugs.webkit.org/show_bug.cgi?id=152091

Reviewed by Saam Barati.

This is because those tests are actually testing the effects of polymorphic
operands on performance, and not the correctness of operations on objects.

* js/regress/ftl-object-div-expected.txt: Removed.
* js/regress/ftl-object-div.html: Removed.
* js/regress/ftl-object-mul-expected.txt: Removed.
* js/regress/ftl-object-mul.html: Removed.
* js/regress/ftl-object-sub-expected.txt: Removed.
* js/regress/ftl-object-sub.html: Removed.
* js/regress/ftl-polymorphic-div-expected.txt: Copied from LayoutTests/js/regress/ftl-object-div-expected.txt.
* js/regress/ftl-polymorphic-div.html: Copied from LayoutTests/js/regress/ftl-object-div.html.
* js/regress/ftl-polymorphic-mul-expected.txt: Copied from LayoutTests/js/regress/ftl-object-mul-expected.txt.
* js/regress/ftl-polymorphic-mul.html: Copied from LayoutTests/js/regress/ftl-object-mul.html.
* js/regress/ftl-polymorphic-sub-expected.txt: Copied from LayoutTests/js/regress/ftl-object-sub-expected.txt.
* js/regress/ftl-polymorphic-sub.html: Copied from LayoutTests/js/regress/ftl-object-sub.html.
* js/regress/script-tests/ftl-object-div.js: Removed.
* js/regress/script-tests/ftl-object-mul.js: Removed.
* js/regress/script-tests/ftl-object-sub.js: Removed.
* js/regress/script-tests/ftl-polymorphic-div.js: Copied from LayoutTests/js/regress/script-tests/ftl-object-div.js.
* js/regress/script-tests/ftl-polymorphic-mul.js: Copied from LayoutTests/js/regress/script-tests/ftl-object-mul.js.
* js/regress/script-tests/ftl-polymorphic-sub.js: Copied from LayoutTests/js/regress/script-tests/ftl-object-sub.js.

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (193854 => 193855)


--- trunk/LayoutTests/ChangeLog	2015-12-09 20:22:51 UTC (rev 193854)
+++ trunk/LayoutTests/ChangeLog	2015-12-09 21:07:23 UTC (rev 193855)
@@ -1,3 +1,32 @@
+2015-12-09  Mark Lam  <mark....@apple.com>
+
+        Rename ftl-object-* tests to ftl-polymorphic-*.
+        https://bugs.webkit.org/show_bug.cgi?id=152091
+
+        Reviewed by Saam Barati.
+
+        This is because those tests are actually testing the effects of polymorphic
+        operands on performance, and not the correctness of operations on objects.
+
+        * js/regress/ftl-object-div-expected.txt: Removed.
+        * js/regress/ftl-object-div.html: Removed.
+        * js/regress/ftl-object-mul-expected.txt: Removed.
+        * js/regress/ftl-object-mul.html: Removed.
+        * js/regress/ftl-object-sub-expected.txt: Removed.
+        * js/regress/ftl-object-sub.html: Removed.
+        * js/regress/ftl-polymorphic-div-expected.txt: Copied from LayoutTests/js/regress/ftl-object-div-expected.txt.
+        * js/regress/ftl-polymorphic-div.html: Copied from LayoutTests/js/regress/ftl-object-div.html.
+        * js/regress/ftl-polymorphic-mul-expected.txt: Copied from LayoutTests/js/regress/ftl-object-mul-expected.txt.
+        * js/regress/ftl-polymorphic-mul.html: Copied from LayoutTests/js/regress/ftl-object-mul.html.
+        * js/regress/ftl-polymorphic-sub-expected.txt: Copied from LayoutTests/js/regress/ftl-object-sub-expected.txt.
+        * js/regress/ftl-polymorphic-sub.html: Copied from LayoutTests/js/regress/ftl-object-sub.html.
+        * js/regress/script-tests/ftl-object-div.js: Removed.
+        * js/regress/script-tests/ftl-object-mul.js: Removed.
+        * js/regress/script-tests/ftl-object-sub.js: Removed.
+        * js/regress/script-tests/ftl-polymorphic-div.js: Copied from LayoutTests/js/regress/script-tests/ftl-object-div.js.
+        * js/regress/script-tests/ftl-polymorphic-mul.js: Copied from LayoutTests/js/regress/script-tests/ftl-object-mul.js.
+        * js/regress/script-tests/ftl-polymorphic-sub.js: Copied from LayoutTests/js/regress/script-tests/ftl-object-sub.js.
+
 2015-12-09  Carlos Alberto Lopez Perez  <clo...@igalia.com>
 
         [GTK] Unreviewed GTK Gardening.

Deleted: trunk/LayoutTests/js/regress/ftl-object-div-expected.txt (193854 => 193855)


--- trunk/LayoutTests/js/regress/ftl-object-div-expected.txt	2015-12-09 20:22:51 UTC (rev 193854)
+++ trunk/LayoutTests/js/regress/ftl-object-div-expected.txt	2015-12-09 21:07:23 UTC (rev 193855)
@@ -1,10 +0,0 @@
-JSRegress/ftl-object-div
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS no exception thrown
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: trunk/LayoutTests/js/regress/ftl-object-div.html (193854 => 193855)


--- trunk/LayoutTests/js/regress/ftl-object-div.html	2015-12-09 20:22:51 UTC (rev 193854)
+++ trunk/LayoutTests/js/regress/ftl-object-div.html	2015-12-09 21:07:23 UTC (rev 193855)
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<script src=""
-<script src=""
-<script src=""
-<script src=""
-</body>
-</html>

Deleted: trunk/LayoutTests/js/regress/ftl-object-mul-expected.txt (193854 => 193855)


--- trunk/LayoutTests/js/regress/ftl-object-mul-expected.txt	2015-12-09 20:22:51 UTC (rev 193854)
+++ trunk/LayoutTests/js/regress/ftl-object-mul-expected.txt	2015-12-09 21:07:23 UTC (rev 193855)
@@ -1,10 +0,0 @@
-JSRegress/ftl-object-mul
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS no exception thrown
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: trunk/LayoutTests/js/regress/ftl-object-mul.html (193854 => 193855)


--- trunk/LayoutTests/js/regress/ftl-object-mul.html	2015-12-09 20:22:51 UTC (rev 193854)
+++ trunk/LayoutTests/js/regress/ftl-object-mul.html	2015-12-09 21:07:23 UTC (rev 193855)
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<script src=""
-<script src=""
-<script src=""
-<script src=""
-</body>
-</html>

Deleted: trunk/LayoutTests/js/regress/ftl-object-sub-expected.txt (193854 => 193855)


--- trunk/LayoutTests/js/regress/ftl-object-sub-expected.txt	2015-12-09 20:22:51 UTC (rev 193854)
+++ trunk/LayoutTests/js/regress/ftl-object-sub-expected.txt	2015-12-09 21:07:23 UTC (rev 193855)
@@ -1,10 +0,0 @@
-JSRegress/ftl-object-sub
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS no exception thrown
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: trunk/LayoutTests/js/regress/ftl-object-sub.html (193854 => 193855)


--- trunk/LayoutTests/js/regress/ftl-object-sub.html	2015-12-09 20:22:51 UTC (rev 193854)
+++ trunk/LayoutTests/js/regress/ftl-object-sub.html	2015-12-09 21:07:23 UTC (rev 193855)
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<script src=""
-<script src=""
-<script src=""
-<script src=""
-</body>
-</html>

Copied: trunk/LayoutTests/js/regress/ftl-polymorphic-div-expected.txt (from rev 193854, trunk/LayoutTests/js/regress/ftl-object-div-expected.txt) (0 => 193855)


--- trunk/LayoutTests/js/regress/ftl-polymorphic-div-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/js/regress/ftl-polymorphic-div-expected.txt	2015-12-09 21:07:23 UTC (rev 193855)
@@ -0,0 +1,10 @@
+JSRegress/ftl-polymorphic-div
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

Copied: trunk/LayoutTests/js/regress/ftl-polymorphic-div.html (from rev 193854, trunk/LayoutTests/js/regress/ftl-object-div.html) (0 => 193855)


--- trunk/LayoutTests/js/regress/ftl-polymorphic-div.html	                        (rev 0)
+++ trunk/LayoutTests/js/regress/ftl-polymorphic-div.html	2015-12-09 21:07:23 UTC (rev 193855)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src=""
+</head>
+<body>
+<script src=""
+<script src=""
+<script src=""
+<script src=""
+</body>
+</html>

Copied: trunk/LayoutTests/js/regress/ftl-polymorphic-mul-expected.txt (from rev 193854, trunk/LayoutTests/js/regress/ftl-object-mul-expected.txt) (0 => 193855)


--- trunk/LayoutTests/js/regress/ftl-polymorphic-mul-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/js/regress/ftl-polymorphic-mul-expected.txt	2015-12-09 21:07:23 UTC (rev 193855)
@@ -0,0 +1,10 @@
+JSRegress/ftl-polymorphic-mul
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

Copied: trunk/LayoutTests/js/regress/ftl-polymorphic-mul.html (from rev 193854, trunk/LayoutTests/js/regress/ftl-object-mul.html) (0 => 193855)


--- trunk/LayoutTests/js/regress/ftl-polymorphic-mul.html	                        (rev 0)
+++ trunk/LayoutTests/js/regress/ftl-polymorphic-mul.html	2015-12-09 21:07:23 UTC (rev 193855)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src=""
+</head>
+<body>
+<script src=""
+<script src=""
+<script src=""
+<script src=""
+</body>
+</html>

Copied: trunk/LayoutTests/js/regress/ftl-polymorphic-sub-expected.txt (from rev 193854, trunk/LayoutTests/js/regress/ftl-object-sub-expected.txt) (0 => 193855)


--- trunk/LayoutTests/js/regress/ftl-polymorphic-sub-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/js/regress/ftl-polymorphic-sub-expected.txt	2015-12-09 21:07:23 UTC (rev 193855)
@@ -0,0 +1,10 @@
+JSRegress/ftl-polymorphic-sub
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

Copied: trunk/LayoutTests/js/regress/ftl-polymorphic-sub.html (from rev 193854, trunk/LayoutTests/js/regress/ftl-object-sub.html) (0 => 193855)


--- trunk/LayoutTests/js/regress/ftl-polymorphic-sub.html	                        (rev 0)
+++ trunk/LayoutTests/js/regress/ftl-polymorphic-sub.html	2015-12-09 21:07:23 UTC (rev 193855)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src=""
+</head>
+<body>
+<script src=""
+<script src=""
+<script src=""
+<script src=""
+</body>
+</html>

Deleted: trunk/LayoutTests/js/regress/script-tests/ftl-object-div.js (193854 => 193855)


--- trunk/LayoutTests/js/regress/script-tests/ftl-object-div.js	2015-12-09 20:22:51 UTC (rev 193854)
+++ trunk/LayoutTests/js/regress/script-tests/ftl-object-div.js	2015-12-09 21:07:23 UTC (rev 193855)
@@ -1,43 +0,0 @@
-//@ runFTLNoCJIT
-var o1 = {
-    i: 0,
-    valueOf: function() { return this.i; }
-};
-
-result = 0;
-function foo(a, b) {
-    var result = 0;
-    for (var j = 0; j < 10; j++) {
-        var temp;
-        if (a > b)
-            temp = a / b;
-        else
-            temp = b / 1;
-        temp = temp | 0;
-        result += temp;
-    }
-    for (var i = 0; i < 1000; i++)
-        result += i;
-    return result;
-}
-noInline(foo);
-
-var iterations;
-var expectedResult;
-if (this.window) {
-    // The layout test doesn't like too many iterations and may time out.
-    iterations = 10000;
-    expectedResult = 5045480390;
-} else {
-    iterations = 100000;
-    expectedResult = 54950300390;
-}
-
-
-for (var i = 0; i <= iterations; i++) {
-    o1.i = i + 2;
-    result += foo(o1, 10);
-}
-
-if (result != expectedResult)
-    throw "Bad result: " + result;

Deleted: trunk/LayoutTests/js/regress/script-tests/ftl-object-mul.js (193854 => 193855)


--- trunk/LayoutTests/js/regress/script-tests/ftl-object-mul.js	2015-12-09 20:22:51 UTC (rev 193854)
+++ trunk/LayoutTests/js/regress/script-tests/ftl-object-mul.js	2015-12-09 21:07:23 UTC (rev 193855)
@@ -1,40 +0,0 @@
-//@ runFTLNoCJIT
-var o1 = {
-    i: 0,
-    valueOf: function() { return this.i; }
-};
-
-result = 0;
-function foo(a, b) {
-    var result = 0;
-    for (var j = 0; j < 10; j++) {
-        if (a > b)
-            result += a * b;
-        else
-            result += b * 1;
-    }
-    for (var i = 0; i < 1000; i++)
-        result += i;
-    return result;
-}
-noInline(foo);
-
-var iterations;
-var expectedResult;
-if (this.window) {
-    // The layout test doesn't like too many iterations and may time out.
-    iterations = 10000;
-    expectedResult = 9997995200;
-} else {
-    iterations = 100000;
-    expectedResult = 549975495200;
-}
-
-
-for (var i = 0; i <= iterations; i++) {
-    o1.i = i + 2;
-    result += foo(o1, 10);
-}
-
-if (result != expectedResult)
-    throw "Bad result: " + result;

Deleted: trunk/LayoutTests/js/regress/script-tests/ftl-object-sub.js (193854 => 193855)


--- trunk/LayoutTests/js/regress/script-tests/ftl-object-sub.js	2015-12-09 20:22:51 UTC (rev 193854)
+++ trunk/LayoutTests/js/regress/script-tests/ftl-object-sub.js	2015-12-09 21:07:23 UTC (rev 193855)
@@ -1,43 +0,0 @@
-//@ runFTLNoCJIT
-var o1 = {
-    i: 0,
-    valueOf: function() { return this.i; }
-};
-var o2 = {
-    i: 0,
-    valueOf: function() { return this.i; }
-};
-
-result = 0;
-function foo(a, b) {
-    var result = 0;
-    for (var j = 0; j < 10; j++) {
-        if (a > b)
-            result += a - b;
-        else
-            result += b - 1;
-    }
-    return result;
-}
-noInline(foo);
-
-var iterations;
-var expectedResult;
-if (this.window) {
-    // The layout test doesn't like too many iterations and may time out.
-    iterations = 10000;
-    expectedResult = 200020;
-} else {
-    iterations = 100000;
-    expectedResult = 2000020;
-}
-
-
-for (var i = 0; i <= iterations; i++) {
-    o1.i = i + 2;
-    o2.i = i;
-    result += foo(o1, o2);
-}
-
-if (result != expectedResult)
-    throw "Bad result: " + result;

Copied: trunk/LayoutTests/js/regress/script-tests/ftl-polymorphic-div.js (from rev 193854, trunk/LayoutTests/js/regress/script-tests/ftl-object-div.js) (0 => 193855)


--- trunk/LayoutTests/js/regress/script-tests/ftl-polymorphic-div.js	                        (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/ftl-polymorphic-div.js	2015-12-09 21:07:23 UTC (rev 193855)
@@ -0,0 +1,43 @@
+//@ runFTLNoCJIT
+var o1 = {
+    i: 0,
+    valueOf: function() { return this.i; }
+};
+
+result = 0;
+function foo(a, b) {
+    var result = 0;
+    for (var j = 0; j < 10; j++) {
+        var temp;
+        if (a > b)
+            temp = a / b;
+        else
+            temp = b / 1;
+        temp = temp | 0;
+        result += temp;
+    }
+    for (var i = 0; i < 1000; i++)
+        result += i;
+    return result;
+}
+noInline(foo);
+
+var iterations;
+var expectedResult;
+if (this.window) {
+    // The layout test doesn't like too many iterations and may time out.
+    iterations = 10000;
+    expectedResult = 5045480390;
+} else {
+    iterations = 100000;
+    expectedResult = 54950300390;
+}
+
+
+for (var i = 0; i <= iterations; i++) {
+    o1.i = i + 2;
+    result += foo(o1, 10);
+}
+
+if (result != expectedResult)
+    throw "Bad result: " + result;

Copied: trunk/LayoutTests/js/regress/script-tests/ftl-polymorphic-mul.js (from rev 193854, trunk/LayoutTests/js/regress/script-tests/ftl-object-mul.js) (0 => 193855)


--- trunk/LayoutTests/js/regress/script-tests/ftl-polymorphic-mul.js	                        (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/ftl-polymorphic-mul.js	2015-12-09 21:07:23 UTC (rev 193855)
@@ -0,0 +1,40 @@
+//@ runFTLNoCJIT
+var o1 = {
+    i: 0,
+    valueOf: function() { return this.i; }
+};
+
+result = 0;
+function foo(a, b) {
+    var result = 0;
+    for (var j = 0; j < 10; j++) {
+        if (a > b)
+            result += a * b;
+        else
+            result += b * 1;
+    }
+    for (var i = 0; i < 1000; i++)
+        result += i;
+    return result;
+}
+noInline(foo);
+
+var iterations;
+var expectedResult;
+if (this.window) {
+    // The layout test doesn't like too many iterations and may time out.
+    iterations = 10000;
+    expectedResult = 9997995200;
+} else {
+    iterations = 100000;
+    expectedResult = 549975495200;
+}
+
+
+for (var i = 0; i <= iterations; i++) {
+    o1.i = i + 2;
+    result += foo(o1, 10);
+}
+
+if (result != expectedResult)
+    throw "Bad result: " + result;

Copied: trunk/LayoutTests/js/regress/script-tests/ftl-polymorphic-sub.js (from rev 193854, trunk/LayoutTests/js/regress/script-tests/ftl-object-sub.js) (0 => 193855)


--- trunk/LayoutTests/js/regress/script-tests/ftl-polymorphic-sub.js	                        (rev 0)
+++ trunk/LayoutTests/js/regress/script-tests/ftl-polymorphic-sub.js	2015-12-09 21:07:23 UTC (rev 193855)
@@ -0,0 +1,43 @@
+//@ runFTLNoCJIT
+var o1 = {
+    i: 0,
+    valueOf: function() { return this.i; }
+};
+var o2 = {
+    i: 0,
+    valueOf: function() { return this.i; }
+};
+
+result = 0;
+function foo(a, b) {
+    var result = 0;
+    for (var j = 0; j < 10; j++) {
+        if (a > b)
+            result += a - b;
+        else
+            result += b - 1;
+    }
+    return result;
+}
+noInline(foo);
+
+var iterations;
+var expectedResult;
+if (this.window) {
+    // The layout test doesn't like too many iterations and may time out.
+    iterations = 10000;
+    expectedResult = 200020;
+} else {
+    iterations = 100000;
+    expectedResult = 2000020;
+}
+
+
+for (var i = 0; i <= iterations; i++) {
+    o1.i = i + 2;
+    o2.i = i;
+    result += foo(o1, o2);
+}
+
+if (result != expectedResult)
+    throw "Bad result: " + result;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to