Changeset 103384 in webkit for trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

Timestamp:

Dec 20, 2011, 6:29:15 PM (13 years ago)

Author:

[email protected]

Message:

Value Profiles for arguments should be more easily accessible to the interpreter
​https://bugs.webkit.org/show_bug.cgi?id=74984
<rdar://problem/10611364>

Reviewed by Gavin Barraclough.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::stronglyVisitStrongReferences):
(JSC::CodeBlock::shouldOptimizeNow):
(JSC::CodeBlock::dumpValueProfiles):

• bytecode/CodeBlock.h:

(JSC::CodeBlock::setArgumentValueProfileSize):
(JSC::CodeBlock::numberOfArgumentValueProfiles):
(JSC::CodeBlock::valueProfileForArgument):
(JSC::CodeBlock::addValueProfile):
(JSC::CodeBlock::valueProfile):
(JSC::CodeBlock::valueProfileForBytecodeOffset):
(JSC::CodeBlock::totalNumberOfValueProfiles):
(JSC::CodeBlock::getFromAllValueProfiles):

• bytecode/ValueProfile.h:

(JSC::ValueProfile::ValueProfile):

• jit/JIT.cpp:

(JSC::JIT::privateCompile):

• jit/JIT.h:
• jit/JITInlineMethods.h:

(JSC::JIT::emitValueProfilingSite):

File:

• trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

@@ -658 +658 @@
         
 #if ENABLE(VALUE_PROFILER)
+        void setArgumentValueProfileSize(unsigned size)
+        {
+            m_argumentValueProfiles.resize(size);
+        }
+        unsigned numberOfArgumentValueProfiles()
+        {
+            return m_argumentValueProfiles.size();
+        }
+        ValueProfile* valueProfileForArgument(unsigned argumentIndex)
+        {
+            ValueProfile* result = &m_argumentValueProfiles[argumentIndex];
+            ASSERT(result->m_bytecodeOffset == -1);
+            return result;
+        }
+        
         ValueProfile* addValueProfile(int bytecodeOffset)
         {
+            ASSERT(bytecodeOffset != -1);
             m_valueProfiles.append(ValueProfile(bytecodeOffset));
             return &m_valueProfiles.last();
         }
         unsigned numberOfValueProfiles() { return m_valueProfiles.size(); }
-        ValueProfile* valueProfile(int index) { return &m_valueProfiles[index]; }
+        ValueProfile* valueProfile(int index)
+        {
+            ValueProfile* result = &m_valueProfiles[index];
+            ASSERT(result->m_bytecodeOffset != -1);
+            return result;
+        }
         ValueProfile* valueProfileForBytecodeOffset(int bytecodeOffset)
         {
-            return WTF::genericBinarySearch<ValueProfile, int, getValueProfileBytecodeOffset>(m_valueProfiles, m_valueProfiles.size(), bytecodeOffset);
-        }
-        ValueProfile* valueProfileForArgument(int argument)
-        {
-            size_t index = argument;
-            if (index >= m_valueProfiles.size())
-                return 0;
-            ValueProfile* result = valueProfile(index);
-            if (result->m_bytecodeOffset != -1)
-                return 0;
+            ValueProfile* result = WTF::genericBinarySearch<ValueProfile, int, getValueProfileBytecodeOffset>(m_valueProfiles, m_valueProfiles.size(), bytecodeOffset);
+            ASSERT(result->m_bytecodeOffset != -1);
             return result;
+        }
+        
+        unsigned totalNumberOfValueProfiles()
+        {
+            return numberOfArgumentValueProfiles() + numberOfValueProfiles();
+        }
+        ValueProfile* getFromAllValueProfiles(unsigned index)
+        {
+            if (index < numberOfArgumentValueProfiles())
+                return valueProfileForArgument(index);
+            return valueProfile(index - numberOfArgumentValueProfiles());
         }
         
@@ -1252 +1276 @@
 #endif
 #if ENABLE(VALUE_PROFILER)
+        Vector<ValueProfile> m_argumentValueProfiles;
         SegmentedVector<ValueProfile, 8> m_valueProfiles;
         SegmentedVector<RareCaseProfile, 8> m_rareCaseProfiles;