<!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>[208719] trunk</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/208719">208719</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-11-14 17:09:33 -0800 (Mon, 14 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add Wasm select
https://bugs.webkit.org/show_bug.cgi?id=164743
Reviewed by Saam Barati.
JSTests:
* wasm/function-tests/select.js: Added.
Source/JavaScriptCore:
Also, this patch fixes an issue with the jsc.cpp test harness where negative numbers would be sign extended
when they shouldn't be.
* jsc.cpp:
(box):
* wasm/WasmB3IRGenerator.cpp:
* wasm/WasmFunctionParser.h:
(JSC::Wasm::FunctionParser<Context>::parseExpression):
* wasm/WasmValidate.cpp:
(JSC::Wasm::Validate::addSelect):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmB3IRGeneratorcpp">trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmFunctionParserh">trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmValidatecpp">trunk/Source/JavaScriptCore/wasm/WasmValidate.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestswasmfunctiontestsselectjs">trunk/JSTests/wasm/function-tests/select.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (208718 => 208719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-11-15 01:06:49 UTC (rev 208718)
+++ trunk/JSTests/ChangeLog 2016-11-15 01:09:33 UTC (rev 208719)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-11-14 Keith Miller <keith_miller@apple.com>
+
+ Add Wasm select
+ https://bugs.webkit.org/show_bug.cgi?id=164743
+
+ Reviewed by Saam Barati.
+
+ * wasm/function-tests/select.js: Added.
+
</ins><span class="cx"> 2016-11-14 Caitlin Potter <caitp@igalia.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Handle new_async_func / new_async_func_exp in DFG / FTL
</span></span></pre></div>
<a id="trunkJSTestswasmfunctiontestsselectjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/wasm/function-tests/select.js (0 => 208719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/function-tests/select.js (rev 0)
+++ trunk/JSTests/wasm/function-tests/select.js 2016-11-15 01:09:33 UTC (rev 208719)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+import Builder from '../Builder.js'
+
+const b = new Builder();
+b.setChecked(false);
+b.Type().End()
+ .Function().End()
+ .Code()
+ .Function({ params: ["i32"], ret: "i32" }, [])
+ .I32Const(1)
+ .I32Const(2)
+ .GetLocal(0)
+ .Select()
+ .End()
+
+// This function should be foo(x, y) { return x ? x : y; }
+ .Function({ params: ["i32", "i32"], ret: "i32" }, [])
+ .GetLocal(0)
+ .GetLocal(1)
+ .GetLocal(0)
+ .Select()
+ .End()
+
+const bin = b.WebAssembly()
+bin.trim()
+testWasmModuleFunctions(bin.get(), 2, [
+ [{ type: "i32", value: 2 }, [{ type: "i32", value: 0 }]],
+ [{ type: "i32", value: 1 }, [{ type: "i32", value: 1 }]],
+ [{ type: "i32", value: 1 }, [{ type: "i32", value: -1 }]]
+], [
+ [{ type: "i32", value: 1 }, [{ type: "i32", value: 0 }, { type: "i32", value: 1 }]],
+ [{ type: "i32", value: -1 }, [{ type: "i32", value: 0 }, { type: "i32", value: -1 }]],
+ [{ type: "i32", value: 1 }, [{ type: "i32", value: 1 }, { type: "i32", value: 10 }]],
+ [{ type: "i32", value: 30 }, [{ type: "i32", value: 30 }, { type: "i32", value: 10 }]]
+]);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (208718 => 208719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-11-15 01:06:49 UTC (rev 208718)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-11-15 01:09:33 UTC (rev 208719)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-11-14 Keith Miller <keith_miller@apple.com>
+
+ Add Wasm select
+ https://bugs.webkit.org/show_bug.cgi?id=164743
+
+ Reviewed by Saam Barati.
+
+ Also, this patch fixes an issue with the jsc.cpp test harness where negative numbers would be sign extended
+ when they shouldn't be.
+
+ * jsc.cpp:
+ (box):
+ * wasm/WasmB3IRGenerator.cpp:
+ * wasm/WasmFunctionParser.h:
+ (JSC::Wasm::FunctionParser<Context>::parseExpression):
+ * wasm/WasmValidate.cpp:
+ (JSC::Wasm::Validate::addSelect):
+
</ins><span class="cx"> 2016-11-11 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> JSC should distinguish between local and global eval
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (208718 => 208719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2016-11-15 01:06:49 UTC (rev 208718)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2016-11-15 01:09:33 UTC (rev 208719)
</span><span class="lines">@@ -2381,7 +2381,7 @@
</span><span class="cx">
</span><span class="cx"> if (typeString == "i32") {
</span><span class="cx"> RELEASE_ASSERT(value.isInt32());
</span><del>- return JSValue::decode(value.asInt32());
</del><ins>+ return JSValue::decode(static_cast<uint32_t>(value.asInt32()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (typeString == "f32")
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmB3IRGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp (208718 => 208719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp 2016-11-15 01:06:49 UTC (rev 208718)
+++ trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp 2016-11-15 01:09:33 UTC (rev 208719)
</span><span class="lines">@@ -166,6 +166,7 @@
</span><span class="cx"> // Basic operators
</span><span class="cx"> bool WARN_UNUSED_RETURN binaryOp(BinaryOpType, ExpressionType left, ExpressionType right, ExpressionType& result);
</span><span class="cx"> bool WARN_UNUSED_RETURN unaryOp(UnaryOpType, ExpressionType arg, ExpressionType& result);
</span><ins>+ bool WARN_UNUSED_RETURN addSelect(ExpressionType condition, ExpressionType nonZero, ExpressionType zero, ExpressionType& result);
</ins><span class="cx">
</span><span class="cx"> // Control flow
</span><span class="cx"> ControlData WARN_UNUSED_RETURN addBlock(Type signature);
</span><span class="lines">@@ -465,6 +466,12 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool B3IRGenerator::addSelect(ExpressionType condition, ExpressionType nonZero, ExpressionType zero, ExpressionType& result)
+{
+ result = m_currentBlock->appendNew<Value>(m_proc, B3::Select, Origin(), condition, nonZero, zero);
+ return true;
+}
+
</ins><span class="cx"> B3IRGenerator::ExpressionType B3IRGenerator::addConstant(Type type, uint64_t value)
</span><span class="cx"> {
</span><span class="cx"> switch (type) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmFunctionParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h (208718 => 208719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h 2016-11-15 01:06:49 UTC (rev 208718)
+++ trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h 2016-11-15 01:09:33 UTC (rev 208719)
</span><span class="lines">@@ -197,6 +197,27 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ case OpType::Select: {
+ ExpressionType condition;
+ if (!popExpressionStack(condition))
+ return false;
+
+ ExpressionType zero;
+ if (!popExpressionStack(zero))
+ return false;
+
+ ExpressionType nonZero;
+ if (!popExpressionStack(nonZero))
+ return false;
+
+ ExpressionType result;
+ if (!m_context.addSelect(condition, nonZero, zero, result))
+ return false;
+
+ m_expressionStack.append(result);
+ return true;
+ }
+
</ins><span class="cx"> FOR_EACH_WASM_MEMORY_LOAD_OP(CREATE_CASE) {
</span><span class="cx"> uint32_t alignment;
</span><span class="cx"> if (!parseVarUInt32(alignment))
</span><span class="lines">@@ -433,7 +454,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case OpType::Select:
</del><span class="cx"> case OpType::Nop:
</span><span class="cx"> case OpType::Drop:
</span><span class="cx"> case OpType::TeeLocal:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmValidatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmValidate.cpp (208718 => 208719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmValidate.cpp 2016-11-15 01:06:49 UTC (rev 208718)
+++ trunk/Source/JavaScriptCore/wasm/WasmValidate.cpp 2016-11-15 01:09:33 UTC (rev 208719)
</span><span class="lines">@@ -93,6 +93,7 @@
</span><span class="cx"> // Basic operators
</span><span class="cx"> bool WARN_UNUSED_RETURN binaryOp(BinaryOpType, ExpressionType left, ExpressionType right, ExpressionType& result);
</span><span class="cx"> bool WARN_UNUSED_RETURN unaryOp(UnaryOpType, ExpressionType arg, ExpressionType& result);
</span><ins>+ bool WARN_UNUSED_RETURN addSelect(ExpressionType condition, ExpressionType nonZero, ExpressionType zero, ExpressionType& result);
</ins><span class="cx">
</span><span class="cx"> // Control flow
</span><span class="cx"> ControlData WARN_UNUSED_RETURN addBlock(Type signature);
</span><span class="lines">@@ -182,6 +183,22 @@
</span><span class="cx"> return ControlData(BlockType::Loop, signature);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool Validate::addSelect(ExpressionType condition, ExpressionType nonZero, ExpressionType zero, ExpressionType& result)
+{
+ if (condition != I32) {
+ m_errorMessage = makeString("Attempting to use ", toString(condition), " as the condition for select");
+ return false;
+ }
+
+ if (nonZero != zero) {
+ m_errorMessage = makeString("Result types of select don't match. Got: ", toString(nonZero), " and ", toString(zero));
+ return false;
+ }
+
+ result = zero;
+ return true;
+}
+
</ins><span class="cx"> bool Validate::addIf(ExpressionType condition, Type signature, ControlType& result)
</span><span class="cx"> {
</span><span class="cx"> if (condition != I32) {
</span></span></pre>
</div>
</div>
</body>
</html>