Changeset 147326 in webkit

Timestamp:

Apr 1, 2013, 8:25:50 AM (12 years ago)

Author:

fpizlo@apple.com

Message:

fourthTier: FTL doesn't need virtual register allocation
​https://bugs.webkit.org/show_bug.cgi?id=113679

Reviewed by Mark Hahnenberg.

• dfg/DFGDriver.cpp:

(JSC::DFG::dumpAndVerifyGraph):
(DFG):
(JSC::DFG::compile):

Location:

branches/dfgFourthTier/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGDriver.cpp (modified) (3 diffs)

branches/dfgFourthTier/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-03-31  Filip Pizlo  <fpizlo@apple.com>
+
+        fourthTier: FTL doesn't need virtual register allocation
+        https://bugs.webkit.org/show_bug.cgi?id=113679
+
+        Reviewed by Mark Hahnenberg.
+
+        * dfg/DFGDriver.cpp:
+        (JSC::DFG::dumpAndVerifyGraph):
+        (DFG):
+        (JSC::DFG::compile):
+
 2013-03-31  Filip Pizlo  <fpizlo@apple.com>
 

branches/dfgFourthTier/Source/JavaScriptCore/dfg/DFGDriver.cpp

@@ -66 +66 @@
 }
 
+static void dumpAndVerifyGraph(Graph& graph, const char* text)
+{
+    GraphDumpMode modeForFinalValidate = DumpGraph;
+    if (verboseCompilationEnabled()) {
+        dataLog(text, "\n");
+        graph.dump();
+        modeForFinalValidate = DontDumpGraph;
+    }
+    if (validationEnabled())
+        validate(graph, modeForFinalValidate);
+}
+
 enum CompileMode { CompileFunction, CompileOther };
-inline bool compile(CompileMode compileMode, ExecState* exec, CodeBlock* codeBlock, RefPtr<JITCode>& jitCode, MacroAssemblerCodePtr* jitCodeWithArityCheck, unsigned osrEntryBytecodeIndex)
+static bool compile(CompileMode compileMode, ExecState* exec, CodeBlock* codeBlock, RefPtr<JITCode>& jitCode, MacroAssemblerCodePtr* jitCodeWithArityCheck, unsigned osrEntryBytecodeIndex)
 {
     SamplingRegion samplingRegion("DFG Compilation (Driver)");
@@ -147 +159 @@
     performCPSRethreading(dfg);
     performDCE(dfg);
-    performVirtualRegisterAllocation(dfg);
-
-    GraphDumpMode modeForFinalValidate = DumpGraph;
-    if (verboseCompilationEnabled()) {
-        dataLogF("Graph after optimization:\n");
-        dfg.dump();
-        modeForFinalValidate = DontDumpGraph;
-    }
-    if (validationEnabled())
-        validate(dfg, modeForFinalValidate);
-    
+
     if (Options::useExperimentalFTL()
         && compileMode == CompileFunction
         && FTL::canCompile(dfg)) {
         
+        dumpAndVerifyGraph(dfg, "Graph just before FTL lowering:");
+        
         // FIXME: Support OSR entry.
         // https://bugs.webkit.org/show_bug.cgi?id=113625
@@ -175 +179 @@
     }
     
+    performVirtualRegisterAllocation(dfg);
+    dumpAndVerifyGraph(dfg, "Graph after optimization:");
+
     JITCompiler dataFlowJIT(dfg);
     bool result;