<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209980] trunk/JSTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209980">209980</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-12-19 00:19:01 -0800 (Mon, 19 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebAssembly: Make running Wasm tests take less time by reducing some tests' iteration count and by splitting some tests into different files
https://bugs.webkit.org/show_bug.cgi?id=166017
Reviewed by Yusuke Suzuki.
* wasm/function-tests/trap-load-2.js: Added.
(assert):
(wasmFrameCountFromError):
(continuation):
(i.catch):
* wasm/function-tests/trap-load.js:
(assert.continuation): Deleted.
* wasm/function-tests/trap-store-2.js: Added.
(import.Builder.from.string_appeared_here.assert):
(continuation):
(i.catch):
* wasm/function-tests/trap-store.js:
(assert.continuation): Deleted.
(assert): Deleted.
* wasm/js-api/test_memory.js:
(test):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTestswasmfunctionteststraploadjs">trunk/JSTests/wasm/function-tests/trap-load.js</a></li>
<li><a href="#trunkJSTestswasmfunctionteststrapstorejs">trunk/JSTests/wasm/function-tests/trap-store.js</a></li>
<li><a href="#trunkJSTestswasmjsapitest_memoryjs">trunk/JSTests/wasm/js-api/test_memory.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestswasmfunctionteststrapload2js">trunk/JSTests/wasm/function-tests/trap-load-2.js</a></li>
<li><a href="#trunkJSTestswasmfunctionteststrapstore2js">trunk/JSTests/wasm/function-tests/trap-store-2.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (209979 => 209980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-12-19 07:22:42 UTC (rev 209979)
+++ trunk/JSTests/ChangeLog 2016-12-19 08:19:01 UTC (rev 209980)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-12-19 Saam Barati <sbarati@apple.com>
+
+ WebAssembly: Make running Wasm tests take less time by reducing some tests' iteration count and by splitting some tests into different files
+ https://bugs.webkit.org/show_bug.cgi?id=166017
+
+ Reviewed by Yusuke Suzuki.
+
+ * wasm/function-tests/trap-load-2.js: Added.
+ (assert):
+ (wasmFrameCountFromError):
+ (continuation):
+ (i.catch):
+ * wasm/function-tests/trap-load.js:
+ (assert.continuation): Deleted.
+ * wasm/function-tests/trap-store-2.js: Added.
+ (import.Builder.from.string_appeared_here.assert):
+ (continuation):
+ (i.catch):
+ * wasm/function-tests/trap-store.js:
+ (assert.continuation): Deleted.
+ (assert): Deleted.
+ * wasm/js-api/test_memory.js:
+ (test):
+
</ins><span class="cx"> 2016-12-18 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> WebAssembly: Implement the WebAssembly.compile and WebAssembly.validate
</span></span></pre></div>
<a id="trunkJSTestswasmfunctionteststrapload2jsfromrev209979trunkJSTestswasmfunctionteststraploadjs"></a>
<div class="copfile"><h4>Copied: trunk/JSTests/wasm/function-tests/trap-load-2.js (from rev 209979, trunk/JSTests/wasm/function-tests/trap-load.js) (0 => 209980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/function-tests/trap-load-2.js (rev 0)
+++ trunk/JSTests/wasm/function-tests/trap-load-2.js 2016-12-19 08:19:01 UTC (rev 209980)
</span><span class="lines">@@ -0,0 +1,87 @@
</span><ins>+import Builder from '../Builder.js'
+
+const pageSize = 64 * 1024;
+const numPages = 10;
+
+const builder = (new Builder())
+ .Type().End()
+ .Import()
+ .Memory("a", "b", {initial: numPages})
+ .End()
+ .Function().End()
+ .Export().Function("foo").End()
+ .Code()
+ .Function("foo", {params: ["i32"], ret: "i32"})
+ .GetLocal(0)
+ .I32Load(2, 0)
+ .Return()
+ .End()
+ .End();
+
+function assert(b) {
+ if (!b)
+ throw new Error("Bad")
+}
+
+function wasmFrameCountFromError(e) {
+ let stackFrames = e.stack.split("\n").filter((s) => s.indexOf("<wasm>@[wasm code]") !== -1);
+ return stackFrames.length;
+}
+
+{
+ const builder = (new Builder())
+ .Type().End()
+ .Import()
+ .Memory("imp", "mem", {initial: numPages})
+ .Function("imp", "func", { params: ["i32"] })
+ .End()
+ .Function().End()
+ .Export().Function("foo").End()
+ .Code()
+ .Function("foo", {params: ["i32", "i32"]})
+ .GetLocal(0)
+ .I32Const(0)
+ .I32Eq()
+ .If("void", b =>
+ b.GetLocal(1)
+ .GetLocal(1)
+ .I32Load(2, 0)
+ .Br(0)
+ .Else()
+ .GetLocal(0)
+ .Call(0)
+ .Br(0)
+ )
+ .End()
+ .End();
+
+ const bin = builder.WebAssembly().get();
+ const module = new WebAssembly.Module(bin);
+ const imp = {
+ imp: {
+ mem: new WebAssembly.Memory({initial: numPages}),
+ func: continuation
+ }
+ };
+ const foo = new WebAssembly.Instance(module, imp).exports.foo;
+ const address = numPages*pageSize + 1;
+ function continuation(x) {
+ foo(x - 1, address);
+ }
+
+ for (let i = 0; i < 5000; i++) {
+ let threw = false;
+ try {
+ foo(5, address);
+ } catch(e) {
+ assert(e instanceof WebAssembly.RuntimeError);
+ assert(e.message === "Out of bounds memory access");
+ // There are 5 total calls, and each call does:
+ // JS entry, wasm entry, js call stub.
+ // The last call that traps just has JS entry and wasm entry.
+ assert(wasmFrameCountFromError(e) === 5 * 3 + 2);
+ threw = true;
+ }
+ assert(threw);
+ }
+}
</ins></span></pre></div>
<a id="trunkJSTestswasmfunctionteststraploadjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/wasm/function-tests/trap-load.js (209979 => 209980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/function-tests/trap-load.js 2016-12-19 07:22:42 UTC (rev 209979)
+++ trunk/JSTests/wasm/function-tests/trap-load.js 2016-12-19 08:19:01 UTC (rev 209980)
</span><span class="lines">@@ -44,61 +44,3 @@
</span><span class="cx"> }
</span><span class="cx"> assert(threw);
</span><span class="cx"> }
</span><del>-
-{
- const builder = (new Builder())
- .Type().End()
- .Import()
- .Memory("imp", "mem", {initial: numPages})
- .Function("imp", "func", { params: ["i32"] })
- .End()
- .Function().End()
- .Export().Function("foo").End()
- .Code()
- .Function("foo", {params: ["i32", "i32"]})
- .GetLocal(0)
- .I32Const(0)
- .I32Eq()
- .If("void", b =>
- b.GetLocal(1)
- .GetLocal(1)
- .I32Load(2, 0)
- .Br(0)
- .Else()
- .GetLocal(0)
- .Call(0)
- .Br(0)
- )
- .End()
- .End();
-
- const bin = builder.WebAssembly().get();
- const module = new WebAssembly.Module(bin);
- const imp = {
- imp: {
- mem: new WebAssembly.Memory({initial: numPages}),
- func: continuation
- }
- };
- const foo = new WebAssembly.Instance(module, imp).exports.foo;
- const address = numPages*pageSize + 1;
- function continuation(x) {
- foo(x - 1, address);
- }
-
- for (let i = 0; i < 10000; i++) {
- let threw = false;
- try {
- foo(25, address);
- } catch(e) {
- assert(e instanceof WebAssembly.RuntimeError);
- assert(e.message === "Out of bounds memory access");
- // There are 25 total calls, and each call does:
- // JS entry, wasm entry, js call stub.
- // The last call that traps just has JS entry and wasm entry.
- assert(wasmFrameCountFromError(e) === 25 * 3 + 2);
- threw = true;
- }
- assert(threw);
- }
-}
</del></span></pre></div>
<a id="trunkJSTestswasmfunctionteststrapstore2jsfromrev209979trunkJSTestswasmfunctionteststrapstorejs"></a>
<div class="copfile"><h4>Copied: trunk/JSTests/wasm/function-tests/trap-store-2.js (from rev 209979, trunk/JSTests/wasm/function-tests/trap-store.js) (0 => 209980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/function-tests/trap-store-2.js (rev 0)
+++ trunk/JSTests/wasm/function-tests/trap-store-2.js 2016-12-19 08:19:01 UTC (rev 209980)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+import Builder from '../Builder.js'
+
+function assert(b) {
+ if (!b)
+ throw new Error("Bad")
+}
+
+const pageSize = 64 * 1024;
+const numPages = 10;
+
+{
+ const builder = (new Builder())
+ .Type().End()
+ .Import()
+ .Memory("imp", "mem", {initial: numPages})
+ .Function("imp", "func", { params: ["i32"] })
+ .End()
+ .Function().End()
+ .Export().Function("foo").End()
+ .Code()
+ .Function("foo", {params: ["i32", "i32"]})
+ .GetLocal(0)
+ .I32Const(0)
+ .I32Eq()
+ .If("void", b =>
+ b.GetLocal(1)
+ .GetLocal(0)
+ .I32Store(2, 0)
+ .Br(0)
+ .Else()
+ .GetLocal(0)
+ .Call(0)
+ .Br(0)
+ )
+ .End()
+ .End();
+
+ const bin = builder.WebAssembly().get();
+ const module = new WebAssembly.Module(bin);
+ const imp = {
+ imp: {
+ mem: new WebAssembly.Memory({initial: numPages}),
+ func: continuation
+ }
+ };
+ const foo = new WebAssembly.Instance(module, imp).exports.foo;
+ const address = numPages*pageSize + 1;
+ function continuation(x) {
+ foo(x - 1, address);
+ }
+
+ for (let i = 0; i < 5000; i++) {
+ let threw = false;
+ try {
+ foo(6, address);
+ } catch(e) {
+ assert(e instanceof WebAssembly.RuntimeError);
+ assert(e.message === "Out of bounds memory access");
+ threw = true;
+ }
+ assert(threw);
+ }
+}
</ins></span></pre></div>
<a id="trunkJSTestswasmfunctionteststrapstorejs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/wasm/function-tests/trap-store.js (209979 => 209980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/function-tests/trap-store.js 2016-12-19 07:22:42 UTC (rev 209979)
+++ trunk/JSTests/wasm/function-tests/trap-store.js 2016-12-19 08:19:01 UTC (rev 209980)
</span><span class="lines">@@ -40,58 +40,3 @@
</span><span class="cx"> assert(threw);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
-
-{
- const builder = (new Builder())
- .Type().End()
- .Import()
- .Memory("imp", "mem", {initial: numPages})
- .Function("imp", "func", { params: ["i32"] })
- .End()
- .Function().End()
- .Export().Function("foo").End()
- .Code()
- .Function("foo", {params: ["i32", "i32"]})
- .GetLocal(0)
- .I32Const(0)
- .I32Eq()
- .If("void", b =>
- b.GetLocal(1)
- .GetLocal(0)
- .I32Store(2, 0)
- .Br(0)
- .Else()
- .GetLocal(0)
- .Call(0)
- .Br(0)
- )
- .End()
- .End();
-
- const bin = builder.WebAssembly().get();
- const module = new WebAssembly.Module(bin);
- const imp = {
- imp: {
- mem: new WebAssembly.Memory({initial: numPages}),
- func: continuation
- }
- };
- const foo = new WebAssembly.Instance(module, imp).exports.foo;
- const address = numPages*pageSize + 1;
- function continuation(x) {
- foo(x - 1, address);
- }
-
- for (let i = 0; i < 10000; i++) {
- let threw = false;
- try {
- foo(25, address);
- } catch(e) {
- assert(e instanceof WebAssembly.RuntimeError);
- assert(e.message === "Out of bounds memory access");
- threw = true;
- }
- assert(threw);
- }
-}
</del></span></pre></div>
<a id="trunkJSTestswasmjsapitest_memoryjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/wasm/js-api/test_memory.js (209979 => 209980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/js-api/test_memory.js 2016-12-19 07:22:42 UTC (rev 209979)
+++ trunk/JSTests/wasm/js-api/test_memory.js 2016-12-19 08:19:01 UTC (rev 209980)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> test(function() {
</span><del>- const memoryDescription = {initial: 20, maximum: 20};
</del><ins>+ const memoryDescription = {initial: 2, maximum: 2};
</ins><span class="cx"> const builder = (new Builder())
</span><span class="cx"> .Type().End()
</span><span class="cx"> .Import().Memory("imp", "memory", memoryDescription).End()
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> test(function() {
</span><del>- const memoryDescription = {initial: 20, maximum: 20};
</del><ins>+ const memoryDescription = {initial: 2, maximum: 2};
</ins><span class="cx"> const builder = (new Builder())
</span><span class="cx"> .Type().End()
</span><span class="cx"> .Import().Memory("imp", "memory", memoryDescription).End()
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> test(function() {
</span><del>- const memoryDescription = {initial: 20, maximum: 20};
</del><ins>+ const memoryDescription = {initial: 2, maximum: 2};
</ins><span class="cx"> const builder = (new Builder())
</span><span class="cx"> .Type().End()
</span><span class="cx"> .Import().Memory("imp", "memory", memoryDescription).End()
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> test(function() {
</span><del>- const memoryDescription = {initial: 20, maximum: 20};
</del><ins>+ const memoryDescription = {initial: 2, maximum: 2};
</ins><span class="cx"> const builder = (new Builder())
</span><span class="cx"> .Type().End()
</span><span class="cx"> .Import().Memory("imp", "memory", memoryDescription).End()
</span></span></pre>
</div>
</div>
</body>
</html>