Changeset 244233 in webkit

Timestamp:

Apr 12, 2019, 4:26:43 PM (7 years ago)

Author:

sbarati@apple.com

Message:

Sometimes we need to user fewer CPUs in our threading calculations
​https://bugs.webkit.org/show_bug.cgi?id=196794
<rdar://problem/49389497>

Reviewed by Yusuke Suzuki.

Source/JavaScriptCore:

• JavaScriptCore.xcodeproj/project.pbxproj:
• Sources.txt:
• assembler/CPU.cpp: Added.

(JSC::isKernTCSMAvailable):
(JSC::enableKernTCSM):
(JSC::kernTCSMAwareNumberOfProcessorCores):

• assembler/CPU.h:

(JSC::isKernTCSMAvailable):
(JSC::enableKernTCSM):
(JSC::kernTCSMAwareNumberOfProcessorCores):

• heap/MachineStackMarker.h:

(JSC::MachineThreads::addCurrentThread):

• runtime/JSLock.cpp:

(JSC::JSLock::didAcquireLock):

• runtime/Options.cpp:

(JSC::computeNumberOfWorkerThreads):
(JSC::computePriorityDeltaOfWorkerThreads):

• wasm/WasmWorklist.cpp:

(JSC::Wasm::Worklist::Worklist):

Source/WebKit:

