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

File:

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

doc/theses/thierry_delisle_PhD/code/snzm.hpp

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