[Boost-commit] svn:boost r86597 - trunk/boost/multi_index/detail

Subject: [Boost-commit] svn:boost r86597 - trunk/boost/multi_index/detail
From: joaquin_at_[hidden]
Date: 2013-11-09 07:02:36

Author: joaquin
Date: 2013-11-09 07:02:36 EST (Sat, 09 Nov 2013)
New Revision: 86597
URL: http://svn.boost.org/trac/boost/changeset/86597

Log:
accelerated hash->bucket mapping

Text files modified: 
   trunk/boost/multi_index/detail/bucket_array.hpp |   134 ++++++++++++++++++++++++++------------- 
   1 files changed, 88 insertions(+), 46 deletions(-)

Modified: trunk/boost/multi_index/detail/bucket_array.hpp
==============================================================================
--- trunk/boost/multi_index/detail/bucket_array.hpp	Sat Nov  9 06:52:56 2013	(r86596)
+++ trunk/boost/multi_index/detail/bucket_array.hpp	2013-11-09 07:02:36 EST (Sat, 09 Nov 2013)	(r86597)
@@ -18,6 +18,10 @@
 #include <boost/multi_index/detail/auto_space.hpp>
 #include <boost/multi_index/detail/hash_index_node.hpp>
 #include <boost/noncopyable.hpp>
+#include <boost/preprocessor/repetition/repeat.hpp>
+#include <boost/preprocessor/seq/elem.hpp>
+#include <boost/preprocessor/seq/enum.hpp>
+#include <boost/preprocessor/seq/size.hpp>
 #include <cstddef>
 #include <limits.h>
 
@@ -35,55 +39,93 @@
 
 /* bucket structure for use by hashed indices */
 
+#define BOOST_MULTI_INDEX_BA_SIZES_32BIT                                  \
+(53ul)(97ul)(193ul)(389ul)(769ul)                                         \
+(1543ul)(3079ul)(6151ul)(12289ul)(24593ul)                                \
+(49157ul)(98317ul)(196613ul)(393241ul)(786433ul)                          \
+(1572869ul)(3145739ul)(6291469ul)(12582917ul)(25165843ul)                 \
+(50331653ul)(100663319ul)(201326611ul)(402653189ul)(805306457ul)          \
+(1610612741ul)(3221225473ul)
+
+#if ((((ULONG_MAX>>16)>>16)>>16)>>15)==0 /* unsigned long less than 64 bits */
+#define BOOST_MULTI_INDEX_BA_SIZES                                         \
+BOOST_MULTI_INDEX_BA_SIZES_32BIT                                           \
+(4294967291ul)
+#else
+  /* obtained with aid from
+   *   http://javaboutique.internet.com/prime_numb/
+   *   http://www.rsok.com/~jrm/next_ten_primes.html
+   * and verified with
+   *   http://www.alpertron.com.ar/ECM.HTM
+   */
+
+#define BOOST_MULTI_INDEX_BA_SIZES                                         \
+BOOST_MULTI_INDEX_BA_SIZES_32BIT                                           \
+(6442450939ul)(12884901893ul)(25769803751ul)(51539607551ul)                \
+(103079215111ul)(206158430209ul)(412316860441ul)(824633720831ul)           \
+(1649267441651ul)(3298534883309ul)(6597069766657ul)(13194139533299ul)      \
+(26388279066623ul)(52776558133303ul)(105553116266489ul)(211106232532969ul) \
+(422212465066001ul)(844424930131963ul)(1688849860263953ul)                 \
+(3377699720527861ul)(6755399441055731ul)(13510798882111483ul)              \
+(27021597764222939ul)(54043195528445957ul)(108086391056891903ul)           \
+(216172782113783843ul)(432345564227567621ul)(864691128455135207ul)         \
+(1729382256910270481ul)(3458764513820540933ul)(6917529027641081903ul)      \
+(13835058055282163729ul)(18446744073709551557ul)
+#endif
+
+template<bool _=true> /* templatized to have in-header static var defs */
 class bucket_array_base:private noncopyable
 {
 protected:
-  inline static std::size_t next_prime(std::size_t n)
+  static const std::size_t sizes[];
+
+  static std::size_t size_index(std::size_t n)
   {
-    static const std::size_t prime_list[]={
-      53ul, 97ul, 193ul, 389ul, 769ul,
-      1543ul, 3079ul, 6151ul, 12289ul, 24593ul,
-      49157ul, 98317ul, 196613ul, 393241ul, 786433ul,
-      1572869ul, 3145739ul, 6291469ul, 12582917ul, 25165843ul,
-      50331653ul, 100663319ul, 201326611ul, 402653189ul, 805306457ul,
-      1610612741ul, 3221225473ul,
+    const std::size_t *bound=std::lower_bound(sizes,sizes+sizes_length,n);
+    if(bound==sizes+sizes_length)bound--;
+    return bound-sizes;
+  }
 
-#if ((((ULONG_MAX>>16)>>16)>>16)>>15)==0 /* unsigned long less than 64 bits */
-      4294967291ul
-#else
-      /* obtained with aid from
-       *   http://javaboutique.internet.com/prime_numb/
-       *   http://www.rsok.com/~jrm/next_ten_primes.html
-       * and verified with
-       *   http://www.alpertron.com.ar/ECM.HTM
-       */
-
-      6442450939ul, 12884901893ul, 25769803751ul, 51539607551ul,
-      103079215111ul, 206158430209ul, 412316860441ul, 824633720831ul,
-      1649267441651ul, 3298534883309ul, 6597069766657ul, 13194139533299ul,
-      26388279066623ul, 52776558133303ul, 105553116266489ul, 211106232532969ul,
-      422212465066001ul, 844424930131963ul, 1688849860263953ul,
-      3377699720527861ul, 6755399441055731ul, 13510798882111483ul,
-      27021597764222939ul, 54043195528445957ul, 108086391056891903ul,
-      216172782113783843ul, 432345564227567621ul, 864691128455135207ul,
-      1729382256910270481ul, 3458764513820540933ul, 6917529027641081903ul,
-      13835058055282163729ul, 18446744073709551557ul
-#endif
-
-    };
-    static const std::size_t prime_list_size=
-      sizeof(prime_list)/sizeof(prime_list[0]);
-
-    std::size_t const *bound=
-      std::lower_bound(prime_list,prime_list+prime_list_size,n);
-    if(bound==prime_list+prime_list_size)bound--;
-    return *bound;
+#define BOOST_MULTI_INDEX_BA_POSITION_CASE(z,n,_)                    \
+  case n:return hash%BOOST_PP_SEQ_ELEM(n,BOOST_MULTI_INDEX_BA_SIZES);
+
+  static std::size_t position(std::size_t hash,std::size_t size_index_)
+  {
+    /* Accelerate hash%sizes[size_index_] by replacing with a switch on
+     * hash%Ci expressions, each Ci a compile-time constant, which the
+     * compiler can implement without using integer division.
+     */
+
+    switch(size_index_){
+      default: /* never used */
+      BOOST_PP_REPEAT(
+        BOOST_PP_SEQ_SIZE(BOOST_MULTI_INDEX_BA_SIZES),
+        BOOST_MULTI_INDEX_BA_POSITION_CASE,~)
+    }
   }
+
+private:
+  static const std::size_t sizes_length;
+};
+
+template<>
+const std::size_t bucket_array_base<true>::sizes[]={
+  BOOST_PP_SEQ_ENUM(BOOST_MULTI_INDEX_BA_SIZES)
 };
 
