Changeset a5873bd for doc/theses/thierry_delisle_PhD/code/relaxed_list.hpp

Timestamp:

Jun 10, 2020, 12:13:18 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

97392b69

Parents:

6089f4d (diff), 5f259f3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'relaxed_ready' of plg.uwaterloo.ca:software/cfa/cfa-cc into relaxed_ready

File:

• doc/theses/thierry_delisle_PhD/code/relaxed_list.hpp (modified) (1 diff)

doc/theses/thierry_delisle_PhD/code/relaxed_list.hpp

@@ -222 +222 @@
                                         if(maski == 0 && maskj == 0) continue;
 
-                                        unsigned bi = rand_bit(ri >> snzm.depth, maski);
-                                        unsigned bj = rand_bit(rj >> snzm.depth, maskj);
-
-                                        assertf(bi < 64, "%zu %u", maski, bi);
-                                        assertf(bj < 64, "%zu %u", maskj, bj);
+                                        #if defined(__BMI2__)
+                                                uint64_t idxsi = _pext_u64(snzm.indexes, maski);
+                                                uint64_t idxsj = _pext_u64(snzm.indexes, maskj);
+
+                                                auto pi = __builtin_popcountll(maski);
+                                                auto pj = __builtin_popcountll(maskj);
+
+                                                ri = pi ? ri & ((pi >> 3) - 1) : 0;
+                                                rj = pj ? rj & ((pj >> 3) - 1) : 0;
+
+                                                unsigned bi = (idxsi >> (ri << 3)) & 0xff;
+                                                unsigned bj = (idxsj >> (rj << 3)) & 0xff;
+                                        #else
+                                                unsigned bi = rand_bit(ri >> snzm.depth, maski);
+                                                unsigned bj = rand_bit(rj >> snzm.depth, maskj);
+                                        #endif
 
                                         i = (bi << snzm.depth) | wdxi;
                                         j = (bj << snzm.depth) | wdxj;
 
-                                        assertf(i < numLists, "%u %u", bj, wdxi);
-                                        assertf(j < numLists, "%u %u", bj, wdxj);
+                                        /* paranoid */ assertf(i < numLists, "%u %u", bj, wdxi);
+                                        /* paranoid */ assertf(j < numLists, "%u %u", bj, wdxj);
                                 }