Changeset 221703 in webkit for trunk/Source/JavaScriptCore/b3

Timestamp:

Sep 6, 2017, 2:04:25 PM (8 years ago)

Author:

[email protected]

Message:

Air should have a Vector of prologue generators instead of a HashMap representing an optional prologue generator
​https://bugs.webkit.org/show_bug.cgi?id=176346

Reviewed by Mark Lam.

• b3/B3Procedure.cpp:

(JSC::B3::Procedure::Procedure):
(JSC::B3::Procedure::setNumEntrypoints):

• b3/B3Procedure.h:

(JSC::B3::Procedure::setNumEntrypoints): Deleted.

• b3/air/AirCode.cpp:

(JSC::B3::Air::defaultPrologueGenerator):
(JSC::B3::Air::Code::Code):
(JSC::B3::Air::Code::setNumEntrypoints):

• b3/air/AirCode.h:

(JSC::B3::Air::Code::setPrologueForEntrypoint):
(JSC::B3::Air::Code::prologueGeneratorForEntrypoint):
(JSC::B3::Air::Code::setEntrypoints):
(JSC::B3::Air::Code::setEntrypointLabels):

• b3/air/AirGenerate.cpp:

(JSC::B3::Air::generate):

• ftl/FTLLowerDFGToB3.cpp:

(JSC::FTL::DFG::LowerDFGToB3::lower):

Location:

trunk/Source/JavaScriptCore/b3

Files:

• B3Procedure.cpp (modified) (2 diffs)
• B3Procedure.h (modified) (1 diff)
• air/AirCode.cpp (modified) (3 diffs)
• air/AirCode.h (modified) (4 diffs)
• air/AirGenerate.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/b3/B3Procedure.cpp

@@ -53 +53 @@
     , m_code(new Air::Code(*this))
 {
+    m_code->setNumEntrypoints(m_numEntrypoints);
 }
 
@@ -421 +422 @@
 }
 
+void Procedure::setNumEntrypoints(unsigned numEntrypoints)
+{
+    m_numEntrypoints = numEntrypoints;
+    m_code->setNumEntrypoints(numEntrypoints);
+}
+
 } } // namespace JSC::B3
 

trunk/Source/JavaScriptCore/b3/B3Procedure.h

@@ -187 +187 @@
     
     unsigned numEntrypoints() const { return m_numEntrypoints; }
-    void setNumEntrypoints(unsigned numEntrypoints) { m_numEntrypoints = numEntrypoints; }
-    
+    JS_EXPORT_PRIVATE void setNumEntrypoints(unsigned);
+
     // Only call this after code generation is complete. Note that the label for the 0th entrypoint
     // should point to exactly where the code generation cursor was before you started generating

trunk/Source/JavaScriptCore/b3/air/AirCode.cpp

@@ -31 +31 @@
 #include "AirCCallSpecial.h"
 #include "AirCFG.h"
+#include "AllowMacroScratchRegisterUsageIf.h"
 #include "B3BasicBlockUtils.h"
 #include "B3Procedure.h"
@@ -38 +39 @@
 namespace JSC { namespace B3 { namespace Air {
 
+static void defaultPrologueGenerator(CCallHelpers& jit, Code& code)
+{
+    jit.emitFunctionPrologue();
+    if (code.frameSize()) {
+        AllowMacroScratchRegisterUsageIf allowScratch(jit, isARM64());
+        jit.addPtr(CCallHelpers::TrustedImm32(-code.frameSize()), MacroAssembler::stackPointerRegister);
+    }
+    
+    jit.emitSave(code.calleeSaveRegisterAtOffsetList());
+}
+
 Code::Code(Procedure& proc)
     : m_proc(proc)
     , m_cfg(new CFG(*this))
     , m_lastPhaseName("initial")
+    , m_defaultPrologueGenerator(createSharedTask<PrologueGeneratorFunction>(&defaultPrologueGenerator))
 {
     // Come up with initial orderings of registers. The user may replace this with something else.
@@ -295 +308 @@
 }
 
+void Code::setNumEntrypoints(unsigned numEntrypoints)
+{
+    m_prologueGenerators.clear();
+    m_prologueGenerators.reserveCapacity(numEntrypoints);
+    for (unsigned i = 0; i < numEntrypoints; ++i)
+        m_prologueGenerators.uncheckedAppend(m_defaultPrologueGenerator.copyRef());
+}
+
 } } } // namespace JSC::B3::Air
 