• WebProcess/com.apple.WebProcess.sb.in:

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• JavaScriptCore/Sources.txt (modified) (1 diff)
• JavaScriptCore/assembler/CPU.cpp (added)
• JavaScriptCore/assembler/CPU.h (modified) (2 diffs)
• JavaScriptCore/heap/MachineStackMarker.h (modified) (1 diff)
• JavaScriptCore/runtime/JSLock.cpp (modified) (1 diff)
• JavaScriptCore/runtime/Options.cpp (modified) (2 diffs)
• JavaScriptCore/wasm/WasmWorklist.cpp (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/com.apple.WebProcess.sb.in (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-04-12  Saam barati  <sbarati@apple.com>
+
+        Sometimes we need to user fewer CPUs in our threading calculations
+        https://bugs.webkit.org/show_bug.cgi?id=196794
+        <rdar://problem/49389497>
+
+        Reviewed by Yusuke Suzuki.
+
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * Sources.txt:
+        * assembler/CPU.cpp: Added.
+        (JSC::isKernTCSMAvailable):
+        (JSC::enableKernTCSM):
+        (JSC::kernTCSMAwareNumberOfProcessorCores):
+        * assembler/CPU.h:
+        (JSC::isKernTCSMAvailable):
+        (JSC::enableKernTCSM):
+        (JSC::kernTCSMAwareNumberOfProcessorCores):
+        * heap/MachineStackMarker.h:
+        (JSC::MachineThreads::addCurrentThread):
+        * runtime/JSLock.cpp:
+        (JSC::JSLock::didAcquireLock):
+        * runtime/Options.cpp:
+        (JSC::computeNumberOfWorkerThreads):
+        (JSC::computePriorityDeltaOfWorkerThreads):
+        * wasm/WasmWorklist.cpp:
+        (JSC::Wasm::Worklist::Worklist):
+
 2019-04-12  Robin Morisset  <rmorisset@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -3393 +3393 @@
                 521322431ECBCE8200F65615 /* WebAssemblyFunctionBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebAssemblyFunctionBase.cpp; path = js/WebAssemblyFunctionBase.cpp; sourceTree = "<group>"; };
                 521322441ECBCE8200F65615 /* WebAssemblyFunctionBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebAssemblyFunctionBase.h; path = js/WebAssemblyFunctionBase.h; sourceTree = "<group>"; };
+                52335628225EB8E900268BD2 /* CPU.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CPU.cpp; sourceTree = "<group>"; };
                 523FD88C225566C3003B3DCC /* WebAssemblyFunctionHeapCellType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WebAssemblyFunctionHeapCellType.h; path = js/WebAssemblyFunctionHeapCellType.h; sourceTree = "<group>"; };
                 523FD88D225566C4003B3DCC /* WebAssemblyFunctionHeapCellType.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WebAssemblyFunctionHeapCellType.cpp; path = js/WebAssemblyFunctionHeapCellType.cpp; sourceTree = "<group>"; };
@@ -7799 +7800 @@
                                 86E116B00FE75AC800B512BC /* CodeLocation.h */,
                                 0F30D7BF1D95D62F0053089D /* CPU.h */,
+                                52335628225EB8E900268BD2 /* CPU.cpp */,
                                 0F37308E1C0CD68500052BFA /* DisallowMacroScratchRegisterUsage.h */,
                                 0FF4275615914A20004CB9FF /* LinkBuffer.cpp */,

trunk/Source/JavaScriptCore/Sources.txt

@@ -44 +44 @@
 
 assembler/AbstractMacroAssembler.cpp
+assembler/CPU.cpp
 assembler/LinkBuffer.cpp
 assembler/MacroAssembler.cpp

trunk/Source/JavaScriptCore/assembler/CPU.h

@@ -27 +27 @@
 
 #include "Options.h"
+#include <wtf/NumberOfCores.h>
 
 namespace JSC {
@@ -132 +133 @@
 }
 
+#if (CPU(X86) || CPU(X86_64)) && OS(DARWIN)
+bool isKernTCSMAvailable();
+bool enableKernTCSM();
+int kernTCSMAwareNumberOfProcessorCores();
+#else
+ALWAYS_INLINE bool isKernTCSMAvailable() { return false; }
+ALWAYS_INLINE bool enableKernTCSM() { return false; }
+ALWAYS_INLINE int kernTCSMAwareNumberOfProcessorCores() { return WTF::numberOfProcessorCores(); }
+#endif
+
 } // namespace JSC
 

trunk/Source/JavaScriptCore/heap/MachineStackMarker.h

@@ -49 +49 @@
 
     // Only needs to be called by clients that can use the same heap from multiple threads.
-    void addCurrentThread() { m_threadGroup->addCurrentThread(); }
+    bool addCurrentThread() { return m_threadGroup->addCurrentThread() == ThreadGroupAddResult::NewlyAdded; }
 
     WordLock& getLock() { return m_threadGroup->getLock(); }

trunk/Source/JavaScriptCore/runtime/JSLock.cpp

@@ -149 +149 @@
     m_vm->setStackPointerAtVMEntry(p);
 
-    m_vm->heap.machineThreads().addCurrentThread();
+    if (m_vm->heap.machineThreads().addCurrentThread()) {
+        if (isKernTCSMAvailable())
+            enableKernTCSM();
+    }
+
 #if ENABLE(WEBASSEMBLY)
     if (Wasm::isSupported())

trunk/Source/JavaScriptCore/runtime/Options.cpp

@@ -206 +206 @@
 static unsigned computeNumberOfWorkerThreads(int maxNumberOfWorkerThreads, int minimum = 1)
 {
-    int cpusToUse = std::min(WTF::numberOfProcessorCores(), maxNumberOfWorkerThreads);
+    int cpusToUse = std::min(kernTCSMAwareNumberOfProcessorCores(), maxNumberOfWorkerThreads);
 
     // Be paranoid, it is the OS we're dealing with, after all.
@@ -215 +215 @@
 static int32_t computePriorityDeltaOfWorkerThreads(int32_t twoCorePriorityDelta, int32_t multiCorePriorityDelta)
 {
-    if (WTF::numberOfProcessorCores() <= 2)
+    if (kernTCSMAwareNumberOfProcessorCores() <= 2)
         return twoCorePriorityDelta;
 

trunk/Source/JavaScriptCore/wasm/WasmWorklist.cpp

@@ -29 +29 @@
 #if ENABLE(WEBASSEMBLY)
 
+#include "CPU.h"
 #include "WasmPlan.h"
-
-#include <wtf/NumberOfCores.h>
 
 namespace JSC { namespace Wasm {
@@ -208 +207 @@
     , m_planEnqueued(AutomaticThreadCondition::create())
 {
-    unsigned numberOfCompilationThreads = Options::useConcurrentJIT() ? WTF::numberOfProcessorCores() : 1;
+    unsigned numberOfCompilationThreads = Options::useConcurrentJIT() ? kernTCSMAwareNumberOfProcessorCores() : 1;
     m_threads.reserveCapacity(numberOfCompilationThreads);
     LockHolder locker(*m_lock);

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-12  Saam barati  <sbarati@apple.com>
+
+        Sometimes we need to user fewer CPUs in our threading calculations
+        https://bugs.webkit.org/show_bug.cgi?id=196794
+        <rdar://problem/49389497>
+
+        Reviewed by Yusuke Suzuki.
+
+        * WebProcess/com.apple.WebProcess.sb.in:
+
 2019-04-12  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in

@@ -173 +173 @@
         "machdep.cpu.brand_string"
         "security.mac.sandbox.sentinel"
+        "kern.tcsm_enable"
+        "kern.tcsm_available"
         "vm.footprint_suspend")
     (sysctl-name-regex #"^hw.(active|avail)cpu")
@@ -182 +184 @@
     (sysctl-name-regex #"^net.routetable")
 )
+
+(allow sysctl-write
+    (sysctl-name
+        "kern.tcsm_enable"))
 
 (deny iokit-get-properties)