Changeset 34371 in webkit for trunk/JavaScriptCore

Timestamp:

Jun 4, 2008, 9:39:09 PM (17 years ago)

Author:

[email protected]

Message:

2008-06-04 Cameron Zwarich <​[email protected]>

Reviewed by Oliver.

Add an option to dump statistics on executed instructions.

JavaScriptCore:

• VM/Machine.cpp: (KJS::Machine::privateExecute):
• VM/Opcode.cpp: (KJS::): (KJS::OpcodeStats::~OpcodeStats): (KJS::OpcodeStats::recordInstruction):
• VM/Opcode.h:

WebKitTools:

• Scripts/check-for-global-initializers:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/Machine.cpp (modified) (1 diff)
• VM/Opcode.cpp (modified) (2 diffs)
• VM/Opcode.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-06-04  Cameron Zwarich  <[email protected]>
+
+        Reviewed by Oliver.
+
+        Add an option to dump statistics on executed instructions.
+
+        * VM/Machine.cpp:
+        (KJS::Machine::privateExecute):
+        * VM/Opcode.cpp:
+        (KJS::):
+        (KJS::OpcodeStats::~OpcodeStats):
+        (KJS::OpcodeStats::recordInstruction):
+        * VM/Opcode.h:
+
 2008-06-04  Kevin McCullough  <[email protected]>
 

trunk/JavaScriptCore/VM/Machine.cpp

@@ -909 +909 @@
 #if HAVE(COMPUTED_GOTO)
     #define NEXT_OPCODE goto *vPC->u.opcode
+#if DUMP_OPCODE_STATS
+    #define BEGIN_OPCODE(opcode) opcode: OpcodeStats::recordInstruction(opcode);
+#else
     #define BEGIN_OPCODE(opcode) opcode:
+#endif
     NEXT_OPCODE;
 #else
     #define NEXT_OPCODE continue
+#if DUMP_OPCODE_STATS
+    #define BEGIN_OPCODE(opcode) case opcode: OpcodeStats::recordInstruction(opcode);
+#else
     #define BEGIN_OPCODE(opcode) case opcode:
+#endif
     while(1) // iterator loop begins
     switch (vPC->u.opcode)

trunk/JavaScriptCore/VM/Opcode.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008 Cameron Zwarich <[email protected]>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29 +30 @@
 #include "Opcode.h"
 
+namespace KJS {
+
+#if DUMP_OPCODE_STATS
+
+unsigned OpcodeStats::opcodeCounts[numOpcodeIDs];
+
+static OpcodeStats logger;
+
+static const char* opcodeNames[] = {
+    "load",
+    "new_object",
+    "new_array",
+    "new_regexp",
+    "mov",
+    
+    "not",
+    "eq",
+    "neq",
+    "stricteq",
+    "nstricteq",
+    "less",
+    "lesseq",
+    
+    "pre_inc",
+    "pre_dec",
+    "post_inc",
+    "post_dec",
+    "to_jsnumber",
+    "negate",
+    "add",
+    "mul",
+    "div",
+    "mod",
+    "sub",
+    
+    "lshift",
+    "rshift",
+    "urshift",
+    "bitand",
+    "bitxor",
+    "bitor",
+    "bitnot",
+    
+    "instanceof",
+    "typeof",
+    "in",
+
+    "resolve",
+    "resolve_skip",
+    "get_scoped_var",
+    "put_scoped_var",
+    "resolve_base",
+    "resolve_with_base",
+    "resolve_func",
+    "get_by_id",
+    "put_by_id",
+    "del_by_id",
+    "get_by_val",
+    "put_by_val",
+    "del_by_val",
+    "put_by_index",
+    "put_getter",
+    "put_setter",
+
+    "jmp",
+    "jtrue",
+    "jfalse",
+    "jmp_scopes",
+
+    "new_func",
+    "new_func_exp",
+    "call",
+    "call_eval",
+    "ret",
+
+    "construct",
+
+    "get_pnames",
+    "next_pname",
+
+    "push_scope",
+    "pop_scope",
+
+    "catch",
+    "throw",
+    "new_error",
+
+    "jsr",
+    "sret",
+
+    "debug",
+
+    "end"    
+};
+
+OpcodeStats::OpcodeStats()
+{
+    for (int i = 0; i < numOpcodeIDs; ++i)
+        opcodeCounts[i] = 0;
+}
+
+OpcodeStats::~OpcodeStats()
+{
+    int totalInstructions = 0;
+    int sortedIndices[numOpcodeIDs];
+    
+    for (int i = 0; i < numOpcodeIDs; ++i) {
+        totalInstructions += opcodeCounts[i];
+        sortedIndices[i] = i;
+    }
+        
+    for (int i = 0; i < numOpcodeIDs - 1; ++i) {
+        int max = i;
+        
+        for (int j = i + 1; j < numOpcodeIDs; ++j) {
+            if (opcodeCounts[sortedIndices[j]] > opcodeCounts[sortedIndices[max]])
+                max = j;
+        }
+        
+        int temp = sortedIndices[i];
+        sortedIndices[i] = sortedIndices[max];
+        sortedIndices[max] = temp;
+    }
+ 
+    printf("\nExecuted opcode statistics:\n\n"); 
+    
+    printf("Total instructions executed: %d\n\n", totalInstructions);
+
+    for (int i = 0; i < numOpcodeIDs; ++i) {
+        int index = sortedIndices[i];
+        printf("%s: %.2f%%\n", opcodeNames[index], ((double) opcodeCounts[index]) / ((double) totalInstructions) * 100.0);    
+    }
+    
+    printf("\n");
+}
+
+void OpcodeStats::recordInstruction(int opcode)
+{
+    opcodeCounts[opcode]++;
+}
+
+#endif
+
+} // namespace WTF

trunk/JavaScriptCore/VM/Opcode.h

@@ -34 +34 @@
 
 namespace KJS {
-        
+
+#define DUMP_OPCODE_STATS 0
+
     #define FOR_EACH_OPCODE_ID(macro) \
         macro(op_load) \
@@ -137 +139 @@
 #endif
 
+#if DUMP_OPCODE_STATS
+
+    struct OpcodeStats {
+        OpcodeStats();
+        ~OpcodeStats();
+        static unsigned opcodeCounts[numOpcodeIDs];
+        static void recordInstruction(int opcode);
+    };
+
+#endif
+
 } // namespace KJS