Changeset 105636 in webkit for trunk/Source/JavaScriptCore/assembler

Timestamp:

Jan 23, 2012, 1:08:34 PM (13 years ago)

Author:

[email protected]

Message:

Implement a JIT-code aware sampling profiler for JSC
​https://bugs.webkit.org/show_bug.cgi?id=76855

Rubber stanmped by Geoff Garen.

Mechanical change - pass CodeBlock through to the executable allocator,
such that we will be able to map ranges of JIT code back to their owner.

• assembler/ARMAssembler.cpp:

(JSC::ARMAssembler::executableCopy):

• assembler/ARMAssembler.h:
• assembler/AssemblerBuffer.h:

(JSC::AssemblerBuffer::executableCopy):

• assembler/AssemblerBufferWithConstantPool.h:

(JSC::AssemblerBufferWithConstantPool::executableCopy):

• assembler/LinkBuffer.h:

(JSC::LinkBuffer::LinkBuffer):
(JSC::LinkBuffer::linkCode):

• assembler/MIPSAssembler.h:

(JSC::MIPSAssembler::executableCopy):

• assembler/SH4Assembler.h:

(JSC::SH4Assembler::executableCopy):

• assembler/X86Assembler.h:

(JSC::X86Assembler::executableCopy):
(JSC::X86Assembler::X86InstructionFormatter::executableCopy):

• dfg/DFGJITCompiler.cpp:

(JSC::DFG::JITCompiler::compile):
(JSC::DFG::JITCompiler::compileFunction):

• dfg/DFGOSRExitCompiler.cpp:
• dfg/DFGRepatch.cpp:

(JSC::DFG::generateProtoChainAccessStub):
(JSC::DFG::tryCacheGetByID):
(JSC::DFG::tryBuildGetByIDList):
(JSC::DFG::tryCachePutByID):

• dfg/DFGThunks.cpp:

(JSC::DFG::osrExitGenerationThunkGenerator):

• jit/ExecutableAllocator.cpp:

(JSC::ExecutableAllocator::allocate):

• jit/ExecutableAllocator.h:
• jit/ExecutableAllocatorFixedVMPool.cpp:

(JSC::ExecutableAllocator::allocate):

• jit/JIT.cpp:

(JSC::JIT::privateCompile):

• jit/JITOpcodes.cpp:

(JSC::JIT::privateCompileCTIMachineTrampolines):

• jit/JITOpcodes32_64.cpp:

(JSC::JIT::privateCompileCTIMachineTrampolines):
(JSC::JIT::privateCompileCTINativeCall):

• jit/JITPropertyAccess.cpp:

(JSC::JIT::stringGetByValStubGenerator):
(JSC::JIT::privateCompilePutByIdTransition):
(JSC::JIT::privateCompilePatchGetArrayLength):
(JSC::JIT::privateCompileGetByIdProto):
(JSC::JIT::privateCompileGetByIdSelfList):
(JSC::JIT::privateCompileGetByIdProtoList):
(JSC::JIT::privateCompileGetByIdChainList):
(JSC::JIT::privateCompileGetByIdChain):

• jit/JITPropertyAccess32_64.cpp:

(JSC::JIT::stringGetByValStubGenerator):
(JSC::JIT::privateCompilePutByIdTransition):
(JSC::JIT::privateCompilePatchGetArrayLength):
(JSC::JIT::privateCompileGetByIdProto):
(JSC::JIT::privateCompileGetByIdSelfList):
(JSC::JIT::privateCompileGetByIdProtoList):
(JSC::JIT::privateCompileGetByIdChainList):
(JSC::JIT::privateCompileGetByIdChain):

• jit/JITStubs.cpp:
• jit/SpecializedThunkJIT.h:

(JSC::SpecializedThunkJIT::finalize):

• yarr/YarrJIT.cpp:

(JSC::Yarr::YarrGenerator::compile):

Location:

trunk/Source/JavaScriptCore/assembler

Files:

• ARMAssembler.cpp (modified) (2 diffs)
• ARMAssembler.h (modified) (1 diff)
• AssemblerBuffer.h (modified) (1 diff)
• AssemblerBufferWithConstantPool.h (modified) (1 diff)
• LinkBuffer.h (modified) (7 diffs)
• MIPSAssembler.h (modified) (1 diff)
• SH4Assembler.h (modified) (1 diff)
• X86Assembler.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/assembler/ARMAssembler.cpp

@@ -345 +345 @@
 }
 
-PassRefPtr<ExecutableMemoryHandle> ARMAssembler::executableCopy(JSGlobalData& globalData)
+PassRefPtr<ExecutableMemoryHandle> ARMAssembler::executableCopy(JSGlobalData& globalData, void* ownerUID)
 {
     // 64-bit alignment is required for next constant pool and JIT code as well
@@ -352 +352 @@
         bkpt(0);
 
-    RefPtr<ExecutableMemoryHandle> result = m_buffer.executableCopy(globalData);
+    RefPtr<ExecutableMemoryHandle> result = m_buffer.executableCopy(globalData, ownerUID);
     char* data = reinterpret_cast<char*>(result->start());
 

trunk/Source/JavaScriptCore/assembler/ARMAssembler.h

@@ -680 +680 @@
         }
 
-        PassRefPtr<ExecutableMemoryHandle> executableCopy(JSGlobalData&);
+        PassRefPtr<ExecutableMemoryHandle> executableCopy(JSGlobalData&, void* ownerUID);
 
 #ifndef NDEBUG

trunk/Source/JavaScriptCore/assembler/AssemblerBuffer.h

@@ -130 +130 @@
         }
 
