Only apply cpu pinning when the threadpool is used (i.e. headless and…

… legacy only)
beyond-all-reason · Feb 14, 2025 · a1e6d64 · a1e6d64
1 parent a541d6d
commit a1e6d64
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/rts/System/Platform/Threading.cpp b/rts/System/Platform/Threading.cpp
@@ -128,7 +128,13 @@ namespace Threading {
 		//
 		// This doesn't preclude systems from using separate unpinned threads, which the OS should logically try to
 		// move to under used resources, such as low-power cores for example.
-		return pm.performanceCoreMask & (~pm.hyperThreadHighMask);
+		#if defined(THREADPOOL)
+		uint32_t policy = pm.performanceCoreMask & (~pm.hyperThreadHighMask);
+		#else
+		uint32_t policy = pm.performanceCoreMask | pm.efficiencyCoreMask;
+		#endif
+
+		return policy;
 	}
 
 	std::uint32_t GetAffinity()

diff --git a/rts/System/Threading/ThreadPool.cpp b/rts/System/Threading/ThreadPool.cpp
@@ -585,6 +585,9 @@ void SetMaximumThreadCount()
 
 void SetDefaultThreadCount()
 {
+	#if !defined(THREADPOOL)
+	return;
+	#endif
 	std::uint32_t systemCores = Threading::GetSystemAffinityMask();
 	std::uint32_t mainAffinity = systemCores;