Changeset 166510 in webkit

Timestamp:

Mar 31, 2014 9:50:15 AM (10 years ago)

Author:

fpizlo@apple.com

Message:

More validation for FTL inline caches
​https://bugs.webkit.org/show_bug.cgi?id=130948

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::handleGetById):
(JSC::DFG::ByteCodeParser::handlePutById):

• runtime/Options.h:

Tools:

• Scripts/run-jsc-stress-tests:

Location:

trunk

Files:

• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (modified) (2 diffs)
• Source/JavaScriptCore/runtime/Options.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/run-jsc-stress-tests (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-03-31  Filip Pizlo  <fpizlo@apple.com>
+
+        More validation for FTL inline caches
+        https://bugs.webkit.org/show_bug.cgi?id=130948
+
+        Reviewed by Geoffrey Garen.
+
+        * dfg/DFGByteCodeParser.cpp:
+        (JSC::DFG::ByteCodeParser::handleGetById):
+        (JSC::DFG::ByteCodeParser::handlePutById):
+        * runtime/Options.h:
+
 2014-03-31  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp

@@ -1886 +1886 @@
     const GetByIdStatus& getByIdStatus)
 {
-    if (!getByIdStatus.isSimple()) {
+    if (!getByIdStatus.isSimple() || !Options::enableAccessInlining()) {
         set(VirtualRegister(destinationOperand),
             addToGraph(
@@ -1972 +1972 @@
     const PutByIdStatus& putByIdStatus, bool isDirect)
 {
-    if (!putByIdStatus.isSimple()) {
+    if (!putByIdStatus.isSimple() || !Options::enableAccessInlining()) {
         if (!putByIdStatus.isSet())
             addToGraph(ForceOSRExit);

trunk/Source/JavaScriptCore/runtime/Options.h

@@ -161 +161 @@
     v(bool, clobberAllRegsInFTLICSlowPath, !ASSERT_DISABLED) \
     v(bool, assumeAllRegsInFTLICAreLive, true) \
+    v(bool, enableAccessInlining, true) \
     \
     v(bool, enableConcurrentJIT, true) \

trunk/Tools/ChangeLog

@@ +1 @@
+2014-03-31  Filip Pizlo  <fpizlo@apple.com>
+
+        More validation for FTL inline caches
+        https://bugs.webkit.org/show_bug.cgi?id=130948
+
+        Reviewed by Geoffrey Garen.
+
+        * Scripts/run-jsc-stress-tests:
+
 2014-03-31  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/Scripts/run-jsc-stress-tests

@@ -588 +588 @@
 end
 
-def runFTLNoSimpleOpt
-    run("ftl-no-simple-opt", "--enableConcurrentJIT=false", "--llvmSimpleOpt=false", *FTL_OPTIONS) if $enableFTL
+def runFTLNoCJITNoSimpleOpt
+    run("ftl-no-cjit-no-simple-opt", "--enableConcurrentJIT=false", "--llvmSimpleOpt=false", *FTL_OPTIONS) if $enableFTL
+end
+
+def runNoCJITNoAccessInlining
+    run("no-cjit-no-access-inlining", "--enableConcurrentJIT=false", "--enableAccessInlining=false")
+end
+
+def runFTLNoCJITNoAccessInlining
+    run("ftl-no-cjit-no-access-inlining", "--enableConcurrentJIT=false", "--enableAccessInlining=false", *FTL_OPTIONS) if $enableFTL
 end
 
@@ -602 +610 @@
     runFTLNoCJITValidate
     runFTLNoCJITNoInlineValidate
-    runFTLNoCJITOSRValidation
     runFTLEager
     runFTLEagerNoCJITValidate
-    runFTLEagerNoCJITOSRValidation
 end
 
@@ -615 +621 @@
 end
 
-def defaultFTLSpotCheck
+def defaultSpotCheck
     defaultQuickRun
-    runFTLNoSimpleOpt
+    runFTLNoCJITNoSimpleOpt
+    runFTLNoCJITOSRValidation
+    runNoCJITNoAccessInlining
+    runFTLNoCJITNoAccessInlining
 end