Changeset 35305 in webkit for trunk/JavaScriptCore/VM/Opcode.h

Timestamp:

Jul 23, 2008, 3:36:39 PM (17 years ago)

Author:

[email protected]

Message:

2008-07-23 Gavin Barraclough <​[email protected]>

Reviewed by Geoff Garen.

Sampling tool to analyze cost of instruction execution and identify hot regions of JS code.
Enable Switches by setting SAMPLING_TOOL_ENABLED in Opcode.h.

• JavaScriptCore.exp: Export symbols for Shell.cpp.
• VM/Machine.cpp: Added sampling hooks.
• VM/Machine.h: Machine contains a pointer to a sampler, when sampling.
• VM/Opcode.cpp: Tool implementation.
• VM/Opcode.h: Tool declaration.
• kjs/Shell.cpp: Initialize the sampler, if enabled.
• kjs/nodes.cpp: Added sampling hooks.

File:

• trunk/JavaScriptCore/VM/Opcode.h (modified) (2 diffs)

trunk/JavaScriptCore/VM/Opcode.h

@@ -32 +32 @@
 
 #include <wtf/Assertions.h>
+#include <wtf/HashMap.h>
 
 namespace KJS {
 
+#define SAMPLING_TOOL_ENABLED 0
 #define DUMP_OPCODE_STATS 0
 
@@ -144 +146 @@
 #endif
 
+    class ExecState;
+    class ScopeNode;
+    class CodeBlock;
+    struct Instruction;
+
+    struct ScopeSampleRecord
+    {
+        RefPtr<ScopeNode> m_scope;
+        CodeBlock* m_codeBlock;
+        int m_totalCount;
+        int* m_vpcCounts;
+        unsigned m_size;
+        
+        ScopeSampleRecord(ScopeNode* scope)
+            : m_scope(scope)
+            , m_codeBlock(0)
+            , m_totalCount(0)
+            , m_vpcCounts(0)
+            , m_size(0)
+        {
+        }
+        
+        ~ScopeSampleRecord()
+        {
+            if (m_vpcCounts)
+                free(m_vpcCounts);
+        }
+        
+        void sample(CodeBlock* codeBlock, Instruction* vPC);
+    };
+
+    typedef WTF::HashMap<ScopeNode*, ScopeSampleRecord*> ScopeSampleRecordMap;
+
+    class SamplingTool
+    {
+    public:
+        SamplingTool()
+            : m_running(false)
+            , m_recordedCodeBlock(0)
+            , m_recordedVPC(0)
+            , m_totalSamples(0)
+            , m_scopeSampleMap(new ScopeSampleRecordMap())
+        {
+        }
+
+        ~SamplingTool()
+        {
+            for (ScopeSampleRecordMap::iterator iter = m_scopeSampleMap->begin(); iter != m_scopeSampleMap->end(); ++iter)
+                delete iter->second;
+            delete m_scopeSampleMap;
+        }
+
+        void start(unsigned hertz=1000);
+        void stop();
+        void dump(ExecState*);
+
+        void notifyOfScope(ScopeNode* scope);
+
+        void sample(CodeBlock* recordedCodeBlock, Instruction* recordedVPC)
+        {
+            m_recordedCodeBlock = recordedCodeBlock;
+            m_recordedVPC = recordedVPC;
+        }
+
+        void privateExecuteReturned()
+        {
+            m_recordedCodeBlock = 0;
+            m_recordedVPC = 0;
+        }
+        
+        void callingNativeFunction()
+        {
+            m_recordedCodeBlock = 0;
+            m_recordedVPC = 0;
+        }
+        
+    private:
+        static void* threadStartFunc(void*);
+        void run();
+        
+        // Sampling thread state.
+        bool m_running;
+        unsigned m_hertz;
+        pthread_t m_samplingThread;
+
+        // State tracked by the main thread, used by the sampling thread.
+        CodeBlock* m_recordedCodeBlock;
+        Instruction* m_recordedVPC;
+
+        // Gathered sample data.
+        long long m_totalSamples;
+        ScopeSampleRecordMap* m_scopeSampleMap;
+    };
+
+// SCOPENODE_ / MACHINE_ macros for use from within member methods on ScopeNode / Machine respectively.
+#if SAMPLING_TOOL_ENABLED
+#define SCOPENODE_SAMPLING_notifyOfScope(sampler) sampler->notifyOfScope(this)
+#define MACHINE_SAMPLING_sample(codeBlock, vPC) m_sampler->sample(codeBlock, vPC)
+#define MACHINE_SAMPLING_privateExecuteReturned() m_sampler->privateExecuteReturned()
+#define MACHINE_SAMPLING_callingNativeFunction() m_sampler->callingNativeFunction()
+#else
+#define SCOPENODE_SAMPLING_notifyOfScope(sampler)
+#define MACHINE_SAMPLING_sample(codeBlock, vPC)
+#define MACHINE_SAMPLING_privateExecuteReturned()
+#define MACHINE_SAMPLING_callingNativeFunction()
+#endif
+
+
 #if DUMP_OPCODE_STATS