From: khizmax Date: Wed, 15 Mar 2017 20:52:55 +0000 (+0300) Subject: Added several bit reversal algo X-Git-Tag: v2.3.0~98 X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=commitdiff_plain;h=025b835c15a1d04768cf512dc4555f574ae7343c Added several bit reversal algo Added option to select bit reversal algorithm for SplitList-based containers --- diff --git a/cds/algo/bit_reversal.h b/cds/algo/bit_reversal.h new file mode 100644 index 00000000..ca9bcf7d --- /dev/null +++ b/cds/algo/bit_reversal.h @@ -0,0 +1,184 @@ +/* + This file is a part of libcds - Concurrent Data Structures library + + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017 + + Source code repo: http://github.com/khizmax/libcds/ + Download: http://sourceforge.net/projects/libcds/files/ + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef CDSLIB_ALGO_BIT_REVERSAL_H +#define CDSLIB_ALGO_BIT_REVERSAL_H + +#include + + // Source: http://stackoverflow.com/questions/746171/best-algorithm-for-bit-reversal-from-msb-lsb-to-lsb-msb-in-c +namespace cds { namespace algo { + + /// Bit reversal algorithms + namespace bit_reversal { + + /// SWAR algorithm (source: http://aggregate.org/MAGIC/#Bit%20Reversal) + struct swar { + /// 32bit + uint32_t operator()( uint32_t x ) const + { + x = ( ( ( x & 0xaaaaaaaa ) >> 1 ) | ( ( x & 0x55555555 ) << 1 ) ); + x = ( ( ( x & 0xcccccccc ) >> 2 ) | ( ( x & 0x33333333 ) << 2 ) ); + x = ( ( ( x & 0xf0f0f0f0 ) >> 4 ) | ( ( x & 0x0f0f0f0f ) << 4 ) ); + x = ( ( ( x & 0xff00ff00 ) >> 8 ) | ( ( x & 0x00ff00ff ) << 8 ) ); + return( ( x >> 16 ) | ( x << 16 ) ); + } + + /// 64bit + uint64_t operator()( uint64_t x ) const + { + return ( static_cast( operator()( static_cast( x ) ) ) << 32 ) // low 32bit + | ( static_cast( operator()( static_cast( x >> 32 ) ) ) ); // high 32bit + } + }; + + /// Lookup table algorithm + struct lookup { + /// 32bit + uint32_t operator()( uint32_t x ) const + { + static uint8_t const table[] = { + 0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0, 0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0, + 0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8, 0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8, + 0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4, 0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4, + 0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC, 0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC, + 0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2, 0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2, + 0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA, 0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA, + 0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6, 0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6, + 0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE, 0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE, + 0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1, 0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1, + 0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9, 0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9, + 0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5, 0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5, + 0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED, 0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD, + 0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3, 0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3, + 0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB, 0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB, + 0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7, 0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7, + 0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF, 0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF + }; + static_assert( sizeof( table ) / sizeof( table[0] ) == 256, "Table size mismatch" ); + + return ( static_cast( table[x & 0xff] ) << 24 ) | + ( static_cast( table[( x >> 8 ) & 0xff] ) << 16 ) | + ( static_cast( table[( x >> 16 ) & 0xff] ) << 8 ) | + ( static_cast( table[( x >> 24 ) & 0xff] ) ); + } + + /// 64bit + uint64_t operator()( uint64_t x ) const + { + return ( static_cast( operator()( static_cast( x ) ) ) << 32 ) | + static_cast( operator()( static_cast( x >> 32 ) ) ); + } + }; + + + /// Mul-Div algorithm for 32bit architectire + + /// Mul-Div algorithm + struct muldiv { + //@cond + static uint8_t muldiv32_byte( uint8_t b ) + { + return static_cast( ( ( b * 0x0802LU & 0x22110LU ) | ( b * 0x8020LU & 0x88440LU ) ) * 0x10101LU >> 16 ); + } + + static uint8_t muldiv64_byte( uint8_t b ) + { + return static_cast( ( b * 0x0202020202ULL & 0x010884422010ULL ) % 1023 ); + } + + // for 32bit architecture + static uint32_t muldiv32( uint32_t x ) + { + return static_cast( muldiv32_byte( static_cast( x >> 24 ) ) ) + | ( static_cast( muldiv32_byte( static_cast( x >> 16 ) ) ) << 8 ) + | ( static_cast( muldiv32_byte( static_cast( x >> 8 ) ) ) << 16 ) + | ( static_cast( muldiv32_byte( static_cast( x ) ) ) << 24 ); + } + + static uint64_t muldiv32( uint64_t x ) + { + return static_cast( muldiv32_byte( static_cast( x >> 56 ) ) ) + | ( static_cast( muldiv32_byte( static_cast( x >> 48 ) ) ) << 8 ) + | ( static_cast( muldiv32_byte( static_cast( x >> 40 ) ) ) << 16 ) + | ( static_cast( muldiv32_byte( static_cast( x >> 32 ) ) ) << 24 ) + | ( static_cast( muldiv32_byte( static_cast( x >> 24 ) ) ) << 32 ) + | ( static_cast( muldiv32_byte( static_cast( x >> 16 ) ) ) << 40 ) + | ( static_cast( muldiv32_byte( static_cast( x >> 8 ) ) ) << 48 ) + | ( static_cast( muldiv32_byte( static_cast( x ) ) ) << 56 ); + } + + /// for 64bit architectire + static uint32_t muldiv64( uint32_t x ) + { + return static_cast( muldiv64_byte( static_cast( x >> 24 ) ) ) + | ( static_cast( muldiv64_byte( static_cast( x >> 16 ) ) ) << 8 ) + | ( static_cast( muldiv64_byte( static_cast( x >> 8 ) ) ) << 16 ) + | ( static_cast( muldiv64_byte( static_cast( x ) ) ) << 24 ); + } + + static uint64_t muldiv64( uint64_t x ) + { + return static_cast( muldiv64_byte( static_cast( x >> 56 ) ) ) + | ( static_cast( muldiv64_byte( static_cast( x >> 48 ) ) ) << 8 ) + | ( static_cast( muldiv64_byte( static_cast( x >> 40 ) ) ) << 16 ) + | ( static_cast( muldiv64_byte( static_cast( x >> 32 ) ) ) << 24 ) + | ( static_cast( muldiv64_byte( static_cast( x >> 24 ) ) ) << 32 ) + | ( static_cast( muldiv64_byte( static_cast( x >> 16 ) ) ) << 40 ) + | ( static_cast( muldiv64_byte( static_cast( x >> 8 ) ) ) << 48 ) + | ( static_cast( muldiv64_byte( static_cast( x ) ) ) << 56 ); + } + //@endcond + + /// 32bit + uint32_t operator()( uint32_t x ) const + { +# if CDS_BUILD_BITS == 32 + return muldiv32( x ); +# else + return muldiv64( x ); +# endif + } + + /// 64bit + uint64_t operator()( uint64_t x ) const + { +# if CDS_BUILD_BITS == 32 + return muldiv32( x ); +# else + return muldiv64( x ); +# endif + } + }; + + } // namespace bit_reversal +}} // namespace cds::algo + +#endif // #ifndef CDSLIB_ALGO_BIT_REVERSAL_H diff --git a/cds/container/details/split_list_base.h b/cds/container/details/split_list_base.h index f37a3298..852b158b 100644 --- a/cds/container/details/split_list_base.h +++ b/cds/container/details/split_list_base.h @@ -53,6 +53,10 @@ namespace cds { namespace container { template using dynamic_bucket_table = cds::intrusive::split_list::dynamic_bucket_table; + /// @copydoc cds::intrusive::split_list::bit_reversal + template + using bit_reversal = cds::intrusive::split_list::bit_reversal; + using cds::intrusive::split_list::static_bucket_table; using cds::intrusive::split_list::expandable_bucket_table; @@ -110,7 +114,7 @@ namespace cds { namespace container { //@endcond - /// SplitListSet traits + /// \p SplitListSet traits struct traits: public intrusive::split_list::traits { // Ordered list implementation diff --git a/cds/intrusive/details/split_list_base.h b/cds/intrusive/details/split_list_base.h index d7f868b8..fb0e2305 100644 --- a/cds/intrusive/details/split_list_base.h +++ b/cds/intrusive/details/split_list_base.h @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -212,6 +213,22 @@ namespace cds { namespace intrusive { //@endcond }; + /// Option to control bit reversal algorithm + /** + Bit reversal is a significant part of split-list. + \p Type can be one of predefined algorithm in \p cds::algo::bit_reversal namespace. + */ + template + struct bit_reversal { + //@cond + template + struct pack: public Base + { + typedef Type bit_reversal; + }; + //@endcond + }; + /// SplitListSet traits struct traits { @@ -223,6 +240,17 @@ namespace cds { namespace intrusive { */ typedef opt::none hash; + /// Bit reversal algorithm + /** + Bit reversal is a significant part of split-list. + There are several predefined algorithm in \p cds::algo::bit_reversal namespace, + \p cds::algo::bit_reversal::lookup is the best general purpose one. + + There are more efficient bit reversal algoritm for particular processor architecture, + for example, based on x86 SIMD/AVX instruction set, see here + */ + typedef cds::algo::bit_reversal::lookup bit_reversal; + /// Item counter /** The item counting is an important part of \p SplitListSet algorithm: @@ -309,6 +337,8 @@ namespace cds { namespace intrusive { /** Available \p Options: - \p opt::hash - mandatory option, specifies hash functor. + - \p split_list::bit_reversal - bit reversal algorithm, see \p traits::bit_reversal for explanation + default is \p cds::algo::bit_reversal::lookup - \p opt::item_counter - optional, specifies item counting policy. See \p traits::item_counter for default type. - \p opt::memory_model - C++ memory model for atomic operations. @@ -1244,21 +1274,16 @@ namespace cds { namespace intrusive { //@cond // Helper functions - - /// Reverses bit order in \p nHash - static inline size_t reverse_bits( size_t nHash ) - { - return bitop::RBO( nHash ); - } - + template static inline size_t regular_hash( size_t nHash ) { - return reverse_bits( nHash ) | size_t(1); + return BitReversalAlgo()( nHash ) | size_t(1); } + template static inline size_t dummy_hash( size_t nHash ) { - return reverse_bits( nHash ) & ~size_t(1); + return BitReversalAlgo()( nHash ) & ~size_t(1); } //@endcond diff --git a/cds/intrusive/split_list.h b/cds/intrusive/split_list.h index d28e2050..7bbbd78d 100644 --- a/cds/intrusive/split_list.h +++ b/cds/intrusive/split_list.h @@ -273,6 +273,7 @@ namespace cds { namespace intrusive { /// Hash functor for \p %value_type and all its derivatives you use typedef typename cds::opt::v::hash_selector< typename traits::hash >::type hash; + typedef typename traits::bit_reversal bit_reversal; ///< Bit reversal algorithm, see \p split_list::traits::bit_reversal typedef typename traits::item_counter item_counter; ///< Item counter type typedef typename traits::back_off back_off; ///< back-off strategy for spinning typedef typename traits::memory_model memory_model; ///< Memory ordering. See \p cds::opt::memory_model option @@ -589,7 +590,7 @@ namespace cds { namespace intrusive { aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); - node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash ); + node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash ); if ( m_List.insert_at( pHead, val )) { inc_item_count(); @@ -627,7 +628,7 @@ namespace cds { namespace intrusive { aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); - node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash ); + node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash ); if ( m_List.insert_at( pHead, val, f )) { inc_item_count(); @@ -685,7 +686,7 @@ namespace cds { namespace intrusive { aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); - node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash ); + node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash ); std::pair bRet = m_List.update_at( pHead, val, func, bAllowInsert ); if ( bRet.first && bRet.second ) { @@ -732,7 +733,7 @@ namespace cds { namespace intrusive { aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); - node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash ); + node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash ); std::pair bRet = m_List.upsert_at( pHead, val, bAllowInsert ); if ( bRet.first && bRet.second ) { @@ -1213,7 +1214,7 @@ namespace cds { namespace intrusive { if ( pBucket ) return pBucket; - pBucket = alloc_aux_node( split_list::dummy_hash( nBucket )); + pBucket = alloc_aux_node( split_list::dummy_hash( nBucket )); if ( pBucket ) { if ( m_List.insert_aux_node( pParentBucket, pBucket )) { m_Buckets.bucket( nBucket, pBucket ); @@ -1265,7 +1266,7 @@ namespace cds { namespace intrusive { "cds::atomicity::empty_item_counter is not allowed as a item counter"); // Initialize bucket 0 - aux_node_type * pNode = alloc_aux_node( 0 /*split_list::dummy_hash(0)*/ ); + aux_node_type * pNode = alloc_aux_node( 0 /*split_list::dummy_hash(0)*/ ); assert( pNode != nullptr ); // insert_aux_node cannot return false for empty list @@ -1305,7 +1306,7 @@ namespace cds { namespace intrusive { bool find_( Q& val, Compare cmp, Func f ) { size_t nHash = hash_value( val ); - split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); + split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); @@ -1319,7 +1320,7 @@ namespace cds { namespace intrusive { bool find_( Q const& val, Compare cmp ) { size_t nHash = hash_value( val ); - split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); + split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); @@ -1330,7 +1331,7 @@ namespace cds { namespace intrusive { iterator find_iterator_( Q const& val, Compare cmp ) { size_t nHash = hash_value( val ); - split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); + split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); @@ -1341,7 +1342,7 @@ namespace cds { namespace intrusive { guarded_ptr get_( Q const& val, Compare cmp ) { size_t nHash = hash_value( val ); - split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); + split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); @@ -1366,7 +1367,7 @@ namespace cds { namespace intrusive { bool erase_( Q const& val, Compare cmp, Func f ) { size_t nHash = hash_value( val ); - split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); + split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); @@ -1383,7 +1384,7 @@ namespace cds { namespace intrusive { bool erase_( Q const& val, Compare cmp ) { size_t nHash = hash_value( val ); - split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); + split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); @@ -1400,7 +1401,7 @@ namespace cds { namespace intrusive { guarded_ptr extract_( Q const& val, Compare cmp ) { size_t nHash = hash_value( val ); - split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); + split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); diff --git a/cds/intrusive/split_list_nogc.h b/cds/intrusive/split_list_nogc.h index d959cbe7..10cb0462 100644 --- a/cds/intrusive/split_list_nogc.h +++ b/cds/intrusive/split_list_nogc.h @@ -83,6 +83,7 @@ namespace cds { namespace intrusive { typedef typename ordered_list::key_comparator key_comparator; ///< key comparison functor typedef typename ordered_list::disposer disposer; ///< Node disposer functor + typedef typename traits::bit_reversal bit_reversal; ///< Bit reversal algorithm, see \p split_list::traits::bit_reversal typedef typename traits::item_counter item_counter; ///< Item counter type typedef typename traits::back_off back_off; ///< back-off strategy typedef typename traits::memory_model memory_model; ///< Memory ordering. See cds::opt::memory_model option @@ -512,7 +513,7 @@ namespace cds { namespace intrusive { aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); - node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash ); + node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash ); list_iterator it = m_List.insert_at_( pHead, val ); if ( it != m_List.end()) { @@ -531,7 +532,7 @@ namespace cds { namespace intrusive { aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); - node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash ); + node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash ); std::pair ret = m_List.update_at_( pHead, val, func, bAllowInsert ); if ( ret.first != m_List.end()) { @@ -551,7 +552,7 @@ namespace cds { namespace intrusive { { CDS_UNUSED( pred ); size_t nHash = hash_value( val ); - split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); + split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); @@ -564,7 +565,7 @@ namespace cds { namespace intrusive { iterator find_( Q const& val ) { size_t nHash = hash_value( val ); - split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); + split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); @@ -577,7 +578,7 @@ namespace cds { namespace intrusive { bool find_( Q& val, Compare cmp, Func f ) { size_t nHash = hash_value( val ); - split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); + split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); return m_Stat.onFind( m_List.find_at( pHead, sv, cmp, @@ -638,7 +639,7 @@ namespace cds { namespace intrusive { if ( pBucket ) return pBucket; - pBucket = alloc_aux_node( split_list::dummy_hash( nBucket )); + pBucket = alloc_aux_node( split_list::dummy_hash( nBucket )); if ( pBucket ) { if ( m_List.insert_aux_node( pParentBucket, pBucket )) { m_Buckets.bucket( nBucket, pBucket ); @@ -683,7 +684,7 @@ namespace cds { namespace intrusive { void init() { // Initialize bucket 0 - aux_node_type * pNode = alloc_aux_node( 0 /*split_list::dummy_hash(0)*/ ); + aux_node_type * pNode = alloc_aux_node( 0 /*split_list::dummy_hash(0)*/ ); // insert_aux_node cannot return false for empty list CDS_VERIFY( m_List.insert_aux_node( pNode )); diff --git a/cds/intrusive/split_list_rcu.h b/cds/intrusive/split_list_rcu.h index c8902d11..117e49fc 100644 --- a/cds/intrusive/split_list_rcu.h +++ b/cds/intrusive/split_list_rcu.h @@ -119,6 +119,7 @@ namespace cds { namespace intrusive { /// Group of \p extract_xxx functions require external locking if underlying ordered list requires that static CDS_CONSTEXPR const bool c_bExtractLockExternal = ordered_list::c_bExtractLockExternal; + typedef typename traits::bit_reversal bit_reversal; ///< Bit reversal algorithm, see \p split_list::traits::bit_reversal typedef typename traits::item_counter item_counter; ///< Item counter type typedef typename traits::back_off back_off; ///< back-off strategy for spinning typedef typename traits::memory_model memory_model; ///< Memory ordering. See cds::opt::memory_model option @@ -323,7 +324,7 @@ namespace cds { namespace intrusive { aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); - node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash ); + node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash ); if ( m_List.insert_at( pHead, val )) { inc_item_count(); @@ -362,7 +363,7 @@ namespace cds { namespace intrusive { aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); - node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash ); + node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash ); if ( m_List.insert_at( pHead, val, f )) { inc_item_count(); @@ -410,7 +411,7 @@ namespace cds { namespace intrusive { aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); - node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash ); + node_traits::to_node_ptr( val )->m_nHash = split_list::regular_hash( nHash ); std::pair bRet = m_List.update_at( pHead, val, func, bAllowInsert ); if ( bRet.first && bRet.second ) { @@ -929,7 +930,7 @@ namespace cds { namespace intrusive { if ( pBucket ) return pBucket; - pBucket = alloc_aux_node( split_list::dummy_hash( nBucket )); + pBucket = alloc_aux_node( split_list::dummy_hash( nBucket )); if ( pBucket ) { if ( m_List.insert_aux_node( pParentBucket, pBucket )) { m_Buckets.bucket( nBucket, pBucket ); @@ -974,7 +975,7 @@ namespace cds { namespace intrusive { void init() { // Initialize bucket 0 - aux_node_type * pNode = alloc_aux_node( 0 /*split_list::dummy_hash(0)*/ ); + aux_node_type * pNode = alloc_aux_node( 0 /*split_list::dummy_hash(0)*/ ); // insert_aux_node cannot return false for empty list CDS_VERIFY( m_List.insert_aux_node( pNode )); @@ -1013,7 +1014,7 @@ namespace cds { namespace intrusive { bool find_( Q& val, Compare cmp, Func f ) { size_t nHash = hash_value( val ); - split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); + split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); @@ -1025,7 +1026,7 @@ namespace cds { namespace intrusive { bool find_value( Q const& val, Compare cmp ) { size_t nHash = hash_value( val ); - split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); + split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); @@ -1036,7 +1037,7 @@ namespace cds { namespace intrusive { raw_ptr get_( Q const& val, Compare cmp ) { size_t nHash = hash_value( val ); - split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); + split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); @@ -1049,7 +1050,7 @@ namespace cds { namespace intrusive { value_type * extract_( Q const& val, Compare cmp ) { size_t nHash = hash_value( val ); - split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); + split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); @@ -1074,7 +1075,7 @@ namespace cds { namespace intrusive { bool erase_( const Q& val, Compare cmp ) { size_t nHash = hash_value( val ); - split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); + split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); @@ -1091,7 +1092,7 @@ namespace cds { namespace intrusive { bool erase_( Q const& val, Compare cmp, Func f ) { size_t nHash = hash_value( val ); - split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); + split_list::details::search_value_type sv( val, split_list::regular_hash( nHash )); aux_node_type * pHead = get_bucket( nHash ); assert( pHead != nullptr ); diff --git a/projects/Win/vc141/cds.vcxproj b/projects/Win/vc141/cds.vcxproj index 2079d4cf..859184bf 100644 --- a/projects/Win/vc141/cds.vcxproj +++ b/projects/Win/vc141/cds.vcxproj @@ -383,6 +383,7 @@ + diff --git a/projects/Win/vc141/cds.vcxproj.filters b/projects/Win/vc141/cds.vcxproj.filters index 3b28674f..7a1fbd4d 100644 --- a/projects/Win/vc141/cds.vcxproj.filters +++ b/projects/Win/vc141/cds.vcxproj.filters @@ -1258,5 +1258,8 @@ Header Files\cds\compiler\gcc\arm7 + + Header Files\cds\algo + \ No newline at end of file diff --git a/projects/Win/vc141/gtest-misc.vcxproj b/projects/Win/vc141/gtest-misc.vcxproj index b38e872f..c227dcd4 100644 --- a/projects/Win/vc141/gtest-misc.vcxproj +++ b/projects/Win/vc141/gtest-misc.vcxproj @@ -37,6 +37,7 @@ true + diff --git a/projects/Win/vc141/gtest-misc.vcxproj.filters b/projects/Win/vc141/gtest-misc.vcxproj.filters index 954b0d29..feb7047d 100644 --- a/projects/Win/vc141/gtest-misc.vcxproj.filters +++ b/projects/Win/vc141/gtest-misc.vcxproj.filters @@ -38,6 +38,9 @@ Source Files + + Source Files + diff --git a/test/unit/intrusive-set/intrusive_split_michael_dhp.cpp b/test/unit/intrusive-set/intrusive_split_michael_dhp.cpp index dc378b6f..b138b37e 100644 --- a/test/unit/intrusive-set/intrusive_split_michael_dhp.cpp +++ b/test/unit/intrusive-set/intrusive_split_michael_dhp.cpp @@ -209,6 +209,75 @@ namespace { test( s ); } + TEST_F( IntrusiveSplitListSet_DHP, base_bit_reversal_swar ) + { + struct list_traits: public ci::michael_list::traits + { + typedef ci::michael_list::base_hook< ci::opt::gc> hook; + typedef cmp compare; + typedef mock_disposer disposer; + }; + typedef ci::MichaelList< gc_type, base_item_type, list_traits > bucket_type; + + struct set_traits: public ci::split_list::traits + { + typedef hash_int hash; + typedef simple_item_counter item_counter; + typedef ci::split_list::stat<> stat; + typedef cds::algo::bit_reversal::swar bit_reversal; + }; + typedef ci::SplitListSet< gc_type, bucket_type, set_traits > set_type; + + set_type s( kSize, 2 ); + test( s ); + } + + TEST_F( IntrusiveSplitListSet_DHP, base_bit_reversal_lookup ) + { + struct list_traits: public ci::michael_list::traits + { + typedef ci::michael_list::base_hook< ci::opt::gc> hook; + typedef cmp compare; + typedef mock_disposer disposer; + }; + typedef ci::MichaelList< gc_type, base_item_type, list_traits > bucket_type; + + struct set_traits: public ci::split_list::traits + { + typedef hash_int hash; + typedef simple_item_counter item_counter; + typedef ci::split_list::stat<> stat; + typedef cds::algo::bit_reversal::lookup bit_reversal; + }; + typedef ci::SplitListSet< gc_type, bucket_type, set_traits > set_type; + + set_type s( kSize, 2 ); + test( s ); + } + + TEST_F( IntrusiveSplitListSet_DHP, base_bit_reversal_muldiv ) + { + struct list_traits: public ci::michael_list::traits + { + typedef ci::michael_list::base_hook< ci::opt::gc> hook; + typedef cmp compare; + typedef mock_disposer disposer; + }; + typedef ci::MichaelList< gc_type, base_item_type, list_traits > bucket_type; + + struct set_traits: public ci::split_list::traits + { + typedef hash_int hash; + typedef simple_item_counter item_counter; + typedef ci::split_list::stat<> stat; + typedef cds::algo::bit_reversal::muldiv bit_reversal; + }; + typedef ci::SplitListSet< gc_type, bucket_type, set_traits > set_type; + + set_type s( kSize, 2 ); + test( s ); + } + TEST_F( IntrusiveSplitListSet_DHP, member_cmp ) { typedef ci::MichaelList< gc_type diff --git a/test/unit/intrusive-set/intrusive_split_michael_hp.cpp b/test/unit/intrusive-set/intrusive_split_michael_hp.cpp index cd9ec9c2..f5c2bf37 100644 --- a/test/unit/intrusive-set/intrusive_split_michael_hp.cpp +++ b/test/unit/intrusive-set/intrusive_split_michael_hp.cpp @@ -210,6 +210,74 @@ namespace { test( s ); } + TEST_F( IntrusiveSplitListSet_HP, base_bit_reversal_swar ) + { + struct list_traits: public ci::michael_list::traits + { + typedef ci::michael_list::base_hook< ci::opt::gc> hook; + typedef cmp compare; + typedef mock_disposer disposer; + }; + typedef ci::MichaelList< gc_type, base_item_type, list_traits > bucket_type; + + struct set_traits: public ci::split_list::traits + { + typedef hash_int hash; + typedef simple_item_counter item_counter; + typedef ci::split_list::stat<> stat; + typedef cds::algo::bit_reversal::swar bit_reversal; + }; + typedef ci::SplitListSet< gc_type, bucket_type, set_traits > set_type; + + set_type s( kSize, 2 ); + test( s ); + } + + TEST_F( IntrusiveSplitListSet_HP, base_bit_reversal_lookup ) + { + struct list_traits: public ci::michael_list::traits + { + typedef ci::michael_list::base_hook< ci::opt::gc> hook; + typedef cmp compare; + typedef mock_disposer disposer; + }; + typedef ci::MichaelList< gc_type, base_item_type, list_traits > bucket_type; + + struct set_traits: public ci::split_list::traits + { + typedef hash_int hash; + typedef simple_item_counter item_counter; + typedef ci::split_list::stat<> stat; + typedef cds::algo::bit_reversal::lookup bit_reversal; + }; + typedef ci::SplitListSet< gc_type, bucket_type, set_traits > set_type; + + set_type s( kSize, 2 ); + test( s ); + } + + TEST_F( IntrusiveSplitListSet_HP, base_bit_reversal_muldiv ) + { + struct list_traits: public ci::michael_list::traits + { + typedef ci::michael_list::base_hook< ci::opt::gc> hook; + typedef cmp compare; + typedef mock_disposer disposer; + }; + typedef ci::MichaelList< gc_type, base_item_type, list_traits > bucket_type; + + struct set_traits: public ci::split_list::traits + { + typedef hash_int hash; + typedef simple_item_counter item_counter; + typedef ci::split_list::stat<> stat; + typedef cds::algo::bit_reversal::muldiv bit_reversal; + }; + typedef ci::SplitListSet< gc_type, bucket_type, set_traits > set_type; + + set_type s( kSize, 2 ); + test( s ); + } TEST_F( IntrusiveSplitListSet_HP, member_cmp ) { diff --git a/test/unit/intrusive-set/intrusive_split_michael_nogc.cpp b/test/unit/intrusive-set/intrusive_split_michael_nogc.cpp index 4ddb3ff1..17bf2cfe 100644 --- a/test/unit/intrusive-set/intrusive_split_michael_nogc.cpp +++ b/test/unit/intrusive-set/intrusive_split_michael_nogc.cpp @@ -196,6 +196,76 @@ namespace { test( s ); } + TEST_F( IntrusiveSplitListSet_NoGC, base_bit_reversal_swar ) + { + struct list_traits: public ci::michael_list::traits + { + typedef ci::michael_list::base_hook< ci::opt::gc> hook; + typedef cmp compare; + typedef mock_disposer disposer; + }; + typedef ci::MichaelList< gc_type, base_item_type, list_traits > bucket_type; + + struct set_traits: public ci::split_list::traits + { + typedef hash_int hash; + typedef simple_item_counter item_counter; + typedef ci::split_list::stat<> stat; + typedef cds::algo::bit_reversal::swar bit_reversal; + }; + typedef ci::SplitListSet< gc_type, bucket_type, set_traits > set_type; + + set_type s( kSize, 2 ); + test( s ); + } + + TEST_F( IntrusiveSplitListSet_NoGC, base_bit_reversal_lookup ) + { + struct list_traits: public ci::michael_list::traits + { + typedef ci::michael_list::base_hook< ci::opt::gc> hook; + typedef cmp compare; + typedef mock_disposer disposer; + }; + typedef ci::MichaelList< gc_type, base_item_type, list_traits > bucket_type; + + struct set_traits: public ci::split_list::traits + { + typedef hash_int hash; + typedef simple_item_counter item_counter; + typedef ci::split_list::stat<> stat; + typedef cds::algo::bit_reversal::lookup bit_reversal; + }; + typedef ci::SplitListSet< gc_type, bucket_type, set_traits > set_type; + + set_type s( kSize, 2 ); + test( s ); + } + + TEST_F( IntrusiveSplitListSet_NoGC, base_bit_reversal_muldiv ) + { + struct list_traits: public ci::michael_list::traits + { + typedef ci::michael_list::base_hook< ci::opt::gc> hook; + typedef cmp compare; + typedef mock_disposer disposer; + }; + typedef ci::MichaelList< gc_type, base_item_type, list_traits > bucket_type; + + struct set_traits: public ci::split_list::traits + { + typedef hash_int hash; + typedef simple_item_counter item_counter; + typedef ci::split_list::stat<> stat; + typedef cds::algo::bit_reversal::muldiv bit_reversal; + }; + typedef ci::SplitListSet< gc_type, bucket_type, set_traits > set_type; + + set_type s( kSize, 2 ); + test( s ); + } + + TEST_F( IntrusiveSplitListSet_NoGC, member_cmp ) { typedef ci::MichaelList< gc_type diff --git a/test/unit/intrusive-set/test_intrusive_split_michael_rcu.h b/test/unit/intrusive-set/test_intrusive_split_michael_rcu.h index a82ced48..cb7b4826 100644 --- a/test/unit/intrusive-set/test_intrusive_split_michael_rcu.h +++ b/test/unit/intrusive-set/test_intrusive_split_michael_rcu.h @@ -234,6 +234,91 @@ TYPED_TEST_P( IntrusiveSplitMichaelSet, base_free_list ) this->test( s ); } +TYPED_TEST_P( IntrusiveSplitMichaelSet, base_bit_reverse_swar ) +{ + typedef typename TestFixture::rcu_type rcu_type; + typedef typename TestFixture::base_item_type base_item_type; + typedef typename TestFixture::mock_disposer mock_disposer; + typedef typename TestFixture::hash_int hash_int; + + struct list_traits: public ci::michael_list::traits + { + typedef ci::michael_list::base_hook< ci::opt::gc> hook; + typedef typename TestFixture::template less less; + typedef mock_disposer disposer; + }; + typedef ci::MichaelList< rcu_type, base_item_type, list_traits > bucket_type; + + struct set_traits: public ci::split_list::traits + { + typedef hash_int hash; + typedef typename TestFixture::simple_item_counter item_counter; + typedef ci::split_list::stat<> stat; + typedef cds::algo::bit_reversal::swar bit_reversal; + }; + typedef ci::SplitListSet< rcu_type, bucket_type, set_traits > set_type; + + set_type s( TestFixture::kSize, 2 ); + this->test( s ); +} + +TYPED_TEST_P( IntrusiveSplitMichaelSet, base_bit_reverse_lookup ) +{ + typedef typename TestFixture::rcu_type rcu_type; + typedef typename TestFixture::base_item_type base_item_type; + typedef typename TestFixture::mock_disposer mock_disposer; + typedef typename TestFixture::hash_int hash_int; + + struct list_traits: public ci::michael_list::traits + { + typedef ci::michael_list::base_hook< ci::opt::gc> hook; + typedef typename TestFixture::template less less; + typedef mock_disposer disposer; + }; + typedef ci::MichaelList< rcu_type, base_item_type, list_traits > bucket_type; + + struct set_traits: public ci::split_list::traits + { + typedef hash_int hash; + typedef typename TestFixture::simple_item_counter item_counter; + typedef ci::split_list::stat<> stat; + typedef cds::algo::bit_reversal::lookup bit_reversal; + }; + typedef ci::SplitListSet< rcu_type, bucket_type, set_traits > set_type; + + set_type s( TestFixture::kSize, 2 ); + this->test( s ); +} + +TYPED_TEST_P( IntrusiveSplitMichaelSet, base_bit_reverse_muldiv ) +{ + typedef typename TestFixture::rcu_type rcu_type; + typedef typename TestFixture::base_item_type base_item_type; + typedef typename TestFixture::mock_disposer mock_disposer; + typedef typename TestFixture::hash_int hash_int; + + struct list_traits: public ci::michael_list::traits + { + typedef ci::michael_list::base_hook< ci::opt::gc> hook; + typedef typename TestFixture::template less less; + typedef mock_disposer disposer; + }; + typedef ci::MichaelList< rcu_type, base_item_type, list_traits > bucket_type; + + struct set_traits: public ci::split_list::traits + { + typedef hash_int hash; + typedef typename TestFixture::simple_item_counter item_counter; + typedef ci::split_list::stat<> stat; + typedef cds::algo::bit_reversal::muldiv bit_reversal; + }; + typedef ci::SplitListSet< rcu_type, bucket_type, set_traits > set_type; + + set_type s( TestFixture::kSize, 2 ); + this->test( s ); +} + + TYPED_TEST_P( IntrusiveSplitMichaelSet, member_cmp ) { typedef typename TestFixture::rcu_type rcu_type; @@ -412,7 +497,7 @@ TYPED_TEST_P( IntrusiveSplitMichaelSet, member_free_list ) // GCC 5: All test names should be written on single line, otherwise a runtime error will be encountered like as // "No test named can be found in this test case" REGISTER_TYPED_TEST_CASE_P( IntrusiveSplitMichaelSet, - base_cmp, base_less, base_cmpmix, base_static_bucket_table, base_static_bucket_table_free_list, base_free_list, member_cmp, member_less, member_cmpmix, member_static_bucket_table, member_static_bucket_table_free_list, member_free_list + base_cmp, base_less, base_cmpmix, base_static_bucket_table, base_static_bucket_table_free_list, base_free_list, base_bit_reverse_swar, base_bit_reverse_lookup, base_bit_reverse_muldiv, member_cmp, member_less, member_cmpmix, member_static_bucket_table, member_static_bucket_table_free_list, member_free_list ); diff --git a/test/unit/map/split_michael_dhp.cpp b/test/unit/map/split_michael_dhp.cpp index 4d7f6f29..e2841bb8 100644 --- a/test/unit/map/split_michael_dhp.cpp +++ b/test/unit/map/split_michael_dhp.cpp @@ -251,4 +251,61 @@ namespace { test( m ); } + TEST_F( SplitListMichaelMap_DHP, bit_reversal_swar ) + { + typedef cc::SplitListMap< gc_type, key_type, value_type, + typename cc::split_list::make_traits< + cc::split_list::ordered_list< cc::michael_list_tag > + ,cc::split_list::bit_reversal< cds::algo::bit_reversal::swar > + , cds::opt::hash< hash1 > + , cc::split_list::ordered_list_traits< + typename cc::michael_list::make_traits< + cds::opt::compare< cmp > + >::type + > + >::type + > map_type; + + map_type m( kSize, 2 ); + test( m ); + } + + TEST_F( SplitListMichaelMap_DHP, bit_reversal_lookup ) + { + typedef cc::SplitListMap< gc_type, key_type, value_type, + typename cc::split_list::make_traits< + cc::split_list::ordered_list< cc::michael_list_tag > + ,cc::split_list::bit_reversal< cds::algo::bit_reversal::lookup > + , cds::opt::hash< hash1 > + , cc::split_list::ordered_list_traits< + typename cc::michael_list::make_traits< + cds::opt::compare< cmp > + >::type + > + >::type + > map_type; + + map_type m( kSize, 2 ); + test( m ); + } + + TEST_F( SplitListMichaelMap_DHP, bit_reversal_muldiv ) + { + typedef cc::SplitListMap< gc_type, key_type, value_type, + typename cc::split_list::make_traits< + cc::split_list::ordered_list< cc::michael_list_tag > + ,cc::split_list::bit_reversal< cds::algo::bit_reversal::muldiv > + , cds::opt::hash< hash1 > + , cc::split_list::ordered_list_traits< + typename cc::michael_list::make_traits< + cds::opt::compare< cmp > + >::type + > + >::type + > map_type; + + map_type m( kSize, 2 ); + test( m ); + } + } // namespace diff --git a/test/unit/map/split_michael_hp.cpp b/test/unit/map/split_michael_hp.cpp index fb117c00..9de09e1b 100644 --- a/test/unit/map/split_michael_hp.cpp +++ b/test/unit/map/split_michael_hp.cpp @@ -253,4 +253,61 @@ namespace { test( m ); } + TEST_F( SplitListMichaelMap_HP, bit_reversal_swar ) + { + typedef cc::SplitListMap< gc_type, key_type, value_type, + typename cc::split_list::make_traits< + cc::split_list::ordered_list< cc::michael_list_tag > + ,cc::split_list::bit_reversal< cds::algo::bit_reversal::swar > + , cds::opt::hash< hash1 > + , cc::split_list::ordered_list_traits< + typename cc::michael_list::make_traits< + cds::opt::compare< cmp > + >::type + > + >::type + > map_type; + + map_type m( kSize, 2 ); + test( m ); + } + + TEST_F( SplitListMichaelMap_HP, bit_reversal_lookup ) + { + typedef cc::SplitListMap< gc_type, key_type, value_type, + typename cc::split_list::make_traits< + cc::split_list::ordered_list< cc::michael_list_tag > + ,cc::split_list::bit_reversal< cds::algo::bit_reversal::lookup > + , cds::opt::hash< hash1 > + , cc::split_list::ordered_list_traits< + typename cc::michael_list::make_traits< + cds::opt::compare< cmp > + >::type + > + >::type + > map_type; + + map_type m( kSize, 2 ); + test( m ); + } + + TEST_F( SplitListMichaelMap_HP, bit_reversal_muldiv ) + { + typedef cc::SplitListMap< gc_type, key_type, value_type, + typename cc::split_list::make_traits< + cc::split_list::ordered_list< cc::michael_list_tag > + ,cc::split_list::bit_reversal< cds::algo::bit_reversal::muldiv > + , cds::opt::hash< hash1 > + , cc::split_list::ordered_list_traits< + typename cc::michael_list::make_traits< + cds::opt::compare< cmp > + >::type + > + >::type + > map_type; + + map_type m( kSize, 2 ); + test( m ); + } + } // namespace diff --git a/test/unit/map/test_split_michael_rcu.h b/test/unit/map/test_split_michael_rcu.h index ef71fe4c..28f38e36 100644 --- a/test/unit/map/test_split_michael_rcu.h +++ b/test/unit/map/test_split_michael_rcu.h @@ -292,8 +292,81 @@ TYPED_TEST_P( SplitListMichaelMap, static_bucket_table_free_list ) this->test( m ); } +TYPED_TEST_P( SplitListMichaelMap, bit_reversal_swar ) +{ + typedef typename TestFixture::rcu_type rcu_type; + typedef typename TestFixture::key_type key_type; + typedef typename TestFixture::value_type value_type; + typedef typename TestFixture::hash1 hash1; + + struct map_traits: public cc::split_list::traits + { + typedef cc::michael_list_tag ordered_list; + typedef hash1 hash; + typedef cds::algo::bit_reversal::swar bit_reversal; + + struct ordered_list_traits: public cc::michael_list::traits + { + typedef typename TestFixture::cmp compare; + }; + }; + typedef cc::SplitListMap< rcu_type, key_type, value_type, map_traits > map_type; + + map_type m( TestFixture::kSize, 2 ); + this->test( m ); +} + +TYPED_TEST_P( SplitListMichaelMap, bit_reversal_lookup ) +{ + typedef typename TestFixture::rcu_type rcu_type; + typedef typename TestFixture::key_type key_type; + typedef typename TestFixture::value_type value_type; + typedef typename TestFixture::hash1 hash1; + + struct map_traits: public cc::split_list::traits + { + typedef cc::michael_list_tag ordered_list; + typedef hash1 hash; + typedef cds::algo::bit_reversal::lookup bit_reversal; + + struct ordered_list_traits: public cc::michael_list::traits + { + typedef typename TestFixture::cmp compare; + }; + }; + typedef cc::SplitListMap< rcu_type, key_type, value_type, map_traits > map_type; + + map_type m( TestFixture::kSize, 2 ); + this->test( m ); +} + +TYPED_TEST_P( SplitListMichaelMap, bit_reversal_muldiv ) +{ + typedef typename TestFixture::rcu_type rcu_type; + typedef typename TestFixture::key_type key_type; + typedef typename TestFixture::value_type value_type; + typedef typename TestFixture::hash1 hash1; + + struct map_traits: public cc::split_list::traits + { + typedef cc::michael_list_tag ordered_list; + typedef hash1 hash; + typedef cds::algo::bit_reversal::muldiv bit_reversal; + + struct ordered_list_traits: public cc::michael_list::traits + { + typedef typename TestFixture::cmp compare; + }; + }; + typedef cc::SplitListMap< rcu_type, key_type, value_type, map_traits > map_type; + + map_type m( TestFixture::kSize, 2 ); + this->test( m ); +} + + REGISTER_TYPED_TEST_CASE_P( SplitListMichaelMap, - compare, less, cmpmix, item_counting, stat, back_off, free_list, static_bucket_table, static_bucket_table_free_list + compare, less, cmpmix, item_counting, stat, back_off, free_list, static_bucket_table, static_bucket_table_free_list, bit_reversal_swar, bit_reversal_lookup, bit_reversal_muldiv ); diff --git a/test/unit/misc/bit_reversal.cpp b/test/unit/misc/bit_reversal.cpp new file mode 100644 index 00000000..d583cd54 --- /dev/null +++ b/test/unit/misc/bit_reversal.cpp @@ -0,0 +1,96 @@ +/* + This file is a part of libcds - Concurrent Data Structures library + + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017 + + Source code repo: http://github.com/khizmax/libcds/ + Download: http://sourceforge.net/projects/libcds/files/ + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include +#include + +namespace { + + template + class bit_reversal: public ::testing::Test + { + typedef UInt uint_type; + static std::vector arr_; + static size_t const c_size = 100'000'000; + + public: + static void SetUpTestCase() + { + arr_.resize( c_size ); + for ( size_t i = 0; i < c_size; ++i ) + arr_[i] = static_cast((i << 32) + (~i)); + } + + static void TearDownTestCase() + { + arr_.resize( 0 ); + } + + template + void test() + { + Algo f; + for ( auto i : arr_ ) { + EXPECT_EQ( i, f( f( i ))); + } + } + + template + void test_eq() + { + Algo f; + for ( auto i : arr_ ) { + EXPECT_EQ( cds::algo::bit_reversal::swar()( i ), f( i ) ) << "i=" << i; + } + } + }; + + template std::vector bit_reversal::arr_; + + typedef bit_reversal bit_reversal32; + typedef bit_reversal bit_reversal64; + +#define TEST_32BIT( x ) \ + TEST_F( bit_reversal32, x ) { test(); } \ + TEST_F( bit_reversal32, x##_eq ) { test_eq(); } + +#define TEST_64BIT( x ) \ + TEST_F( bit_reversal64, x ) { test(); } \ + TEST_F( bit_reversal64, x##_eq ) { test_eq(); } + + TEST_32BIT( swar ) + TEST_32BIT( lookup ) + TEST_32BIT( muldiv ) + + TEST_64BIT( swar ) + TEST_64BIT( lookup ) + TEST_64BIT( muldiv ) + +} // namespace diff --git a/test/unit/set/split_michael_dhp.cpp b/test/unit/set/split_michael_dhp.cpp index ebf3df72..23903598 100644 --- a/test/unit/set/split_michael_dhp.cpp +++ b/test/unit/set/split_michael_dhp.cpp @@ -251,4 +251,70 @@ namespace { test( s ); } + TEST_F( SplitListMichaelSet_DHP, bit_reversal_swar ) + { + struct set_traits: public cc::split_list::traits + { + typedef cc::michael_list_tag ordered_list; + typedef hash_int hash; + typedef cds::atomicity::item_counter item_counter; + typedef cds::algo::bit_reversal::swar bit_reversal; + + struct ordered_list_traits: public cc::michael_list::traits + { + typedef cmp compare; + typedef base_class::less less; + typedef cds::backoff::empty back_off; + }; + }; + typedef cc::SplitListSet< gc_type, int_item, set_traits > set_type; + + set_type s( kSize, 2 ); + test( s ); + } + + TEST_F( SplitListMichaelSet_DHP, bit_reversal_lookup ) + { + struct set_traits: public cc::split_list::traits + { + typedef cc::michael_list_tag ordered_list; + typedef hash_int hash; + typedef cds::atomicity::item_counter item_counter; + typedef cds::algo::bit_reversal::lookup bit_reversal; + + struct ordered_list_traits: public cc::michael_list::traits + { + typedef cmp compare; + typedef base_class::less less; + typedef cds::backoff::empty back_off; + }; + }; + typedef cc::SplitListSet< gc_type, int_item, set_traits > set_type; + + set_type s( kSize, 2 ); + test( s ); + } + + TEST_F( SplitListMichaelSet_DHP, bit_reversal_muldiv ) + { + struct set_traits: public cc::split_list::traits + { + typedef cc::michael_list_tag ordered_list; + typedef hash_int hash; + typedef cds::atomicity::item_counter item_counter; + typedef cds::algo::bit_reversal::muldiv bit_reversal; + + struct ordered_list_traits: public cc::michael_list::traits + { + typedef cmp compare; + typedef base_class::less less; + typedef cds::backoff::empty back_off; + }; + }; + typedef cc::SplitListSet< gc_type, int_item, set_traits > set_type; + + set_type s( kSize, 2 ); + test( s ); + } + } // namespace diff --git a/test/unit/set/split_michael_hp.cpp b/test/unit/set/split_michael_hp.cpp index e7a2c86b..84591eb9 100644 --- a/test/unit/set/split_michael_hp.cpp +++ b/test/unit/set/split_michael_hp.cpp @@ -253,4 +253,71 @@ namespace { test( s ); } + TEST_F( SplitListMichaelSet_HP, bit_reversal_swar ) + { + struct set_traits: public cc::split_list::traits + { + typedef cc::michael_list_tag ordered_list; + typedef hash_int hash; + typedef cds::atomicity::item_counter item_counter; + typedef cds::algo::bit_reversal::swar bit_reversal; + + struct ordered_list_traits: public cc::michael_list::traits + { + typedef cmp compare; + typedef base_class::less less; + typedef cds::backoff::empty back_off; + }; + }; + typedef cc::SplitListSet< gc_type, int_item, set_traits > set_type; + + set_type s( kSize, 2 ); + test( s ); + } + + TEST_F( SplitListMichaelSet_HP, bit_reversal_lookup ) + { + struct set_traits: public cc::split_list::traits + { + typedef cc::michael_list_tag ordered_list; + typedef hash_int hash; + typedef cds::atomicity::item_counter item_counter; + typedef cds::algo::bit_reversal::lookup bit_reversal; + + struct ordered_list_traits: public cc::michael_list::traits + { + typedef cmp compare; + typedef base_class::less less; + typedef cds::backoff::empty back_off; + }; + }; + typedef cc::SplitListSet< gc_type, int_item, set_traits > set_type; + + set_type s( kSize, 2 ); + test( s ); + } + + TEST_F( SplitListMichaelSet_HP, bit_reversal_muldiv ) + { + struct set_traits: public cc::split_list::traits + { + typedef cc::michael_list_tag ordered_list; + typedef hash_int hash; + typedef cds::atomicity::item_counter item_counter; + typedef cds::algo::bit_reversal::muldiv bit_reversal; + + struct ordered_list_traits: public cc::michael_list::traits + { + typedef cmp compare; + typedef base_class::less less; + typedef cds::backoff::empty back_off; + }; + }; + typedef cc::SplitListSet< gc_type, int_item, set_traits > set_type; + + set_type s( kSize, 2 ); + test( s ); + } + } // namespace + diff --git a/test/unit/set/split_michael_nogc.cpp b/test/unit/set/split_michael_nogc.cpp index 0765f1f4..7625a44b 100644 --- a/test/unit/set/split_michael_nogc.cpp +++ b/test/unit/set/split_michael_nogc.cpp @@ -235,4 +235,70 @@ namespace { test( s ); } + TEST_F( SplitListMichaelSet_NoGC, bit_reversal_swar ) + { + struct set_traits: public cc::split_list::traits + { + typedef cc::michael_list_tag ordered_list; + typedef hash_int hash; + typedef cds::atomicity::item_counter item_counter; + typedef cds::algo::bit_reversal::swar bit_reversal; + + struct ordered_list_traits: public cc::michael_list::traits + { + typedef cmp compare; + typedef base_class::less less; + typedef cds::backoff::empty back_off; + }; + }; + typedef cc::SplitListSet< gc_type, int_item, set_traits > set_type; + + set_type s( kSize, 2 ); + test( s ); + } + + TEST_F( SplitListMichaelSet_NoGC, bit_reversal_lookup ) + { + struct set_traits: public cc::split_list::traits + { + typedef cc::michael_list_tag ordered_list; + typedef hash_int hash; + typedef cds::atomicity::item_counter item_counter; + typedef cds::algo::bit_reversal::lookup bit_reversal; + + struct ordered_list_traits: public cc::michael_list::traits + { + typedef cmp compare; + typedef base_class::less less; + typedef cds::backoff::empty back_off; + }; + }; + typedef cc::SplitListSet< gc_type, int_item, set_traits > set_type; + + set_type s( kSize, 2 ); + test( s ); + } + + TEST_F( SplitListMichaelSet_NoGC, bit_reversal_muldiv ) + { + struct set_traits: public cc::split_list::traits + { + typedef cc::michael_list_tag ordered_list; + typedef hash_int hash; + typedef cds::atomicity::item_counter item_counter; + typedef cds::algo::bit_reversal::muldiv bit_reversal; + + struct ordered_list_traits: public cc::michael_list::traits + { + typedef cmp compare; + typedef base_class::less less; + typedef cds::backoff::empty back_off; + }; + }; + typedef cc::SplitListSet< gc_type, int_item, set_traits > set_type; + + set_type s( kSize, 2 ); + test( s ); + } + } // namespace diff --git a/test/unit/set/test_split_michael_rcu.h b/test/unit/set/test_split_michael_rcu.h index 812220fb..9ef56d2f 100644 --- a/test/unit/set/test_split_michael_rcu.h +++ b/test/unit/set/test_split_michael_rcu.h @@ -284,11 +284,84 @@ TYPED_TEST_P( SplitListMichaelSet, static_bucket_table_free_list ) this->test( s ); } +TYPED_TEST_P( SplitListMichaelSet, bit_reversal_swar ) +{ + typedef typename TestFixture::rcu_type rcu_type; + typedef typename TestFixture::int_item int_item; + typedef typename TestFixture::hash_int hash_int; + + typedef cc::SplitListSet< rcu_type, int_item, + typename cc::split_list::make_traits< + cc::split_list::ordered_list< cc::michael_list_tag > + , cds::opt::hash< hash_int > + , cc::split_list::bit_reversal< cds::algo::bit_reversal::swar > + , cc::split_list::ordered_list_traits< + typename cc::michael_list::make_traits< + cds::opt::less< typename TestFixture::less > + , cds::opt::compare< typename TestFixture::cmp > + >::type + > + >::type + > set_type; + + set_type s( TestFixture::kSize, 2 ); + this->test( s ); +} + +TYPED_TEST_P( SplitListMichaelSet, bit_reversal_lookup ) +{ + typedef typename TestFixture::rcu_type rcu_type; + typedef typename TestFixture::int_item int_item; + typedef typename TestFixture::hash_int hash_int; + + struct set_traits: public cc::split_list::traits + { + typedef cc::michael_list_tag ordered_list; + typedef hash_int hash; + typedef cds::algo::bit_reversal::lookup bit_reversal; + + struct ordered_list_traits: public cc::michael_list::traits + { + typedef typename TestFixture::cmp compare; + typedef typename TestFixture::less less; + typedef cds::backoff::empty back_off; + }; + }; + typedef cc::SplitListSet< rcu_type, int_item, set_traits > set_type; + + set_type s( TestFixture::kSize, 8 ); + this->test( s ); +} + +TYPED_TEST_P( SplitListMichaelSet, bit_reversal_muldiv ) +{ + typedef typename TestFixture::rcu_type rcu_type; + typedef typename TestFixture::int_item int_item; + typedef typename TestFixture::hash_int hash_int; + + struct set_traits: public cc::split_list::traits + { + typedef cc::michael_list_tag ordered_list; + typedef hash_int hash; + typedef cds::algo::bit_reversal::muldiv bit_reversal; + + struct ordered_list_traits: public cc::michael_list::traits + { + typedef typename TestFixture::cmp compare; + typedef typename TestFixture::less less; + typedef cds::backoff::empty back_off; + }; + }; + typedef cc::SplitListSet< rcu_type, int_item, set_traits > set_type; + + set_type s( TestFixture::kSize, 8 ); + this->test( s ); +} // GCC 5: All this->test names should be written on single line, otherwise a runtime error will be encountered like as // "No this->test named can be found in this this->test case" REGISTER_TYPED_TEST_CASE_P( SplitListMichaelSet, - compare, less, cmpmix, item_counting, stat, back_off, static_bucket_table, free_list, static_bucket_table_free_list + compare, less, cmpmix, item_counting, stat, back_off, static_bucket_table, free_list, static_bucket_table_free_list, bit_reversal_swar, bit_reversal_lookup, bit_reversal_muldiv );