Changeset 215853 in webkit

Timestamp:

Apr 26, 2017 7:57:09 PM (7 years ago)

Author:

keith_miller@apple.com

Message:

Follow up to r215843
​https://bugs.webkit.org/show_bug.cgi?id=171361

Reviewed by Saam Barati.

This patch fixes some style comments Saam didn't get a chance to
request before I landed: ​https://bugs.webkit.org/show_bug.cgi?id=170134.

It renames Wasm::CodeBlock::m_wasmEntrypoints to
m_wasmIndirectCallEntrypoints, as well as fixes some copyrights and
indentation.

• wasm/WasmBBQPlan.cpp:
• wasm/WasmCodeBlock.cpp:

(JSC::Wasm::CodeBlock::CodeBlock):

• wasm/WasmCodeBlock.h:

(JSC::Wasm::CodeBlock::wasmEntrypointLoadLocationFromFunctionIndexSpace):

• wasm/WasmOMGPlan.cpp:

(JSC::Wasm::OMGPlan::work):

• wasm/WasmTierUpCount.h:

(JSC::Wasm::TierUpCount::TierUpCount):
(JSC::Wasm::TierUpCount::loopDecrement):
(JSC::Wasm::TierUpCount::functionEntryDecrement):
(JSC::Wasm::TierUpCount::shouldStartTierUp):
(JSC::Wasm::TierUpCount::count):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wasm/WasmBBQPlan.cpp (modified) (1 diff)
• wasm/WasmCodeBlock.cpp (modified) (1 diff)
• wasm/WasmCodeBlock.h (modified) (2 diffs)
• wasm/WasmOMGPlan.cpp (modified) (2 diffs)
• wasm/WasmTierUpCount.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-04-26  Keith Miller  <keith_miller@apple.com>
+
+        Follow up to r215843
+        https://bugs.webkit.org/show_bug.cgi?id=171361
+
+        Reviewed by Saam Barati.
+
+        This patch fixes some style comments Saam didn't get a chance to
+        request before I landed: https://bugs.webkit.org/show_bug.cgi?id=170134.
+
+        It renames Wasm::CodeBlock::m_wasmEntrypoints to
+        m_wasmIndirectCallEntrypoints, as well as fixes some copyrights and
+        indentation.
+
+        * wasm/WasmBBQPlan.cpp:
+        * wasm/WasmCodeBlock.cpp:
+        (JSC::Wasm::CodeBlock::CodeBlock):
+        * wasm/WasmCodeBlock.h:
+        (JSC::Wasm::CodeBlock::wasmEntrypointLoadLocationFromFunctionIndexSpace):
+        * wasm/WasmOMGPlan.cpp:
+        (JSC::Wasm::OMGPlan::work):
+        * wasm/WasmTierUpCount.h:
+        (JSC::Wasm::TierUpCount::TierUpCount):
+        (JSC::Wasm::TierUpCount::loopDecrement):
+        (JSC::Wasm::TierUpCount::functionEntryDecrement):
+        (JSC::Wasm::TierUpCount::shouldStartTierUp):
+        (JSC::Wasm::TierUpCount::count):
+
 2017-04-26  Saam Barati  <sbarati@apple.com>
 

trunk/Source/JavaScriptCore/wasm/WasmBBQPlan.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

trunk/Source/JavaScriptCore/wasm/WasmCodeBlock.cpp

@@ -53 +53 @@
         m_jsCallees.resize(m_calleeCount);
         m_optimizedCallees.resize(m_calleeCount);
-        m_wasmEntryPoints.resize(m_calleeCount);
+        m_wasmIndirectCallEntryPoints.resize(m_calleeCount);
 
         m_plan->initializeCallees([&] (unsigned calleeIndex, Ref<Wasm::Callee>&& jsEntrypointCallee, Ref<Wasm::Callee>&& wasmEntrypointCallee) {
             m_jsCallees[calleeIndex] = WTFMove(jsEntrypointCallee);
             m_callees[calleeIndex] = WTFMove(wasmEntrypointCallee);
-            m_wasmEntryPoints[calleeIndex] = m_callees[calleeIndex]->entrypoint();
+            m_wasmIndirectCallEntryPoints[calleeIndex] = m_callees[calleeIndex]->entrypoint();
         });
 

trunk/Source/JavaScriptCore/wasm/WasmCodeBlock.h