-        PassRefPtr<ExecutableMemoryHandle> executableCopy(JSGlobalData& globalData)
+        PassRefPtr<ExecutableMemoryHandle> executableCopy(JSGlobalData& globalData, void* ownerUID)
         {
             if (!m_index)
                 return 0;
 
-            RefPtr<ExecutableMemoryHandle> result = globalData.executableAllocator.allocate(globalData, m_index);
+            RefPtr<ExecutableMemoryHandle> result = globalData.executableAllocator.allocate(globalData, m_index, ownerUID);
 
             if (!result)

trunk/Source/JavaScriptCore/assembler/AssemblerBufferWithConstantPool.h

@@ -196 +196 @@
     }
 
-    PassRefPtr<ExecutableMemoryHandle> executableCopy(JSGlobalData& globalData)
+    PassRefPtr<ExecutableMemoryHandle> executableCopy(JSGlobalData& globalData, void* ownerUID)
     {
         flushConstantPool(false);
-        return AssemblerBuffer::executableCopy(globalData);
+        return AssemblerBuffer::executableCopy(globalData, ownerUID);
     }
 

trunk/Source/JavaScriptCore/assembler/LinkBuffer.h

@@ -31 +31 @@
 #define DUMP_LINK_STATISTICS 0
 #define DUMP_CODE 0
+
+#define GLOBAL_THUNK_ID reinterpret_cast<void*>(static_cast<intptr_t>(-1))
+#define REGEXP_CODE_ID reinterpret_cast<void*>(static_cast<intptr_t>(-2))
 
 #include <MacroAssembler.h>
@@ -70 +73 @@
 
 public:
-    LinkBuffer(JSGlobalData& globalData, MacroAssembler* masm)
+    LinkBuffer(JSGlobalData& globalData, MacroAssembler* masm, void* ownerUID)
         : m_size(0)
         , m_code(0)
@@ -79 +82 @@
 #endif
     {
-        linkCode();
+        linkCode(ownerUID);
     }
 
@@ -174 +177 @@
     }
 
-    // Upon completion of all patching either 'finalizeCode()' or 'finalizeCodeAddendum()' should be called
-    // once to complete generation of the code.  'finalizeCode()' is suited to situations
-    // where the executable pool must also be retained, the lighter-weight 'finalizeCodeAddendum()' is
-    // suited to adding to an existing allocation.
+    // Upon completion of all patching 'finalizeCode()' should be called once to complete generation of the code.
     CodeRef finalizeCode()
     {
@@ -211 +211 @@
     }
     
-    // Keep this private! - the underlying code should only be obtained externally via 
-    // finalizeCode() or finalizeCodeAddendum().
+    // Keep this private! - the underlying code should only be obtained externally via finalizeCode().
     void* code()
     {
@@ -218 +217 @@
     }
 
-    void linkCode()
+    void linkCode(void* ownerUID)
     {
         ASSERT(!m_code);
 #if !ENABLE(BRANCH_COMPACTION)
-        m_executableMemory = m_assembler->m_assembler.executableCopy(*m_globalData);
+        m_executableMemory = m_assembler->m_assembler.executableCopy(*m_globalData, ownerUID);
         if (!m_executableMemory)
             return;
@@ -230 +229 @@
 #else
         size_t initialSize = m_assembler->m_assembler.codeSize();
-        m_executableMemory = m_globalData->executableAllocator.allocate(*m_globalData, initialSize);
+        m_executableMemory = m_globalData->executableAllocator.allocate(*m_globalData, initialSize, ownerUID);
         if (!m_executableMemory)
             return;

trunk/Source/JavaScriptCore/assembler/MIPSAssembler.h

@@ -646 +646 @@
     }
 
-    PassRefPtr<ExecutableMemoryHandle> executableCopy(JSGlobalData& globalData)
-    {
-        RefPtr<ExecutableMemoryHandle> result = m_buffer.executableCopy(globalData);
+    PassRefPtr<ExecutableMemoryHandle> executableCopy(JSGlobalData& globalData, void* ownerUID)
+    {
+        RefPtr<ExecutableMemoryHandle> result = m_buffer.executableCopy(globalData, ownerUID);
         if (!result)
             return 0;

trunk/Source/JavaScriptCore/assembler/SH4Assembler.h

@@ -1514 +1514 @@
     }
 
-    PassRefPtr<ExecutableMemoryHandle> executableCopy(JSGlobalData& globalData)
-    {
-        return m_buffer.executableCopy(globalData);
+    PassRefPtr<ExecutableMemoryHandle> executableCopy(JSGlobalData& globalData, void* ownerUID)
+    {
+        return m_buffer.executableCopy(globalData, ownerUID);
     }
 

trunk/Source/JavaScriptCore/assembler/X86Assembler.h

@@ -1783 +1783 @@
     }
     
-    PassRefPtr<ExecutableMemoryHandle> executableCopy(JSGlobalData& globalData)
-    {
-        return m_formatter.executableCopy(globalData);
+    PassRefPtr<ExecutableMemoryHandle> executableCopy(JSGlobalData& globalData, void* ownerUID)
+    {
+        return m_formatter.executableCopy(globalData, ownerUID);
     }
 
@@ -2133 +2133 @@
         void* data() const { return m_buffer.data(); }
 
-        PassRefPtr<ExecutableMemoryHandle> executableCopy(JSGlobalData& globalData)
-        {
-            return m_buffer.executableCopy(globalData);
+        PassRefPtr<ExecutableMemoryHandle> executableCopy(JSGlobalData& globalData, void* ownerUID)
+        {
+            return m_buffer.executableCopy(globalData, ownerUID);
         }