Changeset 286992 in webkit

Timestamp:

Dec 13, 2021, 3:56:13 PM (5 years ago)

Author:

ysuzuki@apple.com

Message:

[JSC] Use FixedVector for wasm exception in Wasm::Instance
​https://bugs.webkit.org/show_bug.cgi?id=234224

Reviewed by Saam Barati.

Since we know # of exception tags when instantiating Wasm::Instance,
we can use FixedVector instead of Vector. This is the same to Table,
Functions etc.

We also remove Wasm::Tag::m_id. Since we do not copy Wasm::Tag and
we always allocate Wasm::Tag from heap, we can just use pointer
comparison. Then, we do not need to have this m_id.

• wasm/WasmInstance.cpp:

(JSC::Wasm::Instance::Instance):
(JSC::Wasm::Instance::setTag):
(JSC::Wasm::Instance::addTag): Deleted.

• wasm/WasmInstance.h:
• wasm/WasmModuleInformation.h:

(JSC::Wasm::ModuleInformation::internalExceptionCount const):

• wasm/WasmTag.cpp:
• wasm/WasmTag.h:

(JSC::Wasm::Tag::create): Deleted.
(JSC::Wasm::Tag::parameterCount const): Deleted.
(JSC::Wasm::Tag::parameter const): Deleted.
(JSC::Wasm::Tag::operator== const): Deleted.
(JSC::Wasm::Tag::operator!= const): Deleted.
(JSC::Wasm::Tag::signature const): Deleted.
(JSC::Wasm::Tag::Tag): Deleted.

• wasm/js/WebAssemblyModuleRecord.cpp:

(JSC::WebAssemblyModuleRecord::initializeImportsAndExports):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wasm/WasmInstance.cpp (modified) (2 diffs)
• wasm/WasmInstance.h (modified) (2 diffs)
• wasm/WasmModuleInformation.h (modified) (1 diff)
• wasm/WasmTag.cpp (modified) (1 diff)
• wasm/WasmTag.h (modified) (3 diffs)
• wasm/js/WebAssemblyModuleRecord.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-12-13  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Use FixedVector for wasm exception in Wasm::Instance
+        https://bugs.webkit.org/show_bug.cgi?id=234224
+
+        Reviewed by Saam Barati.
+
+        Since we know # of exception tags when instantiating Wasm::Instance,
+        we can use FixedVector instead of Vector. This is the same to Table,
+        Functions etc.
+
+        We also remove Wasm::Tag::m_id. Since we do not copy Wasm::Tag and
+        we always allocate Wasm::Tag from heap, we can just use pointer
+        comparison. Then, we do not need to have this m_id.
+
+        * wasm/WasmInstance.cpp:
+        (JSC::Wasm::Instance::Instance):
+        (JSC::Wasm::Instance::setTag):
+        (JSC::Wasm::Instance::addTag): Deleted.
+        * wasm/WasmInstance.h:
+        * wasm/WasmModuleInformation.h:
+        (JSC::Wasm::ModuleInformation::internalExceptionCount const):
+        * wasm/WasmTag.cpp:
+        * wasm/WasmTag.h:
+        (JSC::Wasm::Tag::create): Deleted.
+        (JSC::Wasm::Tag::parameterCount const): Deleted.
+        (JSC::Wasm::Tag::parameter const): Deleted.
+        (JSC::Wasm::Tag::operator== const): Deleted.
+        (JSC::Wasm::Tag::operator!= const): Deleted.
+        (JSC::Wasm::Tag::signature const): Deleted.
+        (JSC::Wasm::Tag::Tag): Deleted.
+        * wasm/js/WebAssemblyModuleRecord.cpp:
+        (JSC::WebAssemblyModuleRecord::initializeImportsAndExports):
+
 2021-12-13  waddlesplash  <waddlesplash@gmail.com>
 

trunk/Source/JavaScriptCore/wasm/WasmInstance.cpp

@@ -59 +59 @@
     , m_passiveElements(m_module->moduleInformation().elementCount())
     , m_passiveDataSegments(m_module->moduleInformation().dataSegmentsCount())
+    , m_tags(m_module->moduleInformation().exceptionIndexSpaceSize())
 {
     for (unsigned i = 0; i < m_numImportFunctions; ++i)
@@ -301 +302 @@
 }
 
