Changeset 36402 in webkit for trunk/JavaScriptCore/VM/SamplingTool.cpp

Timestamp:

Sep 14, 2008, 1:33:03 AM (17 years ago)

Author:

[email protected]

Message:

2008-09-14 Sam Weinig <​[email protected]>

Reviewed by Cameron Zwarich.

Cleanup Sampling code.

• VM/CTI.cpp: (JSC::CTI::emitCall): (JSC::CTI::privateCompileMainPass):
• VM/CTI.h: (JSC::CTI::execute):
• VM/SamplingTool.cpp: (JSC::): (JSC::SamplingTool::run): (JSC::SamplingTool::dump):
• VM/SamplingTool.h: (JSC::SamplingTool::callingHostFunction):

File:

• trunk/JavaScriptCore/VM/SamplingTool.cpp (modified) (7 diffs)

trunk/JavaScriptCore/VM/SamplingTool.cpp

@@ -81 +81 @@
 
 #if ENABLE(SAMPLING_TOOL)
-extern OpcodeID what;
-extern unsigned incall;
-unsigned cowdogs = 0;
-unsigned sampleCows[numOpcodeIDs] = {0};
-unsigned sampleDogs[numOpcodeIDs] = {0};
+unsigned totalOpcodeIDCount = 0;
+unsigned opcodeIDCountInCalledCode[numOpcodeIDs] = {0};
+unsigned opcodeIDCountInJITCode[numOpcodeIDs] = {0};
 #endif
 
@@ -95 +93 @@
         m_totalSamples++;
 #if ENABLE(SAMPLING_TOOL)
-        if (what != (OpcodeID)-1) {
-            ++cowdogs;
-            if (incall)
-                sampleDogs[what]++;
+        if (currentOpcodeID != static_cast<OpcodeID>(-1)) {
+            ++totalOpcodeIDCount;
+            if (inCalledCode)
+                opcodeIDCountInCalledCode[currentOpcodeID]++;
             else
-                sampleCows[what]++;
+                opcodeIDCountInJITCode[currentOpcodeID]++;
         }
 #endif        
@@ -142 +140 @@
 #if ENABLE(SAMPLING_TOOL)
 
-struct OpcodeSampleInfo
-{
+struct OpcodeSampleInfo {
     OpcodeID opcode;
     long long count;
-    long long countincall;
+    long long countInCalledCode;
 };
 
-struct LineCountInfo
-{
+struct LineCountInfo {
     unsigned line;
     unsigned count;
@@ -195 +191 @@
         totalCodeBlockSamples += codeBlockSamples[i]->m_totalCount;
     }
-#if HAVE(MERGESORT)
-    mergesort(codeBlockSamples.begin(), scopeCount, sizeof(ScopeSampleRecord*), compareScopeSampleRecords);
-#else
+
     qsort(codeBlockSamples.begin(), scopeCount, sizeof(ScopeSampleRecord*), compareScopeSampleRecords);
-#endif
 
     // (2) Print data from 'codeBlockSamples' array, calculate 'totalOpcodeSamples', populate 'opcodeSampleCounts' array.
@@ -209 +202 @@
     printf("Total blocks sampled (total samples): %lld (%lld)\n\n", totalCodeBlockSamples, m_totalSamples);
 
-    for (int i=0; i < scopeCount; i++) {
+    for (int i = 0; i < scopeCount; ++i) {
         ScopeSampleRecord* record = codeBlockSamples[i];
         CodeBlock* codeBlock = record->m_codeBlock;
@@ -238 +231 @@
                     lineCountInfo[lineno].count = iter->second;
                 }
-#if HAVE(MERGESORT)
-                mergesort(lineCountInfo.begin(), linesCount, sizeof(LineCountInfo), compareLineCountInfoSampling);
-#else
+
                 qsort(lineCountInfo.begin(), linesCount, sizeof(LineCountInfo), compareLineCountInfoSampling);
-#endif
+
                 for (lineno = 0; lineno < linesCount; ++lineno) {
                     printf("    Line #%d has sample count %d.\n", lineCountInfo[lineno].line, lineCountInfo[lineno].count);
@@ -267 +258 @@
     OpcodeSampleInfo opcodeSampleInfo[numOpcodeIDs];
     for (int i = 0; i < numOpcodeIDs; ++i) {
-        opcodeSampleInfo[i].opcode = (OpcodeID)i;
-        opcodeSampleInfo[i].count = sampleCows[i]+sampleDogs[i];
-        opcodeSampleInfo[i].countincall = sampleDogs[i];
-    }
-#if HAVE(MERGESORT)
-    mergesort(opcodeSampleInfo, numOpcodeIDs, sizeof(OpcodeSampleInfo), compareOpcodeIndicesSampling);
-#else
+        opcodeSampleInfo[i].opcode = static_cast<OpcodeID>(i);
+        opcodeSampleInfo[i].count = opcodeIDCountInJITCode[i] + opcodeIDCountInCalledCode[i];
+        opcodeSampleInfo[i].countInCalledCode = opcodeIDCountInCalledCode[i];
+    }
+
     qsort(opcodeSampleInfo, numOpcodeIDs, sizeof(OpcodeSampleInfo), compareOpcodeIndicesSampling);
-#endif
 
     // (4) Print Opcode sampling results.
 
-
     printf("\nOpcode sampling results\n\n"); 
-    
-//    printf("Total opcodes sampled (total samples): %lld (%lld)\n\n", totalOpcodeSamples, m_totalSamples);
-//    printf("Opcodes in order:\n\n");
-//    for (int i = 0; i < numOpcodeIDs; ++i) {
-//        long long count = opcodeSampleCounts[i];
-//        printf("%s:%s%6lld\t%.3f%%\t(%.3f%%)\n", opcodeNames[i], padOpcodeName(static_cast<OpcodeID>(i), 20), count, (static_cast<double>(count) * 100) / totalOpcodeSamples, (static_cast<double>(count) * 100) / m_totalSamples);    
-//    }
-//    printf("\n");
-//    printf("Opcodes by sample count:\n\n");
 
     for (int i = 0; i < numOpcodeIDs; ++i) {
         OpcodeID opcode = opcodeSampleInfo[i].opcode;
         long long count = opcodeSampleInfo[i].count;
-//        printf("%s:%s%6lld\t%.3f%%\t(%.3f%%)\n", opcodeNames[opcode], padOpcodeName(opcode, 20), count, (static_cast<double>(count) * 100) / totalOpcodeSamples, (static_cast<double>(count) * 100) / m_totalSamples);    
-        long long countincall = opcodeSampleInfo[i].countincall;
-        fprintf(stdout, "%s:%s%6lld\t%6lld\t%.3f%%\t%.3f%%\t(%.3f%%)\n", opcodeNames[opcode], padOpcodeName(opcode, 20), count, countincall, ((double)count * 100)/cowdogs, ((double)count * 100)/m_totalSamples, ((double)countincall * 100)/m_totalSamples);    
+        long long countInCalledCode = opcodeSampleInfo[i].countInCalledCode;
+        fprintf(stdout, "%s:%s%6lld\t%6lld\t%.3f%%\t%.3f%%\t(%.3f%%)\n", opcodeNames[opcode], padOpcodeName(opcode, 20), count, countInCalledCode, (static_cast<double>(count) * 100) / totalOpcodeIDCount, (static_cast<double>(count) * 100) / m_totalSamples, (static_cast<double>(countInCalledCode) * 100) / m_totalSamples);    
     }
     printf("\n");