3.2.3: MADV_RANDOM trick (#270)

vshcherbyna · web-flow · commit b5edcc02a748 · 2022-12-30T12:54:37.000Z
bench: 3925018
diff --git a/src/fathom/tbprobe.cpp b/src/fathom/tbprobe.cpp
@@ -355,7 +355,12 @@ static void *map_file(FD fd, map_t *mapping)
   }
   *mapping = statbuf.st_size;
   void *data = mmap(NULL, statbuf.st_size, PROT_READ,
-			      MAP_SHARED, fd, 0);
+                MAP_SHARED, fd, 0);
+
+#if defined(MADV_RANDOM)
+  madvise(data, statbuf.st_size, MADV_RANDOM);
+#endif
+
   if (data == MAP_FAILED) {
     perror("mmap");
     return NULL;
diff --git a/src/gen.cpp b/src/gen.cpp
@@ -143,7 +143,7 @@ void Generator::onGenerate()
             before_skipped   += m_workers[i].m_skipped;
         }
 
-        std::this_thread::sleep_for(60s);
+        std::this_thread::sleep_for(15s);
 
         uint64_t after_processed = 0;
         uint64_t after_skipped   = 0;
@@ -153,8 +153,8 @@ void Generator::onGenerate()
             after_skipped   += m_workers[i].m_skipped;
         }
 
-        std::cout << "[Processed " << after_processed << " FENs, " << ((after_processed - before_processed) / 60) << " per sec] [" ;
-        std::cout << "Skipped " << after_skipped << " FENs, " << ((after_skipped - before_skipped) / 60) << " per sec]" << std::endl;
+        std::cout << "[Processed " << after_processed << " FENs, " << ((after_processed - before_processed) / 15) << " per sec] [" ;
+        std::cout << "Skipped " << after_skipped << " FENs, " << ((after_skipped - before_skipped) / 15) << " per sec]" << std::endl;
 
         //
         // every epoch create a new data file
diff --git a/src/gen.h b/src/gen.h
@@ -203,7 +203,7 @@ class GenWorker
                     m_pMutex->lock();
 
                     for (auto const& i : entries) {
-                        if (i.quiet && std::abs(i.score) <= 10000) {
+                        if (i.quiet && std::abs(i.score) <= 32000) {
                             int res = 0;
                             if (result == "1-0")
                                 res = 1;
@@ -244,9 +244,10 @@ class GenWorker
                     abort();
                 }
 
-                auto ply  = m_search->m_position.Ply();
-                auto fen  = m_search->m_position.FEN();
-                auto move = MoveToStrLong(m_search->m_best);
+                auto ply   = m_search->m_position.Ply();
+                auto fen   = m_search->m_position.FEN();
+                auto move  = MoveToStrLong(m_search->m_best);
+                auto check = m_search->m_position.InCheck();
 
                 //
                 // make a move, it must be legal
@@ -275,7 +276,7 @@ class GenWorker
                     entry.move = move;
                     entry.score = m_search->m_score;
                     entry.ply = ply;
-                    entry.quiet = MoveEval::isTacticalMove(m_search->m_best) == false;
+                    entry.quiet = !check && !m_search->m_position.InCheck() && !MoveEval::isTacticalMove(m_search->m_best);
 
                     FenHashTT::instance(0).record(m_search->m_best, m_search->m_score, m_search->m_depth, ply, 0, hash);
                 }
diff --git a/src/search.cpp b/src/search.cpp
@@ -1186,7 +1186,6 @@ uint64_t Search::startSearch(Time time, int depth, bool ponderSearch, bool bench
                 depth = 0;
                 selDepth = 0;
                 pvSize = 0;
-                memset(pv, 0, sizeof(pv));
             }
             Move ponder;
             EVAL score;
diff --git a/src/uci.cpp b/src/uci.cpp
@@ -31,7 +31,7 @@
 #include <iostream>
 #include <sstream>
 
-const std::string VERSION = "3.2.2";
+const std::string VERSION = "3.2.3";
 
 #if defined(ENV64BIT)
     #if defined(_BTYPE)

Original file line number	Diff line number	Diff line change
`@@ -1186,7 +1186,6 @@ uint64_t Search::startSearch(Time time, int depth, bool ponderSearch, bool bench`
`1186`	`1186`	`depth = 0;`
`1187`	`1187`	`selDepth = 0;`
`1188`	`1188`	`pvSize = 0;`
`1189`		`- memset(pv, 0, sizeof(pv));`
`1190`	`1189`	`}`
`1191`	`1190`	`Move ponder;`
`1192`	`1191`	`EVAL score;`