<!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>[194067] 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/194067">194067</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-12-14 15:18:36 -0800 (Mon, 14 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>FTL B3 should do PutById
https://bugs.webkit.org/show_bug.cgi?id=152268
Reviewed by Saam Barati.
* CMakeLists.txt:
* JavaScriptCore.xcodeproj/project.pbxproj:
* b3/B3LowerToAir.cpp:
(JSC::B3::Air::LowerToAir::createGenericCompare): I realized that we were missing some useful matching rules.
* b3/testb3.cpp: Added a bunch of tests.
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::compilePutById): Do the things.
* jit/GPRInfo.cpp: Added. I had to do this yucky thing because clang was having issues compiling references to this from deeply nested lambdas.
* jit/GPRInfo.h: Added a comment about how patchpointScratchRegister is bizarre and should probably die.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3LowerToAircpp">trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3testb3cpp">trunk/Source/JavaScriptCore/b3/testb3.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitGPRInfoh">trunk/Source/JavaScriptCore/jit/GPRInfo.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCorejitGPRInfocpp">trunk/Source/JavaScriptCore/jit/GPRInfo.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (194066 => 194067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-12-14 23:10:22 UTC (rev 194066)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-12-14 23:18:36 UTC (rev 194067)
</span><span class="lines">@@ -451,6 +451,7 @@
</span><span class="cx"> jit/ExecutableAllocator.cpp
</span><span class="cx"> jit/ExecutableAllocatorFixedVMPool.cpp
</span><span class="cx"> jit/GCAwareJITStubRoutine.cpp
</span><ins>+ jit/GPRInfo.cpp
</ins><span class="cx"> jit/HostCallReturnValue.cpp
</span><span class="cx"> jit/IntrinsicEmitter.cpp
</span><span class="cx"> jit/JIT.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194066 => 194067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-14 23:10:22 UTC (rev 194066)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-14 23:18:36 UTC (rev 194067)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-12-14 Filip Pizlo <fpizlo@apple.com>
+
+ FTL B3 should do PutById
+ https://bugs.webkit.org/show_bug.cgi?id=152268
+
+ Reviewed by Saam Barati.
+
+ * CMakeLists.txt:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * b3/B3LowerToAir.cpp:
+ (JSC::B3::Air::LowerToAir::createGenericCompare): I realized that we were missing some useful matching rules.
+ * b3/testb3.cpp: Added a bunch of tests.
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::compilePutById): Do the things.
+ * jit/GPRInfo.cpp: Added. I had to do this yucky thing because clang was having issues compiling references to this from deeply nested lambdas.
+ * jit/GPRInfo.h: Added a comment about how patchpointScratchRegister is bizarre and should probably die.
+
</ins><span class="cx"> 2015-12-14 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Add ceil() support for x86 and expose it to B3
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (194066 => 194067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-12-14 23:10:22 UTC (rev 194066)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-12-14 23:18:36 UTC (rev 194067)
</span><span class="lines">@@ -481,6 +481,7 @@
</span><span class="cx"> 0F919D2515853CE0004A4E7D /* Watchpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F919D2215853CDE004A4E7D /* Watchpoint.cpp */; };
</span><span class="cx"> 0F919D2615853CE3004A4E7D /* Watchpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F919D2315853CDE004A4E7D /* Watchpoint.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F919D2815856773004A4E7D /* SymbolTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F919D2715856770004A4E7D /* SymbolTable.cpp */; };
</span><ins>+ 0F93274D1C1F66AA00CF6564 /* GPRInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F93274C1C1F66AA00CF6564 /* GPRInfo.cpp */; };
</ins><span class="cx"> 0F93329D14CA7DC30085F3C6 /* CallLinkStatus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F93329314CA7DC10085F3C6 /* CallLinkStatus.cpp */; };
</span><span class="cx"> 0F93329E14CA7DC50085F3C6 /* CallLinkStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F93329414CA7DC10085F3C6 /* CallLinkStatus.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F93329F14CA7DCA0085F3C6 /* GetByIdStatus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F93329514CA7DC10085F3C6 /* GetByIdStatus.cpp */; };
</span><span class="lines">@@ -2592,6 +2593,7 @@
</span><span class="cx"> 0F919D2215853CDE004A4E7D /* Watchpoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Watchpoint.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F919D2315853CDE004A4E7D /* Watchpoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Watchpoint.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F919D2715856770004A4E7D /* SymbolTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SymbolTable.cpp; sourceTree = "<group>"; };
</span><ins>+ 0F93274C1C1F66AA00CF6564 /* GPRInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPRInfo.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 0F93329314CA7DC10085F3C6 /* CallLinkStatus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CallLinkStatus.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F93329414CA7DC10085F3C6 /* CallLinkStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallLinkStatus.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F93329514CA7DC10085F3C6 /* GetByIdStatus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GetByIdStatus.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4892,6 +4894,7 @@
</span><span class="cx"> 0F24E53E17EA9F5900ABB217 /* FPRInfo.h */,
</span><span class="cx"> 0F766D2D15A8DCDD008F363E /* GCAwareJITStubRoutine.cpp */,
</span><span class="cx"> 0F766D2E15A8DCDD008F363E /* GCAwareJITStubRoutine.h */,
</span><ins>+ 0F93274C1C1F66AA00CF6564 /* GPRInfo.cpp */,
</ins><span class="cx"> 0F24E53F17EA9F5900ABB217 /* GPRInfo.h */,
</span><span class="cx"> 0F4680D014BBC5F800BFE272 /* HostCallReturnValue.cpp */,
</span><span class="cx"> 0F4680D114BBC5F800BFE272 /* HostCallReturnValue.h */,
</span><span class="lines">@@ -4904,11 +4907,11 @@
</span><span class="cx"> A75706DD118A2BCF0057F88F /* JITArithmetic32_64.cpp */,
</span><span class="cx"> FE3A06AD1C10CB6F00390FDD /* JITBitAndGenerator.cpp */,
</span><span class="cx"> FE3A06AE1C10CB6F00390FDD /* JITBitAndGenerator.h */,
</span><ins>+ FE3A06A71C10BC7400390FDD /* JITBitBinaryOpGenerator.h */,
</ins><span class="cx"> FE3A06A31C10B70800390FDD /* JITBitOrGenerator.cpp */,
</span><span class="cx"> FE3A06A41C10B70800390FDD /* JITBitOrGenerator.h */,
</span><span class="cx"> FE3A06AF1C10CB6F00390FDD /* JITBitXorGenerator.cpp */,
</span><span class="cx"> FE3A06B01C10CB6F00390FDD /* JITBitXorGenerator.h */,
</span><del>- FE3A06A71C10BC7400390FDD /* JITBitBinaryOpGenerator.h */,
</del><span class="cx"> 86CC85A20EE79B7400288682 /* JITCall.cpp */,
</span><span class="cx"> 146FE51111A710430087AE66 /* JITCall32_64.cpp */,
</span><span class="cx"> 0F8F94431667635200D61971 /* JITCode.cpp */,
</span><span class="lines">@@ -8755,6 +8758,7 @@
</span><span class="cx"> 0FB105851675480F00F8AB6E /* ExitKind.cpp in Sources */,
</span><span class="cx"> 0FEA0A1C1708B00700BB722C /* FTLAbstractHeap.cpp in Sources */,
</span><span class="cx"> 0FEA0A1E1708B00700BB722C /* FTLAbstractHeapRepository.cpp in Sources */,
</span><ins>+ 0F93274D1C1F66AA00CF6564 /* GPRInfo.cpp in Sources */,
</ins><span class="cx"> 0F485327187DFDEC0083B687 /* FTLAvailableRecovery.cpp in Sources */,
</span><span class="cx"> 0FEA0A09170513DB00BB722C /* FTLCapabilities.cpp in Sources */,
</span><span class="cx"> 0F338E1B1BF286EA0013C88F /* B3BlockInsertionSet.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3LowerToAircpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp (194066 => 194067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-12-14 23:10:22 UTC (rev 194066)
+++ trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2015-12-14 23:18:36 UTC (rev 194067)
</span><span class="lines">@@ -1131,6 +1131,15 @@
</span><span class="cx"> Arg::Width width = Arg::widthForB3Type(value->type());
</span><span class="cx"> Arg resCond = Arg::resCond(MacroAssembler::NonZero).inverted(inverted);
</span><span class="cx">
</span><ins>+ auto tryTest = [&] (
+ Arg::Width width, const ArgPromise& left, const ArgPromise& right) -> Inst {
+ if (Inst result = test(width, resCond, left, right))
+ return result;
+ if (Inst result = test(width, resCond, right, left))
+ return result;
+ return Inst();
+ };
+
</ins><span class="cx"> auto attemptFused = [&] () -> Inst {
</span><span class="cx"> switch (value->opcode()) {
</span><span class="cx"> case NotEqual:
</span><span class="lines">@@ -1165,15 +1174,6 @@
</span><span class="cx"> Arg leftImm = imm(left);
</span><span class="cx"> Arg rightImm = imm(right);
</span><span class="cx">
</span><del>- auto tryTest = [&] (
- Arg::Width width, const ArgPromise& left, const ArgPromise& right) -> Inst {
- if (Inst result = test(width, resCond, left, right))
- return result;
- if (Inst result = test(width, resCond, right, left))
- return result;
- return Inst();
- };
-
</del><span class="cx"> auto tryTestLoadImm = [&] (Arg::Width width, B3::Opcode loadOpcode) -> Inst {
</span><span class="cx"> if (rightImm && rightImm.isRepresentableAs(width, Arg::Unsigned)) {
</span><span class="cx"> if (Inst result = tryTest(width, loadPromise(left, loadOpcode), rightImm)) {
</span><span class="lines">@@ -1254,6 +1254,35 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (canCommitInternal && value->as<MemoryValue>()) {
+ // Handle things like Branch(Load8Z(value))
+
+ if (Inst result = tryTest(Arg::Width8, loadPromise(value, Load8Z), Arg::imm(-1))) {
+ commitInternal(value);
+ return result;
+ }
+
+ if (Inst result = tryTest(Arg::Width8, loadPromise(value, Load8S), Arg::imm(-1))) {
+ commitInternal(value);
+ return result;
+ }
+
+ if (Inst result = tryTest(Arg::Width16, loadPromise(value, Load16Z), Arg::imm(-1))) {
+ commitInternal(value);
+ return result;
+ }
+
+ if (Inst result = tryTest(Arg::Width16, loadPromise(value, Load16S), Arg::imm(-1))) {
+ commitInternal(value);
+ return result;
+ }
+
+ if (Inst result = tryTest(width, loadPromise(value), Arg::imm(-1))) {
+ commitInternal(value);
+ return result;
+ }
+ }
+
</ins><span class="cx"> if (Inst result = test(width, resCond, tmpPromise(value), Arg::imm(-1)))
</span><span class="cx"> return result;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (194066 => 194067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-12-14 23:10:22 UTC (rev 194066)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp 2015-12-14 23:18:36 UTC (rev 194067)
</span><span class="lines">@@ -5166,6 +5166,186 @@
</span><span class="cx"> CHECK(compileAndRun<int>(proc) == !value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void testBranchLoadPtr()
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<MemoryValue>(
+ proc, Load, pointerType(), Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0)),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 1));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), 0));
+
+ auto code = compile(proc);
+ intptr_t cond;
+ cond = 42;
+ CHECK(invoke<int>(*code, &cond) == 1);
+ cond = 0;
+ CHECK(invoke<int>(*code, &cond) == 0);
+}
+
+void testBranchLoad32()
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<MemoryValue>(
+ proc, Load, Int32, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0)),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 1));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), 0));
+
+ auto code = compile(proc);
+ int32_t cond;
+ cond = 42;
+ CHECK(invoke<int>(*code, &cond) == 1);
+ cond = 0;
+ CHECK(invoke<int>(*code, &cond) == 0);
+}
+
+void testBranchLoad8S()
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<MemoryValue>(
+ proc, Load8S, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0)),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 1));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), 0));
+
+ auto code = compile(proc);
+ int8_t cond;
+ cond = -1;
+ CHECK(invoke<int>(*code, &cond) == 1);
+ cond = 0;
+ CHECK(invoke<int>(*code, &cond) == 0);
+}
+
+void testBranchLoad8Z()
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<MemoryValue>(
+ proc, Load8Z, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0)),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 1));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), 0));
+
+ auto code = compile(proc);
+ uint8_t cond;
+ cond = 1;
+ CHECK(invoke<int>(*code, &cond) == 1);
+ cond = 0;
+ CHECK(invoke<int>(*code, &cond) == 0);
+}
+
+void testBranchLoad16S()
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<MemoryValue>(
+ proc, Load16S, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0)),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 1));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), 0));
+
+ auto code = compile(proc);
+ int16_t cond;
+ cond = -1;
+ CHECK(invoke<int>(*code, &cond) == 1);
+ cond = 0;
+ CHECK(invoke<int>(*code, &cond) == 0);
+}
+
+void testBranchLoad16Z()
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<MemoryValue>(
+ proc, Load16Z, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0)),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 1));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), 0));
+
+ auto code = compile(proc);
+ uint16_t cond;
+ cond = 1;
+ CHECK(invoke<int>(*code, &cond) == 1);
+ cond = 0;
+ CHECK(invoke<int>(*code, &cond) == 0);
+}
+
</ins><span class="cx"> void testComplex(unsigned numVars, unsigned numConstructs)
</span><span class="cx"> {
</span><span class="cx"> double before = monotonicallyIncreasingTimeMS();
</span><span class="lines">@@ -8914,6 +9094,12 @@
</span><span class="cx"> RUN(testBranchNotEqualFoldPtr(0));
</span><span class="cx"> RUN(testBranchEqualFoldPtr(42));
</span><span class="cx"> RUN(testBranchEqualFoldPtr(0));
</span><ins>+ RUN(testBranchLoadPtr());
+ RUN(testBranchLoad32());
+ RUN(testBranchLoad8S());
+ RUN(testBranchLoad8Z());
+ RUN(testBranchLoad16S());
+ RUN(testBranchLoad16Z());
</ins><span class="cx">
</span><span class="cx"> RUN(testComplex(64, 128));
</span><span class="cx"> RUN(testComplex(64, 256));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (194066 => 194067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-12-14 23:10:22 UTC (rev 194066)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-12-14 23:18:36 UTC (rev 194067)
</span><span class="lines">@@ -2472,17 +2472,66 @@
</span><span class="cx">
</span><span class="cx"> void compilePutById()
</span><span class="cx"> {
</span><ins>+ Node* node = m_node;
+
</ins><span class="cx"> // See above; CellUse is easier so we do only that for now.
</span><del>- ASSERT(m_node->child1().useKind() == CellUse);
</del><ins>+ ASSERT(node->child1().useKind() == CellUse);
</ins><span class="cx">
</span><ins>+ LValue base = lowCell(node->child1());
+ LValue value = lowJSValue(node->child2());
+ auto uid = m_graph.identifiers()[node->identifierNumber()];
+
</ins><span class="cx"> #if FTL_USES_B3
</span><del>- if (verboseCompilationEnabled() || !verboseCompilationEnabled())
- CRASH();
</del><ins>+ // FIXME: Make this do exceptions.
+ // https://bugs.webkit.org/show_bug.cgi?id=151686
+
+ B3::PatchpointValue* patchpoint = m_out.patchpoint(Void);
+ patchpoint->append(base, ValueRep::SomeRegister);
+ patchpoint->append(value, ValueRep::SomeRegister);
+ patchpoint->clobber(RegisterSet::macroScratchRegisters());
+
+ State* state = &m_ftlState;
+ ECMAMode ecmaMode = m_graph.executableFor(node->origin.semantic)->ecmaMode();
+
+ patchpoint->setGenerator(
+ [=] (CCallHelpers& jit, const StackmapGenerationParams& params) {
+ AllowMacroScratchRegisterUsage allowScratch(jit);
+
+ auto generator = Box<JITPutByIdGenerator>::create(
+ jit.codeBlock(), node->origin.semantic,
+ state->jitCode->common.addUniqueCallSiteIndex(node->origin.semantic),
+ params.usedRegisters(), JSValueRegs(params[0].gpr()), JSValueRegs(params[1].gpr()),
+ GPRInfo::patchpointScratchRegister, ecmaMode,
+ node->op() == PutByIdDirect ? Direct : NotDirect);
+
+ generator->generateFastPath(jit);
+ CCallHelpers::Label done = jit.label();
+
+ params.addLatePath(
+ [=] (CCallHelpers& jit) {
+ AllowMacroScratchRegisterUsage allowScratch(jit);
+
+ // FIXME: Make this do something.
+ CCallHelpers::JumpList exceptions;
+
+ generator->slowPathJump().link(&jit);
+ CCallHelpers::Label slowPathBegin = jit.label();
+ CCallHelpers::Call slowPathCall = callOperation(
+ *state, params.usedRegisters(), jit, node->origin.semantic, &exceptions,
+ generator->slowPathFunction(), InvalidGPRReg,
+ CCallHelpers::TrustedImmPtr(generator->stubInfo()), params[1].gpr(),
+ params[0].gpr(), CCallHelpers::TrustedImmPtr(uid)).call();
+ jit.jump().linkTo(done, &jit);
+
+ generator->reportSlowPathCall(slowPathBegin, slowPathCall);
+
+ jit.addLinkTask(
+ [=] (LinkBuffer& linkBuffer) {
+ generator->finalize(linkBuffer);
+ });
+ });
+ });
</ins><span class="cx"> #else
</span><del>- LValue base = lowCell(m_node->child1());
- LValue value = lowJSValue(m_node->child2());
- auto uid = m_graph.identifiers()[m_node->identifierNumber()];
-
</del><span class="cx"> // Arguments: id, bytes, target, numArgs, args...
</span><span class="cx"> unsigned stackmapID = m_stackmapIDs++;
</span><span class="cx">
</span><span class="lines">@@ -2504,9 +2553,9 @@
</span><span class="cx"> setInstructionCallingConvention(call, LLVMAnyRegCallConv);
</span><span class="cx">
</span><span class="cx"> m_ftlState.putByIds.append(PutByIdDescriptor(
</span><del>- stackmapID, m_node->origin.semantic, uid,
- m_graph.executableFor(m_node->origin.semantic)->ecmaMode(),
- m_node->op() == PutByIdDirect ? Direct : NotDirect));
</del><ins>+ stackmapID, node->origin.semantic, uid,
+ m_graph.executableFor(node->origin.semantic)->ecmaMode(),
+ node->op() == PutByIdDirect ? Direct : NotDirect));
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitGPRInfocpp"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/jit/GPRInfo.cpp (0 => 194067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/GPRInfo.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/jit/GPRInfo.cpp 2015-12-14 23:18:36 UTC (rev 194067)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "GPRInfo.h"
+
+namespace JSC {
+
+#if CPU(X86_64)
+// This is in the .cpp file to work around clang issues.
+const GPRReg GPRInfo::patchpointScratchRegister = MacroAssembler::s_scratchRegister;
+#endif
+
+} // namespace JSC
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCorejitGPRInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/GPRInfo.h (194066 => 194067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/GPRInfo.h 2015-12-14 23:10:22 UTC (rev 194066)
+++ trunk/Source/JavaScriptCore/jit/GPRInfo.h 2015-12-14 23:18:36 UTC (rev 194067)
</span><span class="lines">@@ -453,8 +453,12 @@
</span><span class="cx"> static const GPRReg returnValueGPR2 = X86Registers::edx; // regT1 or regT2
</span><span class="cx"> static const GPRReg nonPreservedNonReturnGPR = X86Registers::r10; // regT5 (regT4 on Windows)
</span><span class="cx"> static const GPRReg nonPreservedNonArgumentGPR = X86Registers::r10; // regT5 (regT4 on Windows)
</span><del>- static const GPRReg patchpointScratchRegister = MacroAssembler::s_scratchRegister;
</del><span class="cx">
</span><ins>+ // FIXME: I believe that all uses of this are dead in the sense that it just causes the scratch
+ // register allocator to select a different register and potentially spill things. It would be better
+ // if we instead had a more explicit way of saying that we don't have a scratch register.
+ static const GPRReg patchpointScratchRegister;
+
</ins><span class="cx"> static GPRReg toRegister(unsigned index)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(index < numberOfRegisters);
</span></span></pre>
</div>
</div>
</body>
</html>