+template<>
+const std::size_t bucket_array_base<true>::sizes_length=
+  sizeof(bucket_array_base<true>::sizes)/
+  sizeof(bucket_array_base<true>::sizes[0]);
+
+#undef BOOST_MULTI_INDEX_BA_POSITION_CASE
+#undef BOOST_MULTI_INDEX_BA_SIZES
+#undef BOOST_MULTI_INDEX_BA_SIZES_32BIT
+
 template<typename Allocator>
-class bucket_array:public bucket_array_base
+class bucket_array:bucket_array_base<>
 {
+  typedef bucket_array_base<>                        super;
   typedef hashed_index_base_node_impl<
     typename boost::detail::allocator::rebind_to<
       Allocator,
@@ -96,24 +138,24 @@
   typedef typename base_node_impl_type::pointer      pointer;
 
   bucket_array(const Allocator& al,pointer end_,std::size_t size):
-    size_(bucket_array_base::next_prime(size)),
-    spc(al,size_+1)
+    size_index_(super::size_index(size)),
+    spc(al,super::sizes[size_index_]+1)
   {
     clear(end_);
   }
 
   std::size_t size()const
   {
-    return size_;
+    return super::sizes[size_index_];
   }
 
   std::size_t position(std::size_t hash)const
   {
-    return hash%size_;
+    return super::position(hash,size_index_);
   }
 
   base_pointer begin()const{return buckets();}
-  base_pointer end()const{return buckets()+size_;}
+  base_pointer end()const{return buckets()+size();}
   base_pointer at(std::size_t n)const{return buckets()+n;}
 
   void clear(pointer end_)
@@ -125,12 +167,12 @@
 
   void swap(bucket_array& x)
   {
-    std::swap(size_,x.size_);
+    std::swap(size_index_,x.size_index_);
     spc.swap(x.spc);
   }
 
 private:
-  std::size_t                               size_;
+  std::size_t                               size_index_;
   auto_space<base_node_impl_type,Allocator> spc;
 
   base_pointer buckets()const