Cycles: Add support of processor groups

Currently for windows only, this is an initial commit towards native
support of NUMA.

Current commit makes it so Cycles will use all logical processors on
Windows running on system with more than 64 threads.

Reviewers: juicyfruit, dingto, lukasstockner97, maiself, brecht

Subscribers: LazyDodo

Differential Revision: https://developer.blender.org/D2049

1 files changed, 42 insertions, 11 deletions

diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp
index 4ff0ee91d73..16f713e1ea6 100644
--- a/intern/cycles/util/util_system.cpp
+++ b/intern/cycles/util/util_system.cpp
@@ -15,7 +15,9 @@
  */
 
 #include "util_system.h"
+
 #include "util_debug.h"
+#include "util_logging.h"
 #include "util_types.h"
 #include "util_string.h"
 
@@ -33,28 +35,57 @@
 
 CCL_NAMESPACE_BEGIN
 
-int system_cpu_thread_count()
+int system_cpu_group_count()
 {
-	static uint count = 0;
-
-	if(count > 0)
-		return count;
+#ifdef _WIN32
+	util_windows_init_numa_groups();
+	return GetActiveProcessorGroupCount();
+#else
+	/* TODO(sergey): Need to adopt for other platforms. */
+	return 1;
+#endif
+}
 
+int system_cpu_group_thread_count(int group)
+{
+	/* TODO(sergey): Need make other platforms aware of groups. */
 #ifdef _WIN32
-	SYSTEM_INFO info;
-	GetSystemInfo(&info);
-	count = (uint)info.dwNumberOfProcessors;
+	util_windows_init_numa_groups();
+	return GetActiveProcessorCount(group);
 #elif defined(__APPLE__)
+	(void)group;
 	size_t len = sizeof(count);
 	int mib[2] = { CTL_HW, HW_NCPU };
-	
+
+	int count;
 	sysctl(mib, 2, &count, &len, NULL, 0);
+	return count;
 #else
-	count = (uint)sysconf(_SC_NPROCESSORS_ONLN);
+	(void)group;
+	return sysconf(_SC_NPROCESSORS_ONLN);
 #endif
+}
+
+int system_cpu_thread_count()
+{
+	static uint count = 0;
 
-	if(count < 1)
+	if(count > 0) {
+		return count;
+	}
+
+	int max_group = system_cpu_group_count();
+	VLOG(1) << "Detected " << max_group << " CPU groups.";
+	for(int group = 0; group < max_group; ++group) {
+		int num_threads = system_cpu_group_thread_count(group);
+		VLOG(1) << "Group " << group
+		        << " has " << num_threads << " threads.";
+		count += num_threads;
+	}
+
+	if(count < 1) {
 		count = 1;
+	}
 
 	return count;
 }