100% accurate PV display

[stockfish] / src / search.cpp

diff --git a/src/search.cpp b/src/search.cpp
index 63481d367e260f1292978aee0fc96cd61ea4d926..376705d1d4118e97ed3af675c5c243f5629dc0b5 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -394,6 +394,7 @@ namespace {
     assert(PvNode || (alpha == beta - 1));
     assert(depth > DEPTH_ZERO);
 
     assert(PvNode || (alpha == beta - 1));
     assert(depth > DEPTH_ZERO);
 

+    PVEntry pv;

     Move quietsSearched[64];
     StateInfo st;
     const TTEntry *tte;
     Move quietsSearched[64];
     StateInfo st;
     const TTEntry *tte;


@@ -469,13 +470,12 @@ namespace {
     // a fail high/low. The biggest advantage to probing at PV nodes is to have a
     // smooth experience in analysis mode. We don't probe at Root nodes otherwise
     // we should also update RootMoveList to avoid bogus output.
     // a fail high/low. The biggest advantage to probing at PV nodes is to have a
     // smooth experience in analysis mode. We don't probe at Root nodes otherwise
     // we should also update RootMoveList to avoid bogus output.

-    if (   !RootNode
+    if (   !PvNode

         && tte
         && tte->depth() >= depth
         && ttValue != VALUE_NONE // Only in case of TT access race
         && tte
         && tte->depth() >= depth
         && ttValue != VALUE_NONE // Only in case of TT access race

-        && (           PvNode ?  tte->bound() == BOUND_EXACT
-            : ttValue >= beta ? (tte->bound() &  BOUND_LOWER)
-                              : (tte->bound() &  BOUND_UPPER)))
+        && (ttValue >= beta ? (tte->bound() & BOUND_LOWER)
+                            : (tte->bound() & BOUND_UPPER)))

     {
         ss->currentMove = ttMove; // Can be MOVE_NONE
 
     {
         ss->currentMove = ttMove; // Can be MOVE_NONE
 


@@ -699,6 +699,9 @@ moves_loop: // When in check and at SpNode search starts from here
                         << " currmovenumber " << moveCount + PVIdx << sync_endl;
       }
 
                         << " currmovenumber " << moveCount + PVIdx << sync_endl;
       }
 

+      if (PvNode)
+          (ss+1)->pv = NULL;
+

       ext = DEPTH_ZERO;
       captureOrPromotion = pos.capture_or_promotion(move);
 
       ext = DEPTH_ZERO;
       captureOrPromotion = pos.capture_or_promotion(move);
 


@@ -862,11 +865,14 @@ moves_loop: // When in check and at SpNode search starts from here
       // For PV nodes only, do a full PV search on the first move or after a fail
       // high (in the latter case search only if value < beta), otherwise let the
       // parent node fail low with value <= alpha and to try another move.
       // For PV nodes only, do a full PV search on the first move or after a fail
       // high (in the latter case search only if value < beta), otherwise let the
       // parent node fail low with value <= alpha and to try another move.

-      if (PvNode && (moveCount == 1 || (value > alpha && (RootNode || value < beta))))
+      if (PvNode && (moveCount == 1 || (value > alpha && (RootNode || value < beta)))) {
+          pv.pv[0] = MOVE_NONE;
+          (ss+1)->pv = &pv;

           value = newDepth <   ONE_PLY ?
                             givesCheck ? -qsearch<PV,  true>(pos, ss+1, -beta, -alpha, DEPTH_ZERO)
                                        : -qsearch<PV, false>(pos, ss+1, -beta, -alpha, DEPTH_ZERO)
                                        : - search<PV, false>(pos, ss+1, -beta, -alpha, newDepth, false);
           value = newDepth <   ONE_PLY ?
                             givesCheck ? -qsearch<PV,  true>(pos, ss+1, -beta, -alpha, DEPTH_ZERO)
                                        : -qsearch<PV, false>(pos, ss+1, -beta, -alpha, DEPTH_ZERO)
                                        : - search<PV, false>(pos, ss+1, -beta, -alpha, newDepth, false);

+      }

       // Step 17. Undo move
       pos.undo_move(move);
 
       // Step 17. Undo move
       pos.undo_move(move);
 


@@ -894,7 +900,9 @@ moves_loop: // When in check and at SpNode search starts from here
           if (moveCount == 1 || value > alpha)
           {
               rm.score = value;
           if (moveCount == 1 || value > alpha)
           {
               rm.score = value;

-              rm.extract_pv_from_tt(pos);
+              rm.pv.resize(1);
+              for (int i = 0; (ss+1)->pv && i < MAX_PLY && (ss+1)->pv->pv[i] != MOVE_NONE; ++i)
+                  rm.pv.push_back((ss+1)->pv->pv[i]);

 
               // We record how often the best move has been changed in each
               // iteration. This information is used for time management: When
 
               // We record how often the best move has been changed in each
               // iteration. This information is used for time management: When


@@ -917,6 +925,12 @@ moves_loop: // When in check and at SpNode search starts from here
           {
               bestMove = SpNode ? splitPoint->bestMove = move : move;
 
           {
               bestMove = SpNode ? splitPoint->bestMove = move : move;
 

+              if (NT == PV) {
+                  ss->pv->update(move, (ss+1)->pv);
+                  if (SpNode)
+                      splitPoint->ss->pv->update(move, (ss+1)->pv);
+              }
+

               if (PvNode && value < beta) // Update alpha! Always alpha < beta
                   alpha = SpNode ? splitPoint->alpha = value : value;
               else
               if (PvNode && value < beta) // Update alpha! Always alpha < beta
                   alpha = SpNode ? splitPoint->alpha = value : value;
               else


@@ -1001,6 +1015,7 @@ moves_loop: // When in check and at SpNode search starts from here
     assert(PvNode || (alpha == beta - 1));
     assert(depth <= DEPTH_ZERO);
 
     assert(PvNode || (alpha == beta - 1));
     assert(depth <= DEPTH_ZERO);
 

+    PVEntry pv;

     StateInfo st;
     const TTEntry* tte;
     Key posKey;
     StateInfo st;
     const TTEntry* tte;
     Key posKey;


@@ -1009,10 +1024,14 @@ moves_loop: // When in check and at SpNode search starts from here
     bool givesCheck, evasionPrunable;
     Depth ttDepth;
 
     bool givesCheck, evasionPrunable;
     Depth ttDepth;
 

-    // To flag BOUND_EXACT a node with eval above alpha and no available moves
-    if (PvNode)
+    if (PvNode) {
+        // To flag BOUND_EXACT a node with eval above alpha and no available moves

         oldAlpha = alpha;
 
         oldAlpha = alpha;
 

+        (ss+1)->pv = &pv;
+        ss->pv->pv[0] = MOVE_NONE;
+    }
+

     ss->currentMove = bestMove = MOVE_NONE;
     ss->ply = (ss-1)->ply + 1;
 
     ss->currentMove = bestMove = MOVE_NONE;
     ss->ply = (ss-1)->ply + 1;
 


@@ -1034,12 +1053,12 @@ moves_loop: // When in check and at SpNode search starts from here
     ttMove = tte ? tte->move() : MOVE_NONE;
     ttValue = tte ? value_from_tt(tte->value(),ss->ply) : VALUE_NONE;
 
     ttMove = tte ? tte->move() : MOVE_NONE;
     ttValue = tte ? value_from_tt(tte->value(),ss->ply) : VALUE_NONE;
 

-    if (   tte
+    if (  !PvNode 
+        && tte

         && tte->depth() >= ttDepth
         && ttValue != VALUE_NONE // Only in case of TT access race
         && tte->depth() >= ttDepth
         && ttValue != VALUE_NONE // Only in case of TT access race

-        && (           PvNode ?  tte->bound() == BOUND_EXACT
-            : ttValue >= beta ? (tte->bound() &  BOUND_LOWER)
-                              : (tte->bound() &  BOUND_UPPER)))
+        && (ttValue >= beta ? (tte->bound() &  BOUND_LOWER)
+                            : (tte->bound() &  BOUND_UPPER)))

     {
         ss->currentMove = ttMove; // Can be MOVE_NONE
         return ttValue;
     {
         ss->currentMove = ttMove; // Can be MOVE_NONE
         return ttValue;


@@ -1161,6 +1180,9 @@ moves_loop: // When in check and at SpNode search starts from here
 
           if (value > alpha)
           {
 
           if (value > alpha)
           {

+              if (PvNode)
+                  ss->pv->update(move, &pv);
+

               if (PvNode && value < beta) // Update alpha here! Always alpha < beta
               {
                   alpha = value;
               if (PvNode && value < beta) // Update alpha here! Always alpha < beta
               {
                   alpha = value;


@@ -1331,7 +1353,7 @@ moves_loop: // When in check and at SpNode search starts from here
            << " time "      << elapsed
            << " pv";
 
            << " time "      << elapsed
            << " pv";
 

-        for (size_t j = 0; RootMoves[i].pv[j] != MOVE_NONE; ++j)
+        for (size_t j = 0; j < RootMoves[i].pv.size(); ++j)

             ss << " " << UCI::format_move(RootMoves[i].pv[j], pos.is_chess960());
     }
 
             ss << " " << UCI::format_move(RootMoves[i].pv[j], pos.is_chess960());
     }
 


@@ -1341,43 +1363,6 @@ moves_loop: // When in check and at SpNode search starts from here
 } // namespace
 
 
 } // namespace
 
 

-/// RootMove::extract_pv_from_tt() builds a PV by adding moves from the TT table.
-/// We also consider both failing high nodes and BOUND_EXACT nodes here to
-/// ensure that we have a ponder move even when we fail high at root. This
-/// results in a long PV to print that is important for position analysis.
-
-void RootMove::extract_pv_from_tt(Position& pos) {
-
-  StateInfo state[MAX_PLY], *st = state;
-  const TTEntry* tte;
-  int ply = 1;    // At root ply is 1...
-  Move m = pv[0]; // ...instead pv[] array starts from 0
-  Value expectedScore = score;
-
-  pv.clear();
-
-  do {
-      pv.push_back(m);
-
-      assert(MoveList<LEGAL>(pos).contains(pv[ply - 1]));
-
-      pos.do_move(pv[ply++ - 1], *st++);
-      tte = TT.probe(pos.key());
-      expectedScore = -expectedScore;
-
-  } while (   tte
-           && expectedScore == value_from_tt(tte->value(), ply)
-           && pos.pseudo_legal(m = tte->move()) // Local copy, TT could change
-           && pos.legal(m, pos.pinned_pieces(pos.side_to_move()))
-           && ply < MAX_PLY
-           && (!pos.is_draw() || ply <= 2));
-
-  pv.push_back(MOVE_NONE); // Must be zero-terminating
-
-  while (--ply) pos.undo_move(pv[ply - 1]);
-}
-
-

 /// RootMove::insert_pv_in_tt() is called at the end of a search iteration, and
 /// inserts the PV back into the TT. This makes sure the old PV moves are searched
 /// first, even if the old TT entries have been overwritten.
 /// RootMove::insert_pv_in_tt() is called at the end of a search iteration, and
 /// inserts the PV back into the TT. This makes sure the old PV moves are searched
 /// first, even if the old TT entries have been overwritten.


@@ -1386,19 +1371,17 @@ void RootMove::insert_pv_in_tt(Position& pos) {
 
   StateInfo state[MAX_PLY], *st = state;
   const TTEntry* tte;
 
   StateInfo state[MAX_PLY], *st = state;
   const TTEntry* tte;

-  int idx = 0; // Ply starts from 1, we need to start from 0
+  int idx = 0;

 
 

-  do {
+  for (; idx < int(pv.size()); ++idx) {

       tte = TT.probe(pos.key());
 
       if (!tte || tte->move() != pv[idx]) // Don't overwrite correct entries
           TT.store(pos.key(), VALUE_NONE, BOUND_NONE, DEPTH_NONE, pv[idx], VALUE_NONE);
 
       assert(MoveList<LEGAL>(pos).contains(pv[idx]));
       tte = TT.probe(pos.key());
 
       if (!tte || tte->move() != pv[idx]) // Don't overwrite correct entries
           TT.store(pos.key(), VALUE_NONE, BOUND_NONE, DEPTH_NONE, pv[idx], VALUE_NONE);
 
       assert(MoveList<LEGAL>(pos).contains(pv[idx]));

-
-      pos.do_move(pv[idx++], *st++);
-
-  } while (pv[idx] != MOVE_NONE);
+      pos.do_move(pv[idx], *st++);
+  }

 
   while (idx) pos.undo_move(pv[--idx]);
 }
 
   while (idx) pos.undo_move(pv[--idx]);
 }