@@ -99 +99 @@
         RELEASE_ASSERT(functionIndexSpace >= functionImportCount());
         unsigned calleeIndex = functionIndexSpace - functionImportCount();
-        return &m_wasmEntryPoints[calleeIndex];
+        return &m_wasmIndirectCallEntryPoints[calleeIndex];
     }
 
@@ -121 +121 @@
     Vector<RefPtr<Callee>> m_optimizedCallees;
     Vector<RefPtr<Callee>> m_jsCallees;
-    Vector<void*> m_wasmEntryPoints;
+    Vector<void*> m_wasmIndirectCallEntryPoints;
     Vector<TierUpCount> m_tierUpCounts;
     Vector<Vector<UnlinkedWasmToWasmCall>> m_wasmToWasmCallsites;

trunk/Source/JavaScriptCore/wasm/WasmOMGPlan.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -125 +125 @@
     // It's important to make sure we do this before we make any of the code we just compiled visible. If we didn't, we could end up
     // where we are tiering up some function A to A' and we repatch some function B to call A' instead of A. Another CPU could see
-    // the updates to B but still not have reset it's cache of A', which would lead to all kinds of badness.
+    // the updates to B but still not have reset its cache of A', which would lead to all kinds of badness.
     resetInstructionCacheOnAllThreads();
     WTF::storeStoreFence(); // This probably isn't necessary but it's good to be paranoid.
 
-    m_codeBlock->m_wasmEntryPoints[m_functionIndex] = entrypoint;
+    m_codeBlock->m_wasmIndirectCallEntryPoints[m_functionIndex] = entrypoint;
     {
         LockHolder holder(m_codeBlock->m_lock);

trunk/Source/JavaScriptCore/wasm/WasmTierUpCount.h

@@ -34 +34 @@
 namespace JSC { namespace Wasm {
 
-    // This class manages the tier up counts for Wasm binaries. The main interesting thing about
-    // wasm tiering up counts is that the least significant bit indicates if the tier up has already
-    // started. Also, wasm code does not atomically update this count. This is because we
-    // don't care too much if the countdown is slightly off. The tier up trigger is atomic, however,
-    // so tier up will be triggered exactly once.
-    class TierUpCount {
-        WTF_MAKE_NONCOPYABLE(TierUpCount);
-    public:
-        TierUpCount()
-            : m_count(Options::webAssemblyOMGTierUpCount() * 2)
-        {
-        }
+// This class manages the tier up counts for Wasm binaries. The main interesting thing about
+// wasm tiering up counts is that the least significant bit indicates if the tier up has already
+// started. Also, wasm code does not atomically update this count. This is because we
+// don't care too much if the countdown is slightly off. The tier up trigger is atomic, however,
+// so tier up will be triggered exactly once.
+class TierUpCount {
+    WTF_MAKE_NONCOPYABLE(TierUpCount);
+public:
+    TierUpCount()
+        : m_count(Options::webAssemblyOMGTierUpCount() * 2)
+    {
+    }
 
-        TierUpCount(TierUpCount&& other)
-        {
-            ASSERT(other.m_count == Options::webAssemblyOMGTierUpCount() * 2);
-            m_count = other.m_count;
-        }
+    TierUpCount(TierUpCount&& other)
+    {
+        ASSERT(other.m_count == Options::webAssemblyOMGTierUpCount() * 2);
+        m_count = other.m_count;
+    }
 
-        static uint32_t loopDecrement() { return Options::webAssemblyLoopDecrement() * 2; }
-        static uint32_t functionEntryDecrement() { return Options::webAssemblyFunctionEntryDecrement() * 2; }
+    static uint32_t loopDecrement() { return Options::webAssemblyLoopDecrement() * 2; }
+    static uint32_t functionEntryDecrement() { return Options::webAssemblyFunctionEntryDecrement() * 2; }
 
-        bool shouldStartTierUp()
-        {
-            return !(WTF::atomicExchangeOr(&m_count, 1) & 1);
-        }
+    bool shouldStartTierUp()
+    {
+        return !(WTF::atomicExchangeOr(&m_count, 1) & 1);
+    }
 
-        int32_t count() { return bitwise_cast<int32_t>(m_count); }
+    int32_t count() { return bitwise_cast<int32_t>(m_count); }
 
-    private:
-        uint32_t m_count;
-    };
+private:
+    uint32_t m_count;
+};
     
 } } // namespace JSC::Wasm