-void Instance::addTag(const Tag& tag)
-{
-    m_tags.append(Ref { tag });
-}
-
-void Instance::addTag(Ref<Tag>&& tag)
-{
-    m_tags.append(WTFMove(tag));
+void Instance::setTag(unsigned index, Ref<const Tag>&& tag)
+{
+    m_tags[index] = WTFMove(tag);
 }
 

trunk/Source/JavaScriptCore/wasm/WasmInstance.h

@@ -210 +210 @@
     }
 
-    void addTag(const Tag&);
-    void addTag(Ref<Tag>&&);
     const Tag& tag(unsigned i) const { return *m_tags[i]; }
+    void setTag(unsigned, Ref<const Tag>&&);
 
 private:
@@ -240 +239 @@
     BitVector m_passiveElements;
     BitVector m_passiveDataSegments;
-    Vector<RefPtr<const Tag>> m_tags;
+    FixedVector<RefPtr<const Tag>> m_tags;
 };
 

trunk/Source/JavaScriptCore/wasm/WasmModuleInformation.h

@@ -75 +75 @@
     uint32_t internalFunctionCount() const { return internalFunctionSignatureIndices.size(); }
     uint32_t importExceptionCount() const { return importExceptionSignatureIndices.size(); }
+    uint32_t internalExceptionCount() const { return internalExceptionSignatureIndices.size(); }
 
     // Currently, our wasm implementation allows only one memory and table.

trunk/Source/JavaScriptCore/wasm/WasmTag.cpp

@@ -32 +32 @@
 namespace Wasm {
 
-std::atomic<uint32_t> Tag::s_id = 0;
-
 } } // namespace JSC::Wasm
 

trunk/Source/JavaScriptCore/wasm/WasmTag.h

@@ -32 +32 @@
 namespace JSC { namespace Wasm {
 
-class Tag : public ThreadSafeRefCounted<Tag> {
+class Tag final : public ThreadSafeRefCounted<Tag> {
     WTF_MAKE_FAST_ALLOCATED;
     WTF_MAKE_NONCOPYABLE(Tag);
@@ -41 +41 @@
     Type parameter(SignatureArgCount i) const { return m_signature->argument(i); }
 
-    bool operator==(const Tag& other) const { return m_id == other.m_id; }
-    bool operator!=(const Tag& other) const { return m_id != other.m_id; }
+    // Since (1) we do not copy Wasm::Tag and (2) we always allocate Wasm::Tag from heap, we can use
+    // pointer comparison for identity check.
+    bool operator==(const Tag& other) const { return this == &other; }
+    bool operator!=(const Tag& other) const { return this != &other; }
 
     const Signature& signature() const { return m_signature.get(); }
@@ -48 +50 @@
 private:
     Tag(const Signature& signature)
-        : m_id(++s_id)
-        , m_signature(Ref { signature })
+        : m_signature(Ref { signature })
     {
     }
 
-    static std::atomic<uint32_t> s_id;
-    uint32_t m_id;
     Ref<const Signature> m_signature;
 };

trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp

@@ -406 +406 @@
                 return exception(createJSWebAssemblyLinkError(globalObject, vm, importFailMessage(import, "imported Tag", "signature doesn't match the imported WebAssembly Tag's signature")));
 
-            m_instance->instance().addTag(tag->tag());
+            m_instance->instance().setTag(import.kindIndex, tag->tag());
             break;
         }
@@ -479 +479 @@
     Wasm::CodeBlock* codeBlock = m_instance->instance().codeBlock();
 
-    for (Wasm::SignatureIndex signatureIndex : moduleInformation.internalExceptionSignatureIndices)
-        m_instance->instance().addTag(Wasm::Tag::create(Wasm::SignatureInformation::get(signatureIndex)));
+    for (unsigned index = 0; index < moduleInformation.internalExceptionSignatureIndices.size(); ++index) {
+        Wasm::SignatureIndex signatureIndex = moduleInformation.internalExceptionSignatureIndices[index];
+        m_instance->instance().setTag(moduleInformation.importExceptionCount() + index, Wasm::Tag::create(Wasm::SignatureInformation::get(signatureIndex)));
+    }
 
     unsigned functionImportCount = codeBlock->functionImportCount();