Fixing configuration for use of more than 64 cores

- also fixes NUMA-allocation debug tests for MIC
STEllAR-GROUP · Nov 4, 2015 · aca96e3 · aca96e3
1 parent badff74
commit aca96e3
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -272,12 +272,12 @@ hpx_option(HPX_WITH_MAX_CPU_COUNT STRING
   CATEGORY "Thread Manager" ADVANCED)
 hpx_add_config_define(HPX_HAVE_MAX_CPU_COUNT ${HPX_WITH_MAX_CPU_COUNT})
 
-if(NOT (${HPX_WITH_MAX_CPU_COUNT} LESS 65))
-  set(HPX_WITH_MORE_THAN_64_THREADS_DEFAULT OFF)
-  hpx_option(HPX_WITH_MORE_THAN_64_THREADS BOOL
-    "HPX applications will be able to run on more than 64 cores"
-    ${HPX_WITH_MORE_THAN_64_THREADS_DEFAULT}
-    CATEGORY "Thread Manager" ADVANCED)
+hpx_option(HPX_WITH_MORE_THAN_64_THREADS BOOL
+  "HPX applications will be able to run on more than 64 cores"
+  (NOT (${HPX_WITH_MAX_CPU_COUNT} LESS 65))
+  CATEGORY "Thread Manager" ADVANCED)
+if(HPX_WITH_MORE_THAN_64_THREADS)
+  hpx_add_config_define(HPX_HAVE_MORE_THAN_64_THREADS)
 endif()
 
 hpx_option(HPX_WITH_THREAD_STACK_MMAP BOOL

diff --git a/cmake/templates/config_defines.hpp.in b/cmake/templates/config_defines.hpp.in
@@ -16,8 +16,8 @@
 #define HPX_PREFIX "@HPX_DEFINES_PREFIX@"
 #endif
 @hpx_config_defines@
-#if defined(HPX_HAVE_MAX_CPU_COUNT) && (HPX_HAVE_MAX_CPU_COUNT > 64) && !defined(HPX_WITH_MORE_THAN_64_THREADS)
-#define HPX_WITH_MORE_THAN_64_THREADS
+#if defined(HPX_HAVE_MAX_CPU_COUNT) && (HPX_HAVE_MAX_CPU_COUNT > 64) && !defined(HPX_HAVE_MORE_THAN_64_THREADS)
+#define HPX_HAVE_MORE_THAN_64_THREADS
 #endif
 
 #endif

diff --git a/hpx/config.hpp b/hpx/config.hpp
@@ -487,8 +487,8 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // Make sure we have support for more than 64 threads for Xeon Phi
-#if defined(__MIC__) && !defined(HPX_WITH_MORE_THAN_64_THREADS)
-#  define HPX_WITH_MORE_THAN_64_THREADS
+#if defined(__MIC__) && !defined(HPX_HAVE_MORE_THAN_64_THREADS)
+#  define HPX_HAVE_MORE_THAN_64_THREADS
 #endif
 #if defined(__MIC__) && !defined(HPX_HAVE_MAX_CPU_COUNT)
 #  define HPX_HAVE_MAX_CPU_COUNT 256

diff --git a/hpx/parallel/util/numa_allocator.hpp b/hpx/parallel/util/numa_allocator.hpp
@@ -14,6 +14,7 @@
 #include <hpx/parallel/algorithms/for_each.hpp>
 #include <hpx/parallel/executors/executor_information_traits.hpp>
 #include <hpx/parallel/executors/static_chunk_size.hpp>
+#include <hpx/util/assert.hpp>
 
 #include <cstddef>
 #include <vector>
@@ -107,7 +108,10 @@ namespace hpx { namespace parallel { namespace util
                             hpx::threads::mask_cref_type thread_mask =
                                 traits::get_pu_mask(executors_[i], topo_, thread_num);
 
-                            HPX_ASSERT(mem_mask & thread_mask);
+                            HPX_ASSERT(threads::mask_size(mem_mask) ==
+                                threads::mask_size(thread_mask));
+                            HPX_ASSERT(threads::bit_and(mem_mask, thread_mask,
+                                threads::mask_size(mem_mask)));
 #endif
                         })
                 );

