From a3fa0b6b1cd4aaf8366046d561e20ebc548d5c6c Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Mon, 19 Dec 2016 00:30:48 -0800
Subject: [PATCH] client (Win): if ncpus < physical ncpus, use every other core
 in benchmarks

---
 client/cs_benchmark.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/cs_benchmark.cpp b/client/cs_benchmark.cpp
index f185df4e6d..7258f1e6cb 100644
--- a/client/cs_benchmark.cpp
+++ b/client/cs_benchmark.cpp
@@ -276,7 +276,9 @@ void CLIENT_STATE::start_cpu_benchmarks() {
             NULL, 0, win_cpu_benchmarks, benchmark_descs+i, 0,
             &benchmark_descs[i].pid
         );
-        SetThreadAffinityMask(benchmark_descs[i].handle, 1<<i);
+        int n = host.p_ncpus;
+        j = (i >= n/2)? 2*i+1 : 2*i;
+        SetThreadAffinityMask(benchmark_descs[i].handle, 1<<j);
         SetThreadPriority(benchmark_descs[i].handle, THREAD_PRIORITY_IDLE);
 #else
         sprintf(benchmark_descs[i].filename, "%s_%d.xml", CPU_BENCHMARKS_FILE_NAME, i);