Changeset 427 for trunk/JavaScriptCore/VM/Opcode.cpp

Timestamp:

08/01/08 14:47:24 (5 months ago)

Author:

sroret

Message:

merge with webkit revision 35510

Files:

• trunk/JavaScriptCore/VM/Opcode.cpp (modified) (6 diffs)

trunk/JavaScriptCore/VM/Opcode.cpp

@@ -31 +31 @@
-#include "Opcode.h"
-
-#include <stdlib.h>
-#include "CodeBlock.h"
-#include "Machine.h"
-
-using namespace std;
-
-namespace KJS {
-
-SAMPLING_TOOL_ENABLED
+ENABLE(SAMPLING_TOOL)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-};
-
-#endif
-
-#if SAMPLING_TOOL_ENABLED
-
-void ScopeSampleRecord::sample(CodeBlock* codeBlock, Instruction* vPC)
-{
-    m_totalCount++;
-
-    if (!m_vpcCounts) {
-        m_size = codeBlock->instructions.size();
-        m_vpcCounts = static_cast<int*>(calloc(m_size, sizeof(int)));
-        m_codeBlock = codeBlock;
-    }
-
-    unsigned codeOffset = static_cast<unsigned>(reinterpret_cast<ptrdiff_t>(vPC) - reinterpret_cast<ptrdiff_t>(codeBlock->instructions.begin())) / sizeof(Instruction*);
-    // This could occur if codeBlock & vPC are not consistent - e.g. sample mid op_call/op_ret.
-    if (codeOffset < m_size)
-        m_vpcCounts[codeOffset]++;
-}
-
-static inline unsigned hertz2us(unsigned hertz)
-{
-    return 1000000 / hertz;
-}
-
-void SamplingTool::run()
-{
-    while (m_running) {
-        usleep(hertz2us(m_hertz));
-
-        m_totalSamples++;
-
-        CodeBlock* codeBlock = m_recordedCodeBlock;
-        Instruction* vPC = m_recordedVPC;
-
-        if (codeBlock && vPC) {
-            ScopeSampleRecord* record = m_scopeSampleMap->get(codeBlock->ownerNode);
-            if (record)
-                record->sample(codeBlock, vPC);
-        }
-    }
-}
-
-void* SamplingTool::threadStartFunc(void* samplingTool)
-{
-    reinterpret_cast<SamplingTool*>(samplingTool)->run();
-    return 0;
-}
-
-void SamplingTool::notifyOfScope(ScopeNode* scope)
-{
-    m_scopeSampleMap->set(scope, new ScopeSampleRecord(scope));
-}
-
-void SamplingTool::start(unsigned hertz)
-{
-    ASSERT(!m_running);
-    m_running = true;
-    m_hertz = hertz;
-    pthread_create(&m_samplingThread, 0, threadStartFunc, this);
-}
-
-void SamplingTool::stop()
-{
-    ASSERT(m_running);
-    m_running = false;
-    pthread_join(m_samplingThread, 0);
-}
-
-struct OpcodeSampleInfo
-{
-    OpcodeID opcode;
-    long long count;
-};
-
-struct LineCountInfo
-{
-    unsigned line;
-    unsigned count;
-};
-
-static int compareLineCountInfoSampling(const void* left, const void* right)
-{
-    const LineCountInfo *leftLineCount = reinterpret_cast<const LineCountInfo *>(left);
-    const LineCountInfo *rightLineCount = reinterpret_cast<const LineCountInfo *>(right);
-
-    return (leftLineCount->line > rightLineCount->line) ? 1 : (leftLineCount->line < rightLineCount->line) ? -1 : 0;
-}
-
-static int compareOpcodeIndicesSampling(const void* left, const void* right)
-{
-    const OpcodeSampleInfo *leftSampleInfo = reinterpret_cast<const OpcodeSampleInfo *>(left);
-    const OpcodeSampleInfo *rightSampleInfo = reinterpret_cast<const OpcodeSampleInfo *>(right);
-
-    return (leftSampleInfo->count < rightSampleInfo->count) ? 1 : (leftSampleInfo->count > rightSampleInfo->count) ? -1 : 0;
-}
-
-static int compareScopeSampleRecords(const void* left, const void* right)
-{
-    const ScopeSampleRecord* const leftValue = *static_cast<const ScopeSampleRecord* const *>(left);
-    const ScopeSampleRecord* const rightValue = *static_cast<const ScopeSampleRecord* const *>(right);
-
-    return (leftValue->m_totalCount < rightValue->m_totalCount) ? 1 : (leftValue->m_totalCount > rightValue->m_totalCount) ? -1 : 0;
-}
-
-void SamplingTool::dump(ExecState* exec)
-{
-    // Tidies up SunSpider output by removing short scripts - such a small number of samples would likely not be useful anyhow.
-    if (m_totalSamples < 10)
-        return;
-    
-    // (1) Calculate 'totalCodeBlockSamples', build and sort 'codeBlockSamples' array.
-
-    int scopeCount = m_scopeSampleMap->size();
-    long long totalCodeBlockSamples = 0;
-    ScopeSampleRecord* codeBlockSamples[scopeCount];
-    ScopeSampleRecordMap::iterator iter = m_scopeSampleMap->begin();
-    for (int i=0; i < scopeCount; ++i, ++iter) {
-        codeBlockSamples[i] = iter->second;
-        totalCodeBlockSamples += codeBlockSamples[i]->m_totalCount;
-    }
-    mergesort(codeBlockSamples, scopeCount, sizeof(ScopeSampleRecord*), compareScopeSampleRecords);
-
-    // (2) Print data from 'codeBlockSamples' array, calculate 'totalOpcodeSamples', populate 'opcodeSampleCounts' array.
-
-    long long totalOpcodeSamples = 0;
-    long long opcodeSampleCounts[numOpcodeIDs] = { 0 };
-
-    fprintf(stdout, "\nBlock sampling results\n\n"); 
-    fprintf(stdout, "Total blocks sampled (total samples): %lld (%lld)\n\n", totalCodeBlockSamples, m_totalSamples);
-
-    for (int i=0; i < scopeCount; i++) {
-        ScopeSampleRecord *record = codeBlockSamples[i];
-        CodeBlock* codeBlock = record->m_codeBlock;
-
-        double totalPercent = (record->m_totalCount * 100.0)/m_totalSamples;
-        double blockPercent = (record->m_totalCount * 100.0)/totalCodeBlockSamples;
-
-        if ((blockPercent >= 1) && codeBlock) {
-            Instruction* code = codeBlock->instructions.begin();
-            fprintf(stdout, "#%d: %s:%d: sampled %d times - %.3f%% (%.3f%%)\n", i+1, record->m_scope->sourceURL().UTF8String().c_str(), codeBlock->lineNumberForVPC(code), record->m_totalCount, blockPercent, totalPercent);
-            if (i < 10) {
-                HashMap<unsigned,unsigned> lineCounts;
-                codeBlock->dump(exec);
-                for (unsigned op = 0; op < record->m_size; ++op) {
-                    int count = record->m_vpcCounts[op];
-                    if (count) {
-                        printf("    [% 4d] has sample count: % 4d\n", op, count);
-                        unsigned line = codeBlock->lineNumberForVPC(code+op);
-                        lineCounts.set(line, (lineCounts.contains(line) ? lineCounts.get(line) : 0) + count);
-                    }
-                }
-                printf("\n");
-                int linesCount = lineCounts.size();
-                LineCountInfo lineCountInfo[linesCount];
-                int lineno = 0;
-                for (HashMap<unsigned,unsigned>::iterator iter = lineCounts.begin(); iter != lineCounts.end(); ++iter, ++lineno) {
-                    lineCountInfo[lineno].line = iter->first;
-                    lineCountInfo[lineno].count = iter->second;
-                }
-                mergesort(lineCountInfo, linesCount, sizeof(LineCountInfo), compareLineCountInfoSampling);
-                for (lineno = 0; lineno < linesCount; ++lineno) {
-                    printf("    Line #%d has sample count %d.\n", lineCountInfo[lineno].line, lineCountInfo[lineno].count);
-                }
-                printf("\n");
-            }
-        }
-        
-        if (record->m_vpcCounts && codeBlock) {
-            Instruction* instructions = codeBlock->instructions.begin();
-            for (unsigned op = 0; op < record->m_size; ++op) {
-                Opcode opcode = instructions[op].u.opcode;
-                if (exec->machine()->isOpcode(opcode)) {
-                    totalOpcodeSamples += record->m_vpcCounts[op];
-                    opcodeSampleCounts[exec->machine()->getOpcodeID(opcode)] += record->m_vpcCounts[op];
-                }
-            }
-        }
-    }
-    printf("\n");
-
-    // (3) Build and sort 'opcodeSampleInfo' array.
-
-    OpcodeSampleInfo opcodeSampleInfo[numOpcodeIDs];
-    for (int i = 0; i < numOpcodeIDs; ++i) {
-        opcodeSampleInfo[i].opcode = (OpcodeID)i;
-        opcodeSampleInfo[i].count = opcodeSampleCounts[i];
-    }
-    mergesort(opcodeSampleInfo, numOpcodeIDs, sizeof(OpcodeSampleInfo), compareOpcodeIndicesSampling);
-
-    // (4) Print Opcode sampling results.
-    
-    fprintf(stdout, "\nOpcode sampling results\n\n"); 
-    
-    fprintf(stdout, "Total opcodes sampled (total samples): %lld (%lld)\n\n", totalOpcodeSamples, m_totalSamples);
-    fprintf(stdout, "Opcodes in order:\n\n");
-    for (int i = 0; i < numOpcodeIDs; ++i) {
-        long long count = opcodeSampleCounts[i];
-        fprintf(stdout, "%s:\t%6lld\t%.3f%%\t(%.3f%%)\n", opcodeNames[i], count, ((double)count * 100)/totalOpcodeSamples, ((double)count * 100)/m_totalSamples);    
-    }
-    fprintf(stdout, "\n");
-    fprintf(stdout, "Opcodes by sample count:\n\n");
-    for (int i = 0; i < numOpcodeIDs; ++i) {
-        OpcodeID opcode = opcodeSampleInfo[i].opcode;
-        long long count = opcodeSampleInfo[i].count;
-        fprintf(stdout, "%s:\t%6lld\t%.3f%%\t(%.3f%%)\n", opcodeNames[opcode], count, ((double)count * 100)/totalOpcodeSamples, ((double)count * 100)/m_totalSamples);    
-    }
-    fprintf(stdout, "\n");
-}
-
-#endif
-
-
-#if DUMP_OPCODE_STATS
@@ -426 +122 @@
-    for (int i = 0; i < numOpcodeIDs; ++i) {
-        int index = sortedIndices[i];
- %lld - %.2f%%\n", opcodeNames[index]
+%s %lld - %.2f%%\n", opcodeNames[index], padOpcodeName((OpcodeID)index, 24)
-    }
-    
@@ -439 +135 @@
-            break;
-        
- %s: %lld %.2f%%\n", opcodeNames[indexPair.first], opcodeNames[indexPair.second]
+%s %s:%s %lld %.2f%%\n", opcodeNames[indexPair.first], padOpcodeName((OpcodeID)indexPair.first, 24), opcodeNames[indexPair.second], padOpcodeName((OpcodeID)indexPair.second, 24)
-    }
-    
@@ -451 +147 @@
-        if (opcodeProportion < 0.0001)
-            break;
- %lld - %.2f%%\n", opcodeNames[index]
+%s %lld - %.2f%%\n", opcodeNames[index], padOpcodeName((OpcodeID)index, 24)
-
-        for (int j = 0; j < numOpcodeIDs * numOpcodeIDs; ++j) {
@@ -464 +160 @@
-                continue;
-
- %s: %lld - %.2f%%\n", opcodeNames[indexPair.first], opcodeNames[indexPair.second]
+%s %s:%s %lld - %.2f%%\n", opcodeNames[indexPair.first], padOpcodeName((OpcodeID)indexPair.first, 24), opcodeNames[indexPair.second], padOpcodeName((OpcodeID)indexPair.second, 24)
-        }
-        
@@ -488 +184 @@
-#endif
-
-WTF
+KJS