<!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>[209953] 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/209953">209953</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-12-16 17:07:38 -0800 (Fri, 16 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>B3::DoubleToFloatReduction will accidentally convince itself it converted a Phi from Double to Float and then convert uses of that Phi into a use of FloatToDouble(@Phi)
https://bugs.webkit.org/show_bug.cgi?id=165946
Reviewed by Keith Miller.
This was happening because the phase will convert some Phi nodes
from Double to Float. However, one place that did this conversion
forgot to first check if the Phi was already a Float. If it's already
a Float, a later part of the phase will be buggy if the phase claims that it has
converted it from Double->Float. The reason is that at the end of the
phase, we'll look for all uses of former Double Phi nodes and make them
be a use of ConvertFloatToDouble on the Phi, instead of a use of the Phi itself.
This is clearly wrong if the Phi were Float to begin with (and
therefore, the uses were Float uses to begin with).
* b3/B3ReduceDoubleToFloat.cpp:
* b3/testb3.cpp:
(JSC::B3::testReduceFloatToDoubleValidates):
(JSC::B3::run):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3ReduceDoubleToFloatcpp">trunk/Source/JavaScriptCore/b3/B3ReduceDoubleToFloat.cpp</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 (209952 => 209953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-12-17 01:06:49 UTC (rev 209952)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-12-17 01:07:38 UTC (rev 209953)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-12-16 Saam Barati <sbarati@apple.com>
+
+ B3::DoubleToFloatReduction will accidentally convince itself it converted a Phi from Double to Float and then convert uses of that Phi into a use of FloatToDouble(@Phi)
+ https://bugs.webkit.org/show_bug.cgi?id=165946
+
+ Reviewed by Keith Miller.
+
+ This was happening because the phase will convert some Phi nodes
+ from Double to Float. However, one place that did this conversion
+ forgot to first check if the Phi was already a Float. If it's already
+ a Float, a later part of the phase will be buggy if the phase claims that it has
+ converted it from Double->Float. The reason is that at the end of the
+ phase, we'll look for all uses of former Double Phi nodes and make them
+ be a use of ConvertFloatToDouble on the Phi, instead of a use of the Phi itself.
+ This is clearly wrong if the Phi were Float to begin with (and
+ therefore, the uses were Float uses to begin with).
+
+ * b3/B3ReduceDoubleToFloat.cpp:
+ * b3/testb3.cpp:
+ (JSC::B3::testReduceFloatToDoubleValidates):
+ (JSC::B3::run):
+
</ins><span class="cx"> 2016-12-16 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> De-duplicate finally blocks.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3ReduceDoubleToFloatcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3ReduceDoubleToFloat.cpp (209952 => 209953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3ReduceDoubleToFloat.cpp 2016-12-17 01:06:49 UTC (rev 209952)
+++ trunk/Source/JavaScriptCore/b3/B3ReduceDoubleToFloat.cpp 2016-12-17 01:07:38 UTC (rev 209953)
</span><span class="lines">@@ -231,7 +231,9 @@
</span><span class="cx"> return insertionSet.insert<ConstFloatValue>(valueIndex, value->origin(), static_cast<float>(value->asDouble()));
</span><span class="cx">
</span><span class="cx"> if (value->opcode() == Phi) {
</span><del>- convertPhi(value);
</del><ins>+ ASSERT(value->type() == Double || value->type() == Float);
+ if (value->type() == Double)
+ convertPhi(value);
</ins><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="lines">@@ -241,6 +243,7 @@
</span><span class="cx"> void convertPhi(Value* phi)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(phi->opcode() == Phi);
</span><ins>+ ASSERT(phi->type() == Double);
</ins><span class="cx"> phi->setType(Float);
</span><span class="cx"> m_convertedPhis.add(phi);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (209952 => 209953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp 2016-12-17 01:06:49 UTC (rev 209952)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp 2016-12-17 01:07:38 UTC (rev 209953)
</span><span class="lines">@@ -4535,6 +4535,61 @@
</span><span class="cx"> CHECK(isIdentical(invoke<float>(*code, 0, bitwise_cast<int32_t>(value)), static_cast<float>(M_PI)));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void testReduceFloatToDoubleValidates()
+{
+ // Simple case of:
+ // f = DoubleToFloat(Bitcast(argGPR0))
+ // if (a) {
+ // x = FloatConst()
+ // else
+ // x = FloatConst()
+ // p = Phi(x)
+ // a = Mul(p, p)
+ // b = Add(a, f)
+ // c = Add(p, b)
+ // Return(c)
+ //
+ // This should not crash in the validator after ReduceFloatToDouble.
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+ BasicBlock* tail = proc.addBlock();
+
+ Value* condition = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0);
+ Value* thingy = root->appendNew<Value>(proc, BitwiseCast, Origin(), condition);
+ thingy = root->appendNew<Value>(proc, DoubleToFloat, Origin(), thingy); // Make the phase think it has work to do.
+ root->appendNewControlValue(
+ proc, Branch, Origin(),
+ condition,
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ UpsilonValue* thenValue = thenCase->appendNew<UpsilonValue>(proc, Origin(),
+ thenCase->appendNew<ConstFloatValue>(proc, Origin(), 11.5));
+ thenCase->appendNewControlValue(proc, Jump, Origin(), FrequentedBlock(tail));
+
+ UpsilonValue* elseValue = elseCase->appendNew<UpsilonValue>(proc, Origin(),
+ elseCase->appendNew<ConstFloatValue>(proc, Origin(), 10.5));
+ elseCase->appendNewControlValue(proc, Jump, Origin(), FrequentedBlock(tail));
+
+ Value* phi = tail->appendNew<Value>(proc, Phi, Float, Origin());
+ thenValue->setPhi(phi);
+ elseValue->setPhi(phi);
+ Value* result = tail->appendNew<Value>(proc, Mul, Origin(),
+ phi, phi);
+ result = tail->appendNew<Value>(proc, Add, Origin(),
+ result,
+ thingy);
+ result = tail->appendNew<Value>(proc, Add, Origin(),
+ phi,
+ result);
+ tail->appendNewControlValue(proc, Return, Origin(), result);
+
+ auto code = compile(proc);
+ CHECK(isIdentical(invoke<float>(*code, 1), 11.5f * 11.5f + static_cast<float>(bitwise_cast<double>(static_cast<uint64_t>(1))) + 11.5f));
+ CHECK(isIdentical(invoke<float>(*code, 0), 10.5f * 10.5f + static_cast<float>(bitwise_cast<double>(static_cast<uint64_t>(0))) + 10.5f));
+}
+
</ins><span class="cx"> void testDoubleProducerPhiToFloatConversion(float value)
</span><span class="cx"> {
</span><span class="cx"> Procedure proc;
</span><span class="lines">@@ -14628,6 +14683,7 @@
</span><span class="cx"> RUN_BINARY(testCompareOneFloatToDouble, floatingPointOperands<float>(), floatingPointOperands<double>());
</span><span class="cx"> RUN_BINARY(testCompareFloatToDoubleThroughPhi, floatingPointOperands<float>(), floatingPointOperands<float>());
</span><span class="cx"> RUN_UNARY(testDoubleToFloatThroughPhi, floatingPointOperands<float>());
</span><ins>+ RUN(testReduceFloatToDoubleValidates());
</ins><span class="cx"> RUN_UNARY(testDoubleProducerPhiToFloatConversion, floatingPointOperands<float>());
</span><span class="cx"> RUN_UNARY(testDoubleProducerPhiToFloatConversionWithDoubleConsumer, floatingPointOperands<float>());
</span><span class="cx"> RUN_BINARY(testDoubleProducerPhiWithNonFloatConst, floatingPointOperands<float>(), floatingPointOperands<double>());
</span></span></pre>
</div>
</div>
</body>
</html>