Changeset 244348 in webkit

Timestamp:

Apr 16, 2019, 11:32:19 AM (7 years ago)

Author:

Kocsen Chung

Message:

Apply patch. rdar://problem/49836497

Location:

tags/Safari-607.2.4.1/Source

Files:

• JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (modified) (4 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) (3 diffs)
• JavaScriptCore/wasm/WasmWorklist.cpp (modified) (2 diffs)
• WebKit/WebProcess/com.apple.WebProcess.sb.in (modified) (2 diffs)

tags/Safari-607.2.4.1/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -1078 +1078 @@
                 5DBB1525131D0BD70056AD36 /* minidom.js in Copy Support Script */ = {isa = PBXBuildFile; fileRef = 1412110D0A48788700480255 /* minidom.js */; };
                 5DE6E5B30E1728EC00180407 /* create_hash_table in Headers */ = {isa = PBXBuildFile; fileRef = F692A8540255597D01FF60F7 /* create_hash_table */; settings = {ATTRIBUTES = (); }; };
-                5E158AC350BC4EC7877DC0F4 /* ObjectPrototypeInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D0CC9E1CBC149AB8F403434 /* ObjectPrototypeInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 623A37EC1B87A7C000754209 /* RegisterMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 623A37EB1B87A7BD00754209 /* RegisterMap.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 627673241B680C1E00FD9F2E /* CallMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 627673221B680C1E00FD9F2E /* CallMode.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -3332 +3331 @@
                 526AC4B51E977C5D003500E1 /* WasmCodeBlock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmCodeBlock.h; sourceTree = "<group>"; };
                 527773DD1AAF83AC00BDE7E8 /* RuntimeType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RuntimeType.cpp; sourceTree = "<group>"; };
+                528D8EBC226156FD00E75699 /* CPU.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CPU.cpp; sourceTree = "<group>"; };
                 52B310FA1974AE610080857C /* FunctionHasExecutedCache.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FunctionHasExecutedCache.h; sourceTree = "<group>"; };
                 52B310FC1974AE870080857C /* FunctionHasExecutedCache.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FunctionHasExecutedCache.cpp; sourceTree = "<group>"; };
@@ -3651 +3651 @@
                 6AD2CB4C19B9140100065719 /* DebuggerEvalEnabler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebuggerEvalEnabler.h; sourceTree = "<group>"; };
                 6BA93C9590484C5BAD9316EA /* JSScriptFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSScriptFetcher.h; sourceTree = "<group>"; };
-                6D0CC9E1CBC149AB8F403434 /* ObjectPrototypeInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectPrototypeInlines.h; sourceTree = "<group>"; };
                 70113D491A8DB093003848C4 /* IteratorOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IteratorOperations.cpp; sourceTree = "<group>"; };
                 70113D4A1A8DB093003848C4 /* IteratorOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IteratorOperations.h; sourceTree = "<group>"; };
@@ -7611 +7610 @@
                                 86E116B00FE75AC800B512BC /* CodeLocation.h */,
                                 0F30D7BF1D95D62F0053089D /* CPU.h */,
+                                528D8EBC226156FD00E75699 /* CPU.cpp */,
                                 0F37308E1C0CD68500052BFA /* DisallowMacroScratchRegisterUsage.h */,
                                 0FF4275615914A20004CB9FF /* LinkBuffer.cpp */,

tags/Safari-607.2.4.1/Source/JavaScriptCore/Sources.txt

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

tags/Safari-607.2.4.1/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
 

tags/Safari-607.2.4.1/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(); }

tags/Safari-607.2.4.1/Source/JavaScriptCore/runtime/JSLock.cpp

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

tags/Safari-607.2.4.1/Source/JavaScriptCore/runtime/Options.cpp

@@ -28 +28 @@
 
 #include "AssemblerCommon.h"
+#include "CPU.h"
 #include "LLIntCommon.h"
 #include "MinimumReservedZoneSize.h"
@@ -205 +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.
@@ -214 +215 @@
 static int32_t computePriorityDeltaOfWorkerThreads(int32_t twoCorePriorityDelta, int32_t multiCorePriorityDelta)
 {
-    if (WTF::numberOfProcessorCores() <= 2)
+    if (kernTCSMAwareNumberOfProcessorCores() <= 2)
         return twoCorePriorityDelta;
 

tags/Safari-607.2.4.1/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);

tags/Safari-607.2.4.1/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in

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