<!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>[209313] 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/209313">209313</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-12-04 14:47:02 -0800 (Sun, 04 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for Wasm ctz and popcnt
https://bugs.webkit.org/show_bug.cgi?id=165369
Reviewed by Saam Barati.
JSTests:
* wasm/function-tests/ctz.js: Added.
* wasm/function-tests/popcnt.js: Added.
Source/JavaScriptCore:
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::countTrailingZeros32):
(JSC::MacroAssemblerARM64::countTrailingZeros64):
* assembler/MacroAssemblerX86Common.cpp:
* assembler/MacroAssemblerX86Common.h:
(JSC::MacroAssemblerX86Common::countTrailingZeros32):
(JSC::MacroAssemblerX86Common::supportsBMI1):
(JSC::MacroAssemblerX86Common::ctzAfterBsf):
* assembler/MacroAssemblerX86_64.h:
(JSC::MacroAssemblerX86_64::countTrailingZeros64):
* assembler/X86Assembler.h:
(JSC::X86Assembler::tzcnt_rr):
(JSC::X86Assembler::tzcntq_rr):
(JSC::X86Assembler::bsf_rr):
(JSC::X86Assembler::bsfq_rr):
* wasm/WasmB3IRGenerator.cpp:
(JSC::Wasm::B3IRGenerator::addOp<OpType::I32Ctz>):
(JSC::Wasm::B3IRGenerator::addOp<OpType::I64Ctz>):
(JSC::Wasm::B3IRGenerator::addOp<OpType::I32Popcnt>):
(JSC::Wasm::B3IRGenerator::addOp<OpType::I64Popcnt>):
* wasm/WasmFunctionParser.h:
(JSC::Wasm::FunctionParser<Context>::parseExpression):</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="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commoncpp">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerX86Assemblerh">trunk/Source/JavaScriptCore/assembler/X86Assembler.h</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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestswasmfunctiontestsctzjs">trunk/JSTests/wasm/function-tests/ctz.js</a></li>
<li><a href="#trunkJSTestswasmfunctiontestspopcntjs">trunk/JSTests/wasm/function-tests/popcnt.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (209312 => 209313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-12-04 21:23:56 UTC (rev 209312)
+++ trunk/JSTests/ChangeLog 2016-12-04 22:47:02 UTC (rev 209313)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-12-04 Keith Miller <keith_miller@apple.com>
+
+ Add support for Wasm ctz and popcnt
+ https://bugs.webkit.org/show_bug.cgi?id=165369
+
+ Reviewed by Saam Barati.
+
+ * wasm/function-tests/ctz.js: Added.
+ * wasm/function-tests/popcnt.js: Added.
+
</ins><span class="cx"> 2016-12-03 JF Bastien <jfbastien@apple.com>
</span><span class="cx">
</span><span class="cx"> WebAssembly: update binary format to 0xD version
</span></span></pre></div>
<a id="trunkJSTestswasmfunctiontestsctzjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/wasm/function-tests/ctz.js (0 => 209313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/function-tests/ctz.js (rev 0)
+++ trunk/JSTests/wasm/function-tests/ctz.js 2016-12-04 22:47:02 UTC (rev 209313)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+import Builder from '../Builder.js'
+
+const b = new Builder();
+b.Type().End()
+ .Function().End()
+ .Code()
+ .Function({ params: ["i32"], ret: "i32" }, [])
+ .GetLocal(0)
+ .I32Ctz()
+ .End()
+
+ .Function({ params: ["i64"], ret: "i64" }, [])
+ .GetLocal(0)
+ .I64Ctz()
+ .End()
+
+const bin = b.WebAssembly()
+bin.trim();
+testWasmModuleFunctions(bin.get(), 2,
+ [[{type: "i32", value: "0" }, [{ type: "i32", value: "-1" }]],
+ [{type: "i32", value: "32" }, [{ type: "i32", value: "0" }]],
+ [{type: "i32", value: "15" }, [{ type: "i32", value: "0x00008000" }]],
+ [{type: "i32", value: "16" }, [{ type: "i32", value: "0x00010000" }]],
+ [{type: "i32", value: "31" }, [{ type: "i32", value: "0x80000000" }]],
+ [{type: "i32", value: "0" }, [{ type: "i32", value: "0x7fffffff" }]],
+ ],
+
+ [[{type: "i64", value: "0" }, [{ type: "i64", value: "-1" }]],
+ [{type: "i64", value: "64" }, [{ type: "i64", value: "0" }]],
+ [{type: "i64", value: "15" }, [{ type: "i64", value: "0x00008000" }]],
+ [{type: "i64", value: "16" }, [{ type: "i64", value: "0x00010000" }]],
+ [{type: "i64", value: "63" }, [{ type: "i64", value: "0x8000000000000000" }]],
+ [{type: "i64", value: "0" }, [{ type: "i64", value: "0x7fffffffffffffff" }]],
+ ]
+ );
</ins></span></pre></div>
<a id="trunkJSTestswasmfunctiontestspopcntjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/wasm/function-tests/popcnt.js (0 => 209313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/function-tests/popcnt.js (rev 0)
+++ trunk/JSTests/wasm/function-tests/popcnt.js 2016-12-04 22:47:02 UTC (rev 209313)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+import Builder from '../Builder.js'
+
+const b = new Builder();
+b.Type().End()
+ .Function().End()
+ .Code()
+ .Function({ params: ["i32"], ret: "i32" }, [])
+ .GetLocal(0)
+ .I32Popcnt()
+ .End()
+
+ .Function({ params: ["i64"], ret: "i64" }, [])
+ .GetLocal(0)
+ .I64Popcnt()
+ .End()
+
+const bin = b.WebAssembly()
+bin.trim();
+testWasmModuleFunctions(bin.get(), 2,
+ [[{type: "i32", value: "32" }, [{ type: "i32", value: "-1" }]],
+ [{type: "i32", value: "0" }, [{ type: "i32", value: "0" }]],
+ [{type: "i32", value: "1" }, [{ type: "i32", value: "0x00008000" }]],
+ [{type: "i32", value: "2" }, [{ type: "i32", value: "0x80008000" }]],
+ [{type: "i32", value: "31" }, [{ type: "i32", value: "0x7fffffff" }]],
+ [{type: "i32", value: "16" }, [{ type: "i32", value: "0xaaaaaaaa" }]],
+ [{type: "i32", value: "16" }, [{ type: "i32", value: "0x55555555" }]],
+ [{type: "i32", value: "24" }, [{ type: "i32", value: "0xdeadbeef" }]],
+ ],
+
+
+ [[{type: "i64", value: "64" }, [{ type: "i64", value: "-1" }]],
+ [{type: "i64", value: "0" }, [{ type: "i64", value: "0" }]],
+ [{type: "i64", value: "1" }, [{ type: "i64", value: "0x00008000" }]],
+ [{type: "i64", value: "4" }, [{ type: "i64", value: "0x8000800080008000" }]],
+ [{type: "i64", value: "63" }, [{ type: "i64", value: "0x7fffffffffffffff" }]],
+ [{type: "i64", value: "32" }, [{ type: "i64", value: "0xaaaaaaaa55555555" }]],
+ [{type: "i64", value: "32" }, [{ type: "i64", value: "0x99999999aaaaaaaa" }]],
+ [{type: "i64", value: "48" }, [{ type: "i64", value: "0xdeadbeefdeadbeef" }]],
+ ]
+ );
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209312 => 209313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-12-04 21:23:56 UTC (rev 209312)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-12-04 22:47:02 UTC (rev 209313)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-12-04 Keith Miller <keith_miller@apple.com>
+
+ Add support for Wasm ctz and popcnt
+ https://bugs.webkit.org/show_bug.cgi?id=165369
+
+ Reviewed by Saam Barati.
+
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::countTrailingZeros32):
+ (JSC::MacroAssemblerARM64::countTrailingZeros64):
+ * assembler/MacroAssemblerX86Common.cpp:
+ * assembler/MacroAssemblerX86Common.h:
+ (JSC::MacroAssemblerX86Common::countTrailingZeros32):
+ (JSC::MacroAssemblerX86Common::supportsBMI1):
+ (JSC::MacroAssemblerX86Common::ctzAfterBsf):
+ * assembler/MacroAssemblerX86_64.h:
+ (JSC::MacroAssemblerX86_64::countTrailingZeros64):
+ * assembler/X86Assembler.h:
+ (JSC::X86Assembler::tzcnt_rr):
+ (JSC::X86Assembler::tzcntq_rr):
+ (JSC::X86Assembler::bsf_rr):
+ (JSC::X86Assembler::bsfq_rr):
+ * wasm/WasmB3IRGenerator.cpp:
+ (JSC::Wasm::B3IRGenerator::addOp<OpType::I32Ctz>):
+ (JSC::Wasm::B3IRGenerator::addOp<OpType::I64Ctz>):
+ (JSC::Wasm::B3IRGenerator::addOp<OpType::I32Popcnt>):
+ (JSC::Wasm::B3IRGenerator::addOp<OpType::I64Popcnt>):
+ * wasm/WasmFunctionParser.h:
+ (JSC::Wasm::FunctionParser<Context>::parseExpression):
+
</ins><span class="cx"> 2016-12-04 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> We should have a Wasm callee
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (209312 => 209313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2016-12-04 21:23:56 UTC (rev 209312)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2016-12-04 22:47:02 UTC (rev 209313)
</span><span class="lines">@@ -427,6 +427,20 @@
</span><span class="cx"> m_assembler.clz<64>(dest, src);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void countTrailingZeros32(RegisterID src, RegisterID dest)
+ {
+ // Arm does not have a count trailing zeros only a count leading zeros.
+ m_assembler.rbit<32>(dest, src);
+ m_assembler.clz<32>(dest, dest);
+ }
+
+ void countTrailingZeros64(RegisterID src, RegisterID dest)
+ {
+ // Arm does not have a count trailing zeros only a count leading zeros.
+ m_assembler.rbit<64>(dest, src);
+ m_assembler.clz<64>(dest, dest);
+ }
+
</ins><span class="cx"> void lshift32(RegisterID src, RegisterID shiftAmount, RegisterID dest)
</span><span class="cx"> {
</span><span class="cx"> m_assembler.lsl<32>(dest, src, shiftAmount);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp (209312 => 209313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp 2016-12-04 21:23:56 UTC (rev 209312)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp 2016-12-04 22:47:02 UTC (rev 209313)
</span><span class="lines">@@ -555,6 +555,7 @@
</span><span class="cx"> MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_sse4_1CheckState = CPUIDCheckState::NotChecked;
</span><span class="cx"> MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_avxCheckState = CPUIDCheckState::NotChecked;
</span><span class="cx"> MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_lzcntCheckState = CPUIDCheckState::NotChecked;
</span><ins>+MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_bmi1CheckState = CPUIDCheckState::NotChecked;
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (209312 => 209313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2016-12-04 21:23:56 UTC (rev 209312)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2016-12-04 22:47:02 UTC (rev 209313)
</span><span class="lines">@@ -313,6 +313,16 @@
</span><span class="cx"> clz32AfterBsr(dst);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void countTrailingZeros32(RegisterID src, RegisterID dst)
+ {
+ if (supportsBMI1()) {
+ m_assembler.tzcnt_rr(src, dst);
+ return;
+ }
+ m_assembler.bsf_rr(src, dst);
+ ctzAfterBsf<32>(dst);
+ }
+
</ins><span class="cx"> void lshift32(RegisterID shift_amount, RegisterID dest)
</span><span class="cx"> {
</span><span class="cx"> if (shift_amount == X86Registers::ecx)
</span><span class="lines">@@ -2845,6 +2855,39 @@
</span><span class="cx"> return s_lzcntCheckState == CPUIDCheckState::Set;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static bool supportsBMI1()
+ {
+ if (s_bmi1CheckState == CPUIDCheckState::NotChecked) {
+ int flags = 0;
+#if COMPILER(MSVC)
+ int cpuInfo[4];
+ __cpuid(cpuInfo, 0x80000001);
+ flags = cpuInfo[2];
+#elif COMPILER(GCC_OR_CLANG)
+ asm (
+ "movl $0x7, %%eax;"
+ "movl $0x0, %%ecx;"
+ "cpuid;"
+ "movl %%ebx, %0;"
+ : "=g" (flags)
+ :
+ : "%eax", "%ebx", "%ecx", "%edx"
+ );
+#endif // COMPILER(GCC_OR_CLANG)
+ static int BMI1FeatureBit = 1 << 3;
+ s_bmi1CheckState = (flags & BMI1FeatureBit) ? CPUIDCheckState::Set : CPUIDCheckState::Clear;
+ }
+ return s_bmi1CheckState == CPUIDCheckState::Set;
+ }
+
+ template<int sizeOfRegister>
+ void ctzAfterBsf(RegisterID dst)
+ {
+ Jump srcIsNonZero = m_assembler.jCC(x86Condition(NonZero));
+ move(TrustedImm32(sizeOfRegister), dst);
+ srcIsNonZero.link(this);
+ }
+
</ins><span class="cx"> private:
</span><span class="cx"> // Only MacroAssemblerX86 should be using the following method; SSE2 is always available on
</span><span class="cx"> // x86_64, and clients & subclasses of MacroAssembler should be using 'supportsFloatingPoint()'.
</span><span class="lines">@@ -3015,6 +3058,7 @@
</span><span class="cx"> };
</span><span class="cx"> JS_EXPORT_PRIVATE static CPUIDCheckState s_sse4_1CheckState;
</span><span class="cx"> JS_EXPORT_PRIVATE static CPUIDCheckState s_avxCheckState;
</span><ins>+ static CPUIDCheckState s_bmi1CheckState;
</ins><span class="cx"> static CPUIDCheckState s_lzcntCheckState;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h (209312 => 209313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h 2016-12-04 21:23:56 UTC (rev 209312)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h 2016-12-04 22:47:02 UTC (rev 209313)
</span><span class="lines">@@ -391,6 +391,16 @@
</span><span class="cx"> clz64AfterBsr(dst);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void countTrailingZeros64(RegisterID src, RegisterID dst)
+ {
+ if (supportsBMI1()) {
+ m_assembler.tzcntq_rr(src, dst);
+ return;
+ }
+ m_assembler.bsfq_rr(src, dst);
+ ctzAfterBsf<64>(dst);
+ }
+
</ins><span class="cx"> void lshift64(TrustedImm32 imm, RegisterID dest)
</span><span class="cx"> {
</span><span class="cx"> m_assembler.shlq_i8r(imm.m_value, dest);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerX86Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/X86Assembler.h (209312 => 209313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/X86Assembler.h 2016-12-04 21:23:56 UTC (rev 209312)
+++ trunk/Source/JavaScriptCore/assembler/X86Assembler.h 2016-12-04 22:47:02 UTC (rev 209313)
</span><span class="lines">@@ -288,6 +288,8 @@
</span><span class="cx"> OP2_3BYTE_ESCAPE_AE = 0xAE,
</span><span class="cx"> OP2_IMUL_GvEv = 0xAF,
</span><span class="cx"> OP2_MOVZX_GvEb = 0xB6,
</span><ins>+ OP2_BSF = 0xBC,
+ OP2_TZCNT = 0xBC,
</ins><span class="cx"> OP2_BSR = 0xBD,
</span><span class="cx"> OP2_LZCNT = 0xBD,
</span><span class="cx"> OP2_MOVSX_GvEb = 0xBE,
</span><span class="lines">@@ -1018,6 +1020,32 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ void tzcnt_rr(RegisterID src, RegisterID dst)
+ {
+ m_formatter.prefix(PRE_SSE_F3);
+ m_formatter.twoByteOp(OP2_TZCNT, dst, src);
+ }
+
+#if CPU(X86_64)
+ void tzcntq_rr(RegisterID src, RegisterID dst)
+ {
+ m_formatter.prefix(PRE_SSE_F3);
+ m_formatter.twoByteOp64(OP2_TZCNT, dst, src);
+ }
+#endif
+
+ void bsf_rr(RegisterID src, RegisterID dst)
+ {
+ m_formatter.twoByteOp(OP2_BSF, dst, src);
+ }
+
+#if CPU(X86_64)
+ void bsfq_rr(RegisterID src, RegisterID dst)
+ {
+ m_formatter.twoByteOp64(OP2_BSF, dst, src);
+ }
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> template<GroupOpcodeID op>
</span><span class="cx"> void shiftInstruction32(int imm, RegisterID dst)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmB3IRGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp (209312 => 209313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp 2016-12-04 21:23:56 UTC (rev 209312)
+++ trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp 2016-12-04 22:47:02 UTC (rev 209313)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if ENABLE(WEBASSEMBLY)
</span><span class="cx">
</span><span class="cx"> #include "B3BasicBlockInlines.h"
</span><ins>+#include "B3CCallValue.h"
</ins><span class="cx"> #include "B3ConstPtrValue.h"
</span><span class="cx"> #include "B3FixSSA.h"
</span><span class="cx"> #include "B3StackmapGenerationParams.h"
</span><span class="lines">@@ -765,6 +766,54 @@
</span><span class="cx"> // Custom wasm ops. These are the ones too messy to do in wasm.json.
</span><span class="cx">
</span><span class="cx"> template<>
</span><ins>+bool B3IRGenerator::addOp<OpType::I32Ctz>(ExpressionType arg, ExpressionType& result)
+{
+ PatchpointValue* patchpoint = m_currentBlock->appendNew<PatchpointValue>(m_proc, Int32, Origin());
+ patchpoint->append(arg, ValueRep::SomeRegister);
+ patchpoint->setGenerator([=] (CCallHelpers& jit, const StackmapGenerationParams& params) {
+ jit.countTrailingZeros32(params[1].gpr(), params[0].gpr());
+ });
+ patchpoint->effects = Effects::none();
+ result = patchpoint;
+ return true;
+}
+
+template<>
+bool B3IRGenerator::addOp<OpType::I64Ctz>(ExpressionType arg, ExpressionType& result)
+{
+ PatchpointValue* patchpoint = m_currentBlock->appendNew<PatchpointValue>(m_proc, Int64, Origin());
+ patchpoint->append(arg, ValueRep::SomeRegister);
+ patchpoint->setGenerator([=] (CCallHelpers& jit, const StackmapGenerationParams& params) {
+ jit.countTrailingZeros64(params[1].gpr(), params[0].gpr());
+ });
+ patchpoint->effects = Effects::none();
+ result = patchpoint;
+ return true;
+}
+
+template<>
+bool B3IRGenerator::addOp<OpType::I32Popcnt>(ExpressionType arg, ExpressionType& result)
+{
+ // FIXME: This should use the popcnt instruction if SSE4 is available but we don't have code to detect SSE4 yet.
+ // see: https://bugs.webkit.org/show_bug.cgi?id=165363
+ uint32_t (*popcount)(int32_t) = [] (int32_t value) -> uint32_t { return __builtin_popcount(value); };
+ Value* funcAddress = m_currentBlock->appendNew<ConstPtrValue>(m_proc, Origin(), bitwise_cast<void*>(popcount));
+ result = m_currentBlock->appendNew<CCallValue>(m_proc, Int32, Origin(), Effects::none(), funcAddress, arg);
+ return true;
+}
+
+template<>
+bool B3IRGenerator::addOp<OpType::I64Popcnt>(ExpressionType arg, ExpressionType& result)
+{
+ // FIXME: This should use the popcnt instruction if SSE4 is available but we don't have code to detect SSE4 yet.
+ // see: https://bugs.webkit.org/show_bug.cgi?id=165363
+ uint64_t (*popcount)(int64_t) = [] (int64_t value) -> uint64_t { return __builtin_popcountll(value); };
+ Value* funcAddress = m_currentBlock->appendNew<ConstPtrValue>(m_proc, Origin(), bitwise_cast<void*>(popcount));
+ result = m_currentBlock->appendNew<CCallValue>(m_proc, Int64, Origin(), Effects::none(), funcAddress, arg);
+ return true;
+}
+
+template<>
</ins><span class="cx"> bool B3IRGenerator::addOp<F64ConvertUI64>(ExpressionType arg, ExpressionType& result)
</span><span class="cx"> {
</span><span class="cx"> PatchpointValue* patchpoint = m_currentBlock->appendNew<PatchpointValue>(m_proc, Double, Origin());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmFunctionParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h (209312 => 209313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h 2016-12-04 21:23:56 UTC (rev 209312)
+++ trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h 2016-12-04 22:47:02 UTC (rev 209313)
</span><span class="lines">@@ -217,6 +217,10 @@
</span><span class="cx"> case OpType::F64Nearest: return unaryCase<OpType::F64Nearest>();
</span><span class="cx"> case OpType::F32Trunc: return unaryCase<OpType::F32Trunc>();
</span><span class="cx"> case OpType::F64Trunc: return unaryCase<OpType::F64Trunc>();
</span><ins>+ case OpType::I32Ctz: return unaryCase<OpType::I32Ctz>();
+ case OpType::I64Ctz: return unaryCase<OpType::I64Ctz>();
+ case OpType::I32Popcnt: return unaryCase<OpType::I32Popcnt>();
+ case OpType::I64Popcnt: return unaryCase<OpType::I64Popcnt>();
</ins><span class="cx"> #define CREATE_CASE(name, id, b3op, inc) case OpType::name: return unaryCase<OpType::name>();
</span><span class="cx"> FOR_EACH_WASM_SIMPLE_UNARY_OP(CREATE_CASE)
</span><span class="cx"> #undef CREATE_CASE
</span></span></pre>
</div>
</div>
</body>
</html>