Don't prune TT move in qsearch even if SEE < 0

[stockfish] / src / search.cpp

diff --git a/src/search.cpp b/src/search.cpp
index 13affe1b2f06e0a30fd95b5ea5548aad61c3c524..32b37413ae83f7ed1a2e39c22c80a1de45de602b 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -1596,6 +1596,7 @@ namespace {
 
       // Don't search captures and checks with negative SEE values
       if (   !isCheck
+          &&  move != ttMove
           && !move_is_promotion(move)
           &&  pos.see_sign(move) < 0)
           continue;
@@ -1622,7 +1623,7 @@ namespace {
 
     // All legal moves have been searched.  A special case: If we're in check
     // and no legal moves were found, it is checkmate.
-    if (pos.is_check() && moveCount == 0) // Mate!
+    if (!moveCount && pos.is_check()) // Mate!
         return value_mated_in(ply);
 
     assert(bestValue > -VALUE_INFINITE && bestValue < VALUE_INFINITE);
@@ -1759,21 +1760,24 @@ namespace {
           break;
 
       // New best move?
-      lock_grab(&(sp->lock));
-      if (value > sp->bestValue && !thread_should_stop(threadID))
+      if (value > sp->bestValue) // Less then 2% of cases
       {
-          sp->bestValue = value;
-          if (sp->bestValue >= sp->beta)
+          lock_grab(&(sp->lock));
+          if (value > sp->bestValue && !thread_should_stop(threadID))
           {
-              sp_update_pv(sp->parentSstack, ss, sp->ply);
-              for (int i = 0; i < ActiveThreads; i++)
-                  if (i != threadID && (i == sp->master || sp->slaves[i]))
-                      Threads[i].stop = true;
+              sp->bestValue = value;
+              if (sp->bestValue >= sp->beta)
+              {
+                  sp_update_pv(sp->parentSstack, ss, sp->ply);
+                  for (int i = 0; i < ActiveThreads; i++)
+                      if (i != threadID && (i == sp->master || sp->slaves[i]))
+                          Threads[i].stop = true;
 
-              sp->finished = true;
-        }
+                  sp->finished = true;
+              }
+          }
+          lock_release(&(sp->lock));
       }
-      lock_release(&(sp->lock));
     }
 
     lock_grab(&(sp->lock));