<!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>[192543] 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/192543">192543</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-17 14:48:19 -0800 (Tue, 17 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Remove FTLOutput operations that act directly on floats
https://bugs.webkit.org/show_bug.cgi?id=151342
Patch by Benjamin Poulain <bpoulain@apple.com> on 2015-11-17
Reviewed by Geoffrey Garen.
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::compileArithFRound):
(JSC::FTL::DFG::LowerDFGToLLVM::compileGetByVal):
(JSC::FTL::DFG::LowerDFGToLLVM::compilePutByVal):
* ftl/FTLOutput.cpp:
(JSC::FTL::Output::store):
* ftl/FTLOutput.h:
(JSC::FTL::Output::loadFloatToDouble):
(JSC::FTL::Output::fround):
(JSC::FTL::Output::loadFloat): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLOutputcpp">trunk/Source/JavaScriptCore/ftl/FTLOutput.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLOutputh">trunk/Source/JavaScriptCore/ftl/FTLOutput.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (192542 => 192543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-11-17 22:46:53 UTC (rev 192542)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-11-17 22:48:19 UTC (rev 192543)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-11-17 Benjamin Poulain <bpoulain@apple.com>
+
+ [JSC] Remove FTLOutput operations that act directly on floats
+ https://bugs.webkit.org/show_bug.cgi?id=151342
+
+ Reviewed by Geoffrey Garen.
+
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileArithFRound):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileGetByVal):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compilePutByVal):
+ * ftl/FTLOutput.cpp:
+ (JSC::FTL::Output::store):
+ * ftl/FTLOutput.h:
+ (JSC::FTL::Output::loadFloatToDouble):
+ (JSC::FTL::Output::fround):
+ (JSC::FTL::Output::loadFloat): Deleted.
+
</ins><span class="cx"> 2015-11-17 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a FTL_USES_B3 compile-time setting and set it to 0.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (192542 => 192543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-11-17 22:46:53 UTC (rev 192542)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-11-17 22:48:19 UTC (rev 192543)
</span><span class="lines">@@ -2035,8 +2035,7 @@
</span><span class="cx">
</span><span class="cx"> void compileArithFRound()
</span><span class="cx"> {
</span><del>- LValue floatValue = m_out.fpCast(lowDouble(m_node->child1()), m_out.floatType);
- setDouble(m_out.fpCast(floatValue, m_out.doubleType));
</del><ins>+ setDouble(m_out.fround(lowDouble(m_node->child1())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void compileArithNegate()
</span><span class="lines">@@ -2789,7 +2788,7 @@
</span><span class="cx"> LValue result;
</span><span class="cx"> switch (type) {
</span><span class="cx"> case TypeFloat32:
</span><del>- result = m_out.fpCast(m_out.loadFloat(pointer), m_out.doubleType);
</del><ins>+ result = m_out.loadFloatToDouble(pointer);
</ins><span class="cx"> break;
</span><span class="cx"> case TypeFloat64:
</span><span class="cx"> result = m_out.loadDouble(pointer);
</span><span class="lines">@@ -3062,7 +3061,7 @@
</span><span class="cx"> LValue value = lowDouble(child3);
</span><span class="cx"> switch (type) {
</span><span class="cx"> case TypeFloat32:
</span><del>- valueToStore = m_out.fpCast(value, m_out.floatType);
</del><ins>+ valueToStore = value;
</ins><span class="cx"> refType = m_out.refFloat;
</span><span class="cx"> break;
</span><span class="cx"> case TypeFloat64:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLOutputcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLOutput.cpp (192542 => 192543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLOutput.cpp 2015-11-17 22:46:53 UTC (rev 192542)
+++ trunk/Source/JavaScriptCore/ftl/FTLOutput.cpp 2015-11-17 22:48:19 UTC (rev 192543)
</span><span class="lines">@@ -91,6 +91,8 @@
</span><span class="cx">
</span><span class="cx"> void Output::store(LValue value, TypedPointer pointer, LType refType)
</span><span class="cx"> {
</span><ins>+ if (refType == refFloat)
+ value = buildFPCast(m_builder, value, floatType);
</ins><span class="cx"> LValue result = set(value, intToPtr(pointer.value(), refType));
</span><span class="cx"> pointer.heap().decorateInstruction(result, *m_heaps);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLOutputh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLOutput.h (192542 => 192543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLOutput.h 2015-11-17 22:46:53 UTC (rev 192542)
+++ trunk/Source/JavaScriptCore/ftl/FTLOutput.h 2015-11-17 22:48:19 UTC (rev 192543)
</span><span class="lines">@@ -224,6 +224,8 @@
</span><span class="cx"> LValue intToPtr(LValue value, LType type) { return buildIntToPtr(m_builder, value, type); }
</span><span class="cx"> LValue ptrToInt(LValue value, LType type) { return buildPtrToInt(m_builder, value, type); }
</span><span class="cx"> LValue bitCast(LValue value, LType type) { return buildBitCast(m_builder, value, type); }
</span><ins>+
+ LValue fround(LValue doubleValue);
</ins><span class="cx">
</span><span class="cx"> // Hilariously, the #define machinery in the stdlib means that this method is actually called
</span><span class="cx"> // __builtin_alloca. So far this appears benign. :-|
</span><span class="lines">@@ -249,7 +251,7 @@
</span><span class="cx"> LValue load32(TypedPointer pointer) { return load(pointer, ref32); }
</span><span class="cx"> LValue load64(TypedPointer pointer) { return load(pointer, ref64); }
</span><span class="cx"> LValue loadPtr(TypedPointer pointer) { return load(pointer, refPtr); }
</span><del>- LValue loadFloat(TypedPointer pointer) { return load(pointer, refFloat); }
</del><ins>+ LValue loadFloatToDouble(TypedPointer pointer) { return buildFPCast(m_builder, load(pointer, refFloat), doubleType); }
</ins><span class="cx"> LValue loadDouble(TypedPointer pointer) { return load(pointer, refDouble); }
</span><span class="cx"> void store16(LValue value, TypedPointer pointer) { store(value, pointer, ref16); }
</span><span class="cx"> void store32(LValue value, TypedPointer pointer) { store(value, pointer, ref32); }
</span><span class="lines">@@ -463,6 +465,12 @@
</span><span class="cx"> return zeroExt(value16, int32);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline LValue Output::fround(LValue doubleValue)
+{
+ LValue floatValue = buildFPCast(m_builder, doubleValue, floatType);
+ return buildFPCast(m_builder, floatValue, doubleType);
+}
+
</ins><span class="cx"> #define FTL_NEW_BLOCK(output, nameArguments) \
</span><span class="cx"> (LIKELY(!verboseCompilationEnabled()) \
</span><span class="cx"> ? (output).newBlock() \
</span></span></pre>
</div>
</div>
</body>
</html>