- Revision
- 191426
- Author
- benja...@webkit.org
- Date
- 2015-10-21 18:58:24 -0700 (Wed, 21 Oct 2015)
Log Message
[JSC] Remove FTL Native Inlining, it is dead code
https://bugs.webkit.org/show_bug.cgi?id=150429
Patch by Benjamin Poulain <bpoul...@apple.com> on 2015-10-21
Reviewed by Filip Pizlo.
The code is not used and it is in the way of other changes.
* ftl/FTLAbbreviations.h:
(JSC::FTL::getFirstInstruction): Deleted.
(JSC::FTL::getNextInstruction): Deleted.
(JSC::FTL::getFirstBasicBlock): Deleted.
(JSC::FTL::getNextBasicBlock): Deleted.
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::isInlinableSize): Deleted.
* runtime/Options.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (191425 => 191426)
--- trunk/Source/_javascript_Core/ChangeLog 2015-10-22 01:57:26 UTC (rev 191425)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-10-22 01:58:24 UTC (rev 191426)
@@ -1,5 +1,23 @@
2015-10-21 Benjamin Poulain <bpoul...@apple.com>
+ [JSC] Remove FTL Native Inlining, it is dead code
+ https://bugs.webkit.org/show_bug.cgi?id=150429
+
+ Reviewed by Filip Pizlo.
+
+ The code is not used and it is in the way of other changes.
+
+ * ftl/FTLAbbreviations.h:
+ (JSC::FTL::getFirstInstruction): Deleted.
+ (JSC::FTL::getNextInstruction): Deleted.
+ (JSC::FTL::getFirstBasicBlock): Deleted.
+ (JSC::FTL::getNextBasicBlock): Deleted.
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::isInlinableSize): Deleted.
+ * runtime/Options.h:
+
+2015-10-21 Benjamin Poulain <bpoul...@apple.com>
+
[JSC] Remove two useless temporaries from the PutByOffset codegen
https://bugs.webkit.org/show_bug.cgi?id=150421
Modified: trunk/Source/_javascript_Core/ftl/FTLAbbreviations.h (191425 => 191426)
--- trunk/Source/_javascript_Core/ftl/FTLAbbreviations.h 2015-10-22 01:57:26 UTC (rev 191425)
+++ trunk/Source/_javascript_Core/ftl/FTLAbbreviations.h 2015-10-22 01:58:24 UTC (rev 191426)
@@ -149,10 +149,6 @@
static inline void setMetadata(LValue instruction, unsigned kind, LValue metadata) { llvm->SetMetadata(instruction, kind, metadata); }
-static inline LValue getFirstInstruction(LBasicBlock block) { return llvm->GetFirstInstruction(block); }
-static inline LValue getNextInstruction(LValue instruction) { return llvm->GetNextInstruction(instruction); }
-
-
static inline LValue addFunction(LModule module, const char* name, LType type) { return llvm->AddFunction(module, name, type); }
static inline LValue getNamedFunction(LModule module, const char* name) { return llvm->GetNamedFunction(module, name); }
static inline LValue getFirstFunction(LModule module) { return llvm->GetFirstFunction(module); }
@@ -214,9 +210,6 @@
static inline LValue constNull(LType type) { return llvm->ConstNull(type); }
static inline LValue constBitCast(LValue value, LType type) { return llvm->ConstBitCast(value, type); }
-static inline LBasicBlock getFirstBasicBlock(LValue function) { return llvm->GetFirstBasicBlock(function); }
-static inline LBasicBlock getNextBasicBlock(LBasicBlock block) { return llvm->GetNextBasicBlock(block); }
-
static inline LBasicBlock appendBasicBlock(LContext context, LValue function, const char* name = "") { return llvm->AppendBasicBlockInContext(context, function, name); }
static inline LBasicBlock insertBasicBlock(LContext context, LBasicBlock beforeBasicBlock, const char* name = "") { return llvm->InsertBasicBlockInContext(context, beforeBasicBlock, name); }
Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp (191425 => 191426)
--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp 2015-10-22 01:57:26 UTC (rev 191425)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp 2015-10-22 01:58:24 UTC (rev 191426)
@@ -5647,19 +5647,6 @@
m_out.appendTo(continuation, lastNext);
}
- bool isInlinableSize(LValue function)
- {
- size_t instructionCount = 0;
- size_t maxSize = Options::maximumLLVMInstructionCountForNativeInlining();
- for (LBasicBlock basicBlock = getFirstBasicBlock(function); basicBlock; basicBlock = getNextBasicBlock(basicBlock)) {
- for (LValue instruction = getFirstInstruction(basicBlock); instruction; instruction = getNextInstruction(instruction)) {
- if (++instructionCount >= maxSize)
- return false;
- }
- }
- return true;
- }
-
LValue didOverflowStack()
{
// This does a very simple leaf function analysis. The invariant of FTL call
Modified: trunk/Source/_javascript_Core/runtime/Options.h (191425 => 191426)
--- trunk/Source/_javascript_Core/runtime/Options.h 2015-10-22 01:57:26 UTC (rev 191425)
+++ trunk/Source/_javascript_Core/runtime/Options.h 2015-10-22 01:58:24 UTC (rev 191426)
@@ -233,8 +233,6 @@
v(unsigned, maximumInliningDepth, 5, "maximum allowed inlining depth. Depth of 1 means no inlining") \
v(unsigned, maximumInliningRecursion, 2, nullptr) \
\
- v(unsigned, maximumLLVMInstructionCountForNativeInlining, 80, nullptr) \
- \
/* Maximum size of a caller for enabling inlining. This is purely to protect us */\
/* from super long compiles that take a lot of memory. */\
v(unsigned, maximumInliningCallerSize, 10000, nullptr) \
