Revert previous patch

It seems a regression at 15+0.05:
ELO: -4.82 +-2.1 (95%) LOS: 0.0%
Total: 40000 W: 7181 L: 7736 D: 25083

bench: 8331357

diff --git a/src/movepick.cpp b/src/movepick.cpp
index c4eaa902e292e64cdea5858f4f9ae3318f07ec92..8baf32a4cfa6e9c814c1c76684713206dbaab475 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -140,15 +140,6 @@ MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, Piece
 }
 
 
-/// quiet_moves() returns a pointer to the beginning of moves array. It
-/// is used to access already tried quiet moves when updating history.
-
-const ExtMove* MovePicker::quiet_moves() const {
-  return  stage == KILLERS_S1 ? killers
-        : stage == QUIETS_1_S1 || stage == QUIETS_2_S1 ? moves : NULL;
-}
-
-
 /// score() assign a numerical move ordering score to each move in a move list.
 /// The moves with highest scores will be picked first.
 template<>

diff --git a/src/movepick.h b/src/movepick.h
index 3d4614cde0018a793f417a17470e0c655f88f468..c444615f5b9f2e8ab4a0952ff47e3c97bf642079 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -88,7 +88,6 @@ public:
   MovePicker(const Position&, Move, const HistoryStats&, PieceType);
   MovePicker(const Position&, Move, Depth, const HistoryStats&, Move*, Search::Stack*);
 
-  const ExtMove* quiet_moves() const;
   template<bool SpNode> Move next_move();
 
 private:

diff --git a/src/search.cpp b/src/search.cpp
index 39e4be3d8ae0bb1f8958b8647704a4deb0875858..f1ab80f29294e20401fb93e9736b3b2b679668de 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -484,6 +484,7 @@ namespace {
     assert(PvNode || (alpha == beta - 1));
     assert(depth > DEPTH_ZERO);
 
+    Move quietsSearched[64];
     StateInfo st;
     const TTEntry *tte;
     SplitPoint* splitPoint;
@@ -493,7 +494,7 @@ namespace {
     Value bestValue, value, ttValue, eval, nullValue, futilityValue;
     bool inCheck, givesCheck, pvMove, singularExtensionNode, improving;
     bool captureOrPromotion, dangerous, doFullDepthSearch;
-    int moveCount;
+    int moveCount, quietCount;
 
     // Step 1. Initialize node
     Thread* thisThread = pos.this_thread();
@@ -514,7 +515,7 @@ namespace {
         goto moves_loop;
     }
 
-    moveCount = 0;
+    moveCount = quietCount = 0;
     bestValue = -VALUE_INFINITE;
     ss->currentMove = threatMove = (ss+1)->excludedMove = bestMove = MOVE_NONE;
     ss->ply = (ss-1)->ply + 1;
@@ -900,6 +901,8 @@ moves_loop: // When in check and at SpNode search starts from here
 
       pvMove = PvNode && moveCount == 1;
       ss->currentMove = move;
+      if (!SpNode && !captureOrPromotion && quietCount < 64)
+          quietsSearched[quietCount++] = move;
 
       // Step 14. Make the move
       pos.do_move(move, st, ci, givesCheck);
@@ -1074,9 +1077,11 @@ moves_loop: // When in check and at SpNode search starts from here
         // played non-capture moves.
         Value bonus = Value(int(depth) * int(depth));
         History.update(pos.moved_piece(bestMove), to_sq(bestMove), bonus);
-
-        for (const ExtMove* em = mp.quiet_moves(); em && em->move != bestMove; ++em)
-            History.update(pos.moved_piece(em->move), to_sq(em->move), -bonus);
+        for (int i = 0; i < quietCount - 1; ++i)
+        {
+            Move m = quietsSearched[i];
+            History.update(pos.moved_piece(m), to_sq(m), -bonus);
+        }
 
         if (is_ok((ss-1)->currentMove))
             Countermoves.update(pos.piece_on(prevMoveSq), prevMoveSq, bestMove);