prenex/magyarsort
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more of latest changes - random weird shiiit

Browse Source
This commit is contained in:
Richard Thier 2021-12-18 03:49:52 +01:00
parent f24b3987c0
commit da4d122ee1
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
magyarsort.h
View File

@ -242,10 +242,10 @@ namespace MagyarSort {
/** Recursive Functor: no class should be generated I think (compiler should be smart) */ /** Recursive Functor: no class should be generated I think (compiler should be smart) */
template<int DIGIT, typename COUNTER_TYP> template<int DIGIT, typename COUNTER_TYP>
struct RadixMagic : public RadixMagic<DIGIT - 1, COUNTER_TYP> { struct RadixMagic : public RadixMagic<DIGIT - 1, COUNTER_TYP> {
inline __attribute__((always_inline)) RadixMagic(COUNTER_TYP *radics, uint32_t *from, uint32_t *to, COUNTER_TYP size) noexcept inline __attribute__((always_inline)) RadixMagic(bool &swapped, COUNTER_TYP *radics, uint32_t *from, uint32_t *to, COUNTER_TYP size) noexcept
: RadixMagic<DIGIT - 1, COUNTER_TYP>(radics, from, to, size) { : RadixMagic<DIGIT - 1, COUNTER_TYP>(swapped, radics, from, to, size) {
// Tricky: see (**) // Tricky: see (**)
if(this->swapped) { // never true for DIGIT 0 if(swapped) { // never true for DIGIT 0, see (***)
std::swap(from, to); std::swap(from, to);
} }
@ -274,14 +274,13 @@ namespace MagyarSort {
//debugArr(to, size); //debugArr(to, size);
// (**) Only swaps pointers above in the child class constructor IF NEEDED :-) // (**) Only swaps pointers above in the child class constructor IF NEEDED :-)
this->swapped = !this->swapped; swapped = !swapped;
} }
}; };
/** Ends template recursion */ /** Ends template recursion */
template<typename COUNTER_TYP> template<typename COUNTER_TYP>
struct RadixMagic<-1, COUNTER_TYP> { struct RadixMagic<-1, COUNTER_TYP> {
bool swapped = false; inline RadixMagic(bool swapped, COUNTER_TYP *radics, uint32_t *&from, uint32_t *&to, COUNTER_TYP size) noexcept {}
inline RadixMagic(COUNTER_TYP *radics, uint32_t *&from, uint32_t *&to, COUNTER_TYP size) noexcept { }
}; };
/* SORT */ /* SORT */
@ -361,13 +360,15 @@ namespace MagyarSort {
uint32_t *from = arr; uint32_t *from = arr;
uint32_t *to = &arc[0]; uint32_t *to = &arc[0];
static thread_local bool swapped;
swapped = false; // must be separate line
RadixMagic<DIGITS - 1, COUNTER_TYP> r(radics, from, to, size); RadixMagic<DIGITS - 1, COUNTER_TYP> r(swapped, radics, from, to, size);
// With an other API we could spare this copy if we can delete original arr and return ptr or something... // With an other API we could spare this copy if we can delete original arr and return ptr or something...
// I am fine with this... this is not my main idea anyways, just little ILP tweak to regular radix sort // I am fine with this... this is not my main idea anyways, just little ILP tweak to regular radix sort
//if(to != arr) // <- logically, but bad they are already swapped here!!! BEWARE //if(to != arr) // <- logically, but bad they are already swapped here!!! BEWARE
if(r.swapped) { // <- in reality this is what we want because of last swap happened anyways! if(swapped) { // <- in reality this is what we want because of last swap happened anyways!
memcpy(arr, to, size); memcpy(arr, to, size);
} }
} }