Changeset 64146 in webkit for trunk/JavaScriptCore/yarr/RegexInterpreter.h

Timestamp:

Jul 27, 2010, 12:14:40 PM (15 years ago)

Author:

[email protected]

Message:

Bug 42621 - Add a bump allocator for the YARR interpreter

Reviewed by Oliver Hunt.

The regex engine requires lifo allocation, however currently uses the general purpose
malloc/free memory allocation. A simple bump pointer allocator should provide a lower
overhead allocation solution.

JavaScriptCore:

When using YARR interpreter, 15% progression on v8-regex.

• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/JSGlobalData.h:
• runtime/RegExp.cpp:

(JSC::RegExp::compile):

• wtf/BumpPointerAllocator.h: Added.

(WTF::BumpPointerPool::ensureCapacity):
(WTF::BumpPointerPool::alloc):
(WTF::BumpPointerPool::dealloc):
(WTF::BumpPointerPool::operator new):
(WTF::BumpPointerPool::BumpPointerPool):
(WTF::BumpPointerPool::create):
(WTF::BumpPointerPool::shrink):
(WTF::BumpPointerPool::destroy):
(WTF::BumpPointerPool::ensureCapacityCrossPool):
(WTF::BumpPointerPool::deallocCrossPool):
(WTF::BumpPointerAllocator::BumpPointerAllocator):
(WTF::BumpPointerAllocator::~BumpPointerAllocator):
(WTF::BumpPointerAllocator::startAllocator):
(WTF::BumpPointerAllocator::stopAllocator):

• yarr/RegexInterpreter.cpp:

(JSC::Yarr::Interpreter::allocDisjunctionContext):
(JSC::Yarr::Interpreter::freeDisjunctionContext):
(JSC::Yarr::Interpreter::allocParenthesesDisjunctionContext):
(JSC::Yarr::Interpreter::freeParenthesesDisjunctionContext):
(JSC::Yarr::Interpreter::interpret):
(JSC::Yarr::Interpreter::Interpreter):
(JSC::Yarr::ByteCompiler::compile):
(JSC::Yarr::byteCompileRegex):

• yarr/RegexInterpreter.h:

(JSC::Yarr::BytecodePattern::BytecodePattern):

JavaScriptGlue:

• ForwardingHeaders/wtf/BumpPointerAllocator.h: Added.

WebCore:

• ForwardingHeaders/wtf/BumpPointerAllocator.h: Added.

File:

• trunk/JavaScriptCore/yarr/RegexInterpreter.h (modified) (4 diffs)

trunk/JavaScriptCore/yarr/RegexInterpreter.h

@@ -33 +33 @@
 #include <wtf/PassOwnPtr.h>
 #include <wtf/unicode/Unicode.h>
+
+namespace WTF {
+class BumpPointerAllocator;
+}
+using WTF::BumpPointerAllocator;
 
 namespace JSC { namespace Yarr {
@@ -294 +299 @@
 
 struct BytecodePattern : FastAllocBase {
-    BytecodePattern(PassOwnPtr<ByteDisjunction> body, Vector<ByteDisjunction*> allParenthesesInfo, RegexPattern& pattern)
+    BytecodePattern(PassOwnPtr<ByteDisjunction> body, Vector<ByteDisjunction*> allParenthesesInfo, RegexPattern& pattern, BumpPointerAllocator* allocator)
         : m_body(body)
         , m_ignoreCase(pattern.m_ignoreCase)
         , m_multiline(pattern.m_multiline)
+        , m_allocator(allocator)
     {
         newlineCharacterClass = pattern.newlineCharacterClass();
@@ -319 +325 @@
     bool m_ignoreCase;
     bool m_multiline;
-    
+    // Each BytecodePattern is associated with a RegExp, each RegExp is associated
+    // with a JSGlobalData.  Cache a pointer to out JSGlobalData's m_regexAllocator.
+    BumpPointerAllocator* m_allocator;
+
     CharacterClass* newlineCharacterClass;
     CharacterClass* wordcharCharacterClass;
@@ -327 +336 @@
 };
 
-PassOwnPtr<BytecodePattern> byteCompileRegex(const UString& pattern, unsigned& numSubpatterns, const char*& error, bool ignoreCase = false, bool multiline = false);
+PassOwnPtr<BytecodePattern> byteCompileRegex(const UString& pattern, unsigned& numSubpatterns, const char*& error, BumpPointerAllocator*, bool ignoreCase = false, bool multiline = false);
 int interpretRegex(BytecodePattern* v_regex, const UChar* input, unsigned start, unsigned length, int* output);