Merge remote-tracking branch 'upstream/master' into HEAD

[stockfish] / src / syzygy / tbprobe.cpp

diff --git a/src/syzygy/tbprobe.cpp b/src/syzygy/tbprobe.cpp
index 61ba8121959ae61b0b8de296b1022730f424386d..28b70a4a10714e825be6c23f893dc570daf508da 100644 (file)
--- a/src/syzygy/tbprobe.cpp
+++ b/src/syzygy/tbprobe.cpp
@@ -223,7 +223,9 @@ public:
 
         *mapping = statbuf.st_size;
         *baseAddress = mmap(nullptr, statbuf.st_size, PROT_READ, MAP_SHARED, fd, 0);
 
         *mapping = statbuf.st_size;
         *baseAddress = mmap(nullptr, statbuf.st_size, PROT_READ, MAP_SHARED, fd, 0);

+#if defined(MADV_RANDOM)

         madvise(*baseAddress, statbuf.st_size, MADV_RANDOM);
         madvise(*baseAddress, statbuf.st_size, MADV_RANDOM);

+#endif

         ::close(fd);
 
         if (*baseAddress == MAP_FAILED)
         ::close(fd);
 
         if (*baseAddress == MAP_FAILED)


@@ -758,7 +760,7 @@ Ret do_probe_table(const Position& pos, T* entry, WDLScore wdl, ProbeState* resu
     if (entry->hasPawns) {
         idx = LeadPawnIdx[leadPawnsCnt][squares[0]];
 
     if (entry->hasPawns) {
         idx = LeadPawnIdx[leadPawnsCnt][squares[0]];
 

-        std::sort(squares + 1, squares + leadPawnsCnt, pawns_comp);
+        std::stable_sort(squares + 1, squares + leadPawnsCnt, pawns_comp);

 
         for (int i = 1; i < leadPawnsCnt; ++i)
             idx += Binomial[i][MapPawns[squares[i]]];
 
         for (int i = 1; i < leadPawnsCnt; ++i)
             idx += Binomial[i][MapPawns[squares[i]]];


@@ -859,7 +861,7 @@ encode_remaining:
 
     while (d->groupLen[++next])
     {
 
     while (d->groupLen[++next])
     {

-        std::sort(groupSq, groupSq + d->groupLen[next]);
+        std::stable_sort(groupSq, groupSq + d->groupLen[next]);

         uint64_t n = 0;
 
         // Map down a square if "comes later" than a square in the previous
         uint64_t n = 0;
 
         // Map down a square if "comes later" than a square in the previous