<!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>[204480] trunk/Source/JavaScriptCore</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/204480">204480</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-15 14:04:49 -0700 (Mon, 15 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] B3 Neg opcode should support float
https://bugs.webkit.org/show_bug.cgi?id=160795
Patch by Benjamin Poulain <bpoulain@apple.com> on 2016-08-15
Reviewed by Geoffrey Garen.
This is required to implement WASM f32.neg opcode.
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::negateFloat):
* b3/B3LowerToAir.cpp:
(JSC::B3::Air::LowerToAir::lower):
* b3/B3ReduceDoubleToFloat.cpp:
* b3/air/AirOpcode.opcodes:
* b3/testb3.cpp:
(JSC::B3::testNegDouble):
(JSC::B3::testNegFloat):
(JSC::B3::testNegFloatWithUselessDoubleConversion):
(JSC::B3::run):</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceJavaScriptCoreb3B3LowerToAircpp">trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3ReduceDoubleToFloatcpp">trunk/Source/JavaScriptCore/b3/B3ReduceDoubleToFloat.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirOpcodeopcodes">trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3testb3cpp">trunk/Source/JavaScriptCore/b3/testb3.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (204479 => 204480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-08-15 20:55:16 UTC (rev 204479)
+++ trunk/Source/JavaScriptCore/ChangeLog        2016-08-15 21:04:49 UTC (rev 204480)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-08-15 Benjamin Poulain <bpoulain@apple.com>
+
+ [JSC] B3 Neg opcode should support float
+ https://bugs.webkit.org/show_bug.cgi?id=160795
+
+ Reviewed by Geoffrey Garen.
+
+ This is required to implement WASM f32.neg opcode.
+
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::negateFloat):
+ * b3/B3LowerToAir.cpp:
+ (JSC::B3::Air::LowerToAir::lower):
+ * b3/B3ReduceDoubleToFloat.cpp:
+ * b3/air/AirOpcode.opcodes:
+ * b3/testb3.cpp:
+ (JSC::B3::testNegDouble):
+ (JSC::B3::testNegFloat):
+ (JSC::B3::testNegFloatWithUselessDoubleConversion):
+ (JSC::B3::run):
+
</ins><span class="cx"> 2016-08-15 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Use #pragma once in inspector headers
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (204479 => 204480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h        2016-08-15 20:55:16 UTC (rev 204479)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h        2016-08-15 21:04:49 UTC (rev 204480)
</span><span class="lines">@@ -1856,6 +1856,11 @@
</span><span class="cx"> m_assembler.fneg<64>(dest, src);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void negateFloat(FPRegisterID src, FPRegisterID dest)
+ {
+ m_assembler.fneg<32>(dest, src);
+ }
+
</ins><span class="cx"> void sqrtDouble(FPRegisterID src, FPRegisterID dest)
</span><span class="cx"> {
</span><span class="cx"> m_assembler.fsqrt<64>(dest, src);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3LowerToAircpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp (204479 => 204480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp        2016-08-15 20:55:16 UTC (rev 204479)
+++ trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp        2016-08-15 21:04:49 UTC (rev 204480)
</span><span class="lines">@@ -1835,7 +1835,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- appendUnOp<Neg32, Neg64, NegateDouble, Air::Oops>(m_value->child(0));
</del><ins>+ appendUnOp<Neg32, Neg64, NegateDouble, NegateFloat>(m_value->child(0));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3ReduceDoubleToFloatcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3ReduceDoubleToFloat.cpp (204479 => 204480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3ReduceDoubleToFloat.cpp        2016-08-15 20:55:16 UTC (rev 204479)
+++ trunk/Source/JavaScriptCore/b3/B3ReduceDoubleToFloat.cpp        2016-08-15 21:04:49 UTC (rev 204480)
</span><span class="lines">@@ -302,6 +302,7 @@
</span><span class="cx"> case Abs:
</span><span class="cx"> case Ceil:
</span><span class="cx"> case Floor:
</span><ins>+ case Neg:
</ins><span class="cx"> case Sqrt: {
</span><span class="cx"> Value* child = value->child(0);
</span><span class="cx"> if (canBeTransformedToFloat(child)) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirOpcodeopcodes"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes (204479 => 204480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes        2016-08-15 20:55:16 UTC (rev 204479)
+++ trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes        2016-08-15 21:04:49 UTC (rev 204480)
</span><span class="lines">@@ -205,6 +205,9 @@
</span><span class="cx"> arm64: NegateDouble U:F:64, D:F:64
</span><span class="cx"> Tmp, Tmp
</span><span class="cx">
</span><ins>+arm64: NegateFloat U:F:32, D:F:32
+ Tmp, Tmp
+
</ins><span class="cx"> Mul32 U:G:32, UZD:G:32
</span><span class="cx"> Tmp, Tmp
</span><span class="cx"> x86: Addr, Tmp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (204479 => 204480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp        2016-08-15 20:55:16 UTC (rev 204479)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp        2016-08-15 21:04:49 UTC (rev 204480)
</span><span class="lines">@@ -2170,6 +2170,48 @@
</span><span class="cx"> CHECK(isIdentical(effect, static_cast<double>(a) - static_cast<double>(b)));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void testNegDouble(double a)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ root->appendNewControlValue(
+ proc, Return, Origin(),
+ root->appendNew<Value>(
+ proc, Neg, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), FPRInfo::argumentFPR0)));
+
+ CHECK(isIdentical(compileAndRun<double>(proc, a), -a));
+}
+
+void testNegFloat(float a)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ Value* argument32 = root->appendNew<Value>(proc, Trunc, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0));
+ Value* floatValue = root->appendNew<Value>(proc, BitwiseCast, Origin(), argument32);
+ root->appendNewControlValue(
+ proc, Return, Origin(),
+ root->appendNew<Value>(proc, Neg, Origin(), floatValue));
+
+ CHECK(isIdentical(compileAndRun<float>(proc, bitwise_cast<int32_t>(a)), -a));
+}
+
+void testNegFloatWithUselessDoubleConversion(float a)
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ Value* argumentInt32 = root->appendNew<Value>(proc, Trunc, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0));
+ Value* floatValue = root->appendNew<Value>(proc, BitwiseCast, Origin(), argumentInt32);
+ Value* asDouble = root->appendNew<Value>(proc, FloatToDouble, Origin(), floatValue);
+ Value* result = root->appendNew<Value>(proc, Neg, Origin(), asDouble);
+ Value* floatResult = root->appendNew<Value>(proc, DoubleToFloat, Origin(), result);
+ root->appendNewControlValue(proc, Return, Origin(), floatResult);
+
+ CHECK(isIdentical(compileAndRun<float>(proc, bitwise_cast<int32_t>(a)), -a));
+}
+
</ins><span class="cx"> void testBitAndArgs(int64_t a, int64_t b)
</span><span class="cx"> {
</span><span class="cx"> Procedure proc;
</span><span class="lines">@@ -13166,6 +13208,10 @@
</span><span class="cx"> RUN_BINARY(testSubArgsFloatWithUselessDoubleConversion, floatingPointOperands<float>(), floatingPointOperands<float>());
</span><span class="cx"> RUN_BINARY(testSubArgsFloatWithEffectfulDoubleConversion, floatingPointOperands<float>(), floatingPointOperands<float>());
</span><span class="cx">
</span><ins>+ RUN_UNARY(testNegDouble, floatingPointOperands<double>());
+ RUN_UNARY(testNegFloat, floatingPointOperands<float>());
+ RUN_UNARY(testNegFloatWithUselessDoubleConversion, floatingPointOperands<float>());
+
</ins><span class="cx"> RUN(testBitAndArgs(43, 43));
</span><span class="cx"> RUN(testBitAndArgs(43, 0));
</span><span class="cx"> RUN(testBitAndArgs(10, 3));
</span></span></pre>
</div>
</div>
</body>
</html>