trunk/Source/JavaScriptCore/b3/air/AirCode.h

@@ -172 +172 @@
     // Note: It is only valid to call this function after LowerEntrySwitch.
     std::optional<unsigned> entrypointIndex(BasicBlock*) const;
-    void setPrologueForEntrypoint(unsigned entrypointIndex, RefPtr<PrologueGenerator> generator)
-    {
-        // Note: We allow this to be called even before we set m_entrypoints just for convenience to users of this API.
-        m_entrypointIndexToGenerator.set(entrypointIndex, generator);
-    }
-    RefPtr<PrologueGenerator> prologueGeneratorForEntrypoint(unsigned entrypointIndex)
-    {
-        return m_entrypointIndexToGenerator.get(entrypointIndex);
-    }
+
+    // Note: We allow this to be called even before we set m_entrypoints just for convenience to users of this API.
+    // However, if you call this before setNumEntrypoints, setNumEntrypoints will overwrite this value.
+    void setPrologueForEntrypoint(unsigned entrypointIndex, Ref<PrologueGenerator>&& generator)
+    {
+        m_prologueGenerators[entrypointIndex] = WTFMove(generator);
+    }
+    const Ref<PrologueGenerator>& prologueGeneratorForEntrypoint(unsigned entrypointIndex)
+    {
+        return m_prologueGenerators[entrypointIndex];
+    }
+
+    void setNumEntrypoints(unsigned);
 
     // This is used by lowerEntrySwitch().
@@ -187 +191 @@
     {
         m_entrypoints = std::forward<Vector>(vector);
+        RELEASE_ASSERT(m_entrypoints.size() == m_prologueGenerators.size());
     }
     
@@ -199 +204 @@
     {
         m_entrypointLabels = std::forward<Vector>(vector);
+        RELEASE_ASSERT(m_entrypointLabels.size() == m_prologueGenerators.size());
     }
     
@@ -369 +375 @@
     Vector<FrequentedBlock> m_entrypoints; // This is empty until after lowerEntrySwitch().
     Vector<CCallHelpers::Label> m_entrypointLabels; // This is empty until code generation.
-    HashMap<unsigned, RefPtr<PrologueGenerator>, WTF::IntHash<unsigned>, WTF::UnsignedWithZeroKeyHashTraits<unsigned>> m_entrypointIndexToGenerator;
+    Vector<Ref<PrologueGenerator>, 1> m_prologueGenerators;
     RefPtr<WasmBoundsCheckGenerator> m_wasmBoundsCheckGenerator;
     const char* m_lastPhaseName;
     std::unique_ptr<Disassembler> m_disassembler;
     unsigned m_optLevel { defaultOptLevel() };
+    Ref<PrologueGenerator> m_defaultPrologueGenerator;
 };
 

trunk/Source/JavaScriptCore/b3/air/AirGenerate.cpp

@@ -47 +47 @@
 #include "AirSimplifyCFG.h"
 #include "AirValidate.h"
-#include "AllowMacroScratchRegisterUsageIf.h"
 #include "B3Common.h"
 #include "B3Procedure.h"
@@ -215 +214 @@
                 disassembler->startEntrypoint(jit); 
 
-            if (RefPtr<PrologueGenerator> prologueGenerator = code.prologueGeneratorForEntrypoint(*entrypointIndex))
-                prologueGenerator->run(jit, code);
-            else {
-                jit.emitFunctionPrologue();
-                if (code.frameSize()) {
-                    AllowMacroScratchRegisterUsageIf allowScratch(jit, isARM64());
-                    jit.addPtr(CCallHelpers::TrustedImm32(-code.frameSize()), MacroAssembler::stackPointerRegister);
-                }
-                
-                jit.emitSave(code.calleeSaveRegisterAtOffsetList());
-            }
+            code.prologueGeneratorForEntrypoint(*entrypointIndex)->run(jit, code);
 
             if (disassembler)