diff --git a/hpx/runtime/threads/policies/local_priority_queue_scheduler.hpp b/hpx/runtime/threads/policies/local_priority_queue_scheduler.hpp
@@ -125,7 +125,7 @@ namespace hpx { namespace threads { namespace policies
             steals_in_numa_domain_(),
             steals_outside_numa_domain_(),
 #endif
-#if !defined(HPX_WITH_MORE_THAN_64_THREADS) || defined(HPX_HAVE_MAX_CPU_COUNT)
+#if !defined(HPX_HAVE_MORE_THAN_64_THREADS) || defined(HPX_HAVE_MAX_CPU_COUNT)
             numa_domain_masks_(init.num_queues_),
             outside_numa_domain_masks_(init.num_queues_)
 #else

diff --git a/hpx/runtime/threads/policies/local_queue_scheduler.hpp b/hpx/runtime/threads/policies/local_queue_scheduler.hpp
@@ -113,7 +113,7 @@ namespace hpx { namespace threads { namespace policies
             steals_in_numa_domain_(),
             steals_outside_numa_domain_(),
 #endif
-#if !defined(HPX_WITH_MORE_THAN_64_THREADS) || defined(HPX_HAVE_MAX_CPU_COUNT)
+#if !defined(HPX_HAVE_MORE_THAN_64_THREADS) || defined(HPX_HAVE_MAX_CPU_COUNT)
             numa_domain_masks_(init.num_queues_),
             outside_numa_domain_masks_(init.num_queues_)
 #else

diff --git a/hpx/runtime/threads/topology.hpp b/hpx/runtime/threads/topology.hpp
@@ -21,15 +21,15 @@
 #include <vector>
 #include <iosfwd>
 #include <limits>
-#if defined(HPX_WITH_MORE_THAN_64_THREADS) || (defined(HPX_HAVE_MAX_CPU_COUNT) \
+#if defined(HPX_HAVE_MORE_THAN_64_THREADS) || (defined(HPX_HAVE_MAX_CPU_COUNT) \
             && HPX_HAVE_MAX_CPU_COUNT > 64)
 #include <bitset>
 #endif
 
 namespace hpx { namespace threads
 {
     /// \cond NOINTERNAL
-#if !defined(HPX_WITH_MORE_THAN_64_THREADS) || (defined(HPX_HAVE_MAX_CPU_COUNT) \
+#if !defined(HPX_HAVE_MORE_THAN_64_THREADS) || (defined(HPX_HAVE_MAX_CPU_COUNT) \
              && HPX_HAVE_MAX_CPU_COUNT <= 64)
     typedef boost::uint64_t mask_type;
     typedef boost::uint64_t mask_cref_type;
@@ -92,6 +92,18 @@ namespace hpx { namespace threads
         return lhs == rhs;
     }
 
+    // return true if at least one of the masks has a bit set
+    inline bool bit_or(mask_cref_type lhs, mask_cref_type rhs, std::size_t)
+    {
+        return lhs | rhs;
+    }
+
+    // return true if at least one bit is set in both masks
+    inline bool bit_and(mask_cref_type lhs, mask_cref_type rhs, std::size_t)
+    {
+        return lhs & rhs;
+    }
+
 #define HPX_CPU_MASK_PREFIX "0x"
 
 #else
@@ -171,6 +183,32 @@ namespace hpx { namespace threads
         }
         return true;
     }
+
+    // return true if at least one of the masks has a bit set
+    inline bool bit_or(mask_cref_type lhs, mask_cref_type rhs, std::size_t numbits)
+    {
+        for (std::size_t j = 0; j != numbits; ++j)
+        {
+            if (test(lhs, j) || test(rhs, j))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    // return true if at least one bit is set in both masks
+    inline bool bit_and(mask_cref_type lhs, mask_cref_type rhs, std::size_t numbits)
+    {
+        for (std::size_t j = 0; j != numbits; ++j)
+        {
+            if (test(lhs, j) && test(rhs, j))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
 #endif
     /// \endcond
 

diff --git a/src/runtime/threads/detail/thread_pool.cpp b/src/runtime/threads/detail/thread_pool.cpp
@@ -331,7 +331,7 @@ namespace hpx { namespace threads { namespace detail
                     << "thread_pool::run: " << pool_name_
                     << " create OS thread " << thread_num //-V128
                     << ": will run on processing units within this mask: "
-#if !defined(HPX_WITH_MORE_THAN_64_THREADS) || \
+#if !defined(HPX_HAVE_MORE_THAN_64_THREADS) || \
     (defined(HPX_HAVE_MAX_CPU_COUNT) && HPX_HAVE_MAX_CPU_COUNT <= 64)
                     << std::hex << "0x" << mask;
 #else

diff --git a/tests/performance/local/stream.cpp b/tests/performance/local/stream.cpp
@@ -246,7 +246,10 @@ numa_domain_worker(std::size_t domain,
             hpx::threads::mask_cref_type thread_mask =
                 traits::get_pu_mask(policy.executor(), topo, thread_num);
 
-            HPX_ASSERT(mem_mask & thread_mask);
+            HPX_ASSERT(hpx::threads::mask_size(mem_mask) ==
+                hpx::threads::mask_size(thread_mask));
+            HPX_ASSERT(hpx::threads::bit_and(mem_mask, thread_mask,
+                hpx::threads::mask_size(mem_mask)));
 #endif
         });
     t = 1.0E6 * (mysecond() - t);