Changes in doc/theses/thierry_delisle_PhD/code/snzm.hpp [591f084:8c60d59]

File:

• doc/theses/thierry_delisle_PhD/code/snzm.hpp (modified) (5 diffs)

doc/theses/thierry_delisle_PhD/code/snzm.hpp

@@ -12 +12 @@
         std::unique_ptr<snzm_t::node[]> nodes;
 
+        #if defined(__BMI2__)
+                const uint64_t indexes = 0x0706050403020100;
+        #endif
+
         snzm_t(unsigned numLists);
 
@@ -28 +32 @@
         }
 
-        size_t masks( unsigned node ) {
+        uint64_t masks( unsigned node ) {
                 /* paranoid */ assert( (node & mask) == node );
-                return nodes[node].mask;
+                #if defined(__BMI2__)
+                        return nodes[node].mask_all;
+                #else
+                        return nodes[node].mask;
+                #endif
         }
 
@@ -140 +148 @@
         private:
                 volatile val_t value;
-                volatile size_t mask = 0;
+                #if defined(__BMI2__)
+                        union __attribute__((packed)) {
+                                volatile uint8_t mask[8];
+                                volatile uint64_t mask_all;
+                        };
+                #else
+                        volatile size_t mask = 0;
+                #endif
+
                 class node * parent = nullptr;
                 bool is_leaf = false;
@@ -151 +167 @@
                 void arrive( int bit ) {
                         /* paranoid */ assert( is_leaf );
-                        /* paranoid */ assert( (mask & ( 1 << bit )) == 0 );
 
                         arrive_h();
-                        __atomic_fetch_add( &mask, 1 << bit, __ATOMIC_RELAXED );
-                        // bts( (std::atomic_size_t&)mask, bit );
+                        #if defined(__BMI2__)
+                                /* paranoid */ assert( bit < 8 );
+                                mask[bit] = 0xff;
+                        #else
+                                /* paranoid */ assert( (mask & ( 1 << bit )) == 0 );
+                                __atomic_fetch_add( &mask, 1 << bit, __ATOMIC_RELAXED );
+                        #endif
 
                 }
@@ -161 +181 @@
                 void depart( int bit ) {
                         /* paranoid */ assert( is_leaf );
-                        /* paranoid */ assert( (mask & ( 1 << bit )) != 0 );
-
-                        // btr( (std::atomic_size_t&)mask, bit );
-                        __atomic_fetch_sub( &mask, 1 << bit, __ATOMIC_RELAXED );
+
+                        #if defined(__BMI2__)
+                                /* paranoid */ assert( bit < 8 );
+                                mask[bit] = 0x00;
+                        #else
+                                /* paranoid */ assert( (mask & ( 1 << bit )) != 0 );
+                                __atomic_fetch_sub( &mask, 1 << bit, __ATOMIC_RELAXED );
+                        #endif
                         depart_h();
                 }