Revert "null move reorder" series

[stockfish] / src / movepick.cpp

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 45d989c91a80bdb0755a3516f19b64e29668b844..6b7483eb99c0a782f529b71cbb950e8aaa7a791a 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -27,7 +27,6 @@
 #include <cassert>
 
 #include "history.h"
-#include "evaluate.h"
 #include "movegen.h"
 #include "movepick.h"
 #include "search.h"
@@ -40,12 +39,8 @@
 
 namespace {
 
-  /// Variables
-
   CACHE_LINE_ALIGNMENT
-  const MovegenPhaseT MainSearchPhaseTable[] = { PH_NULL_MOVE, PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP};
-  const MovegenPhaseT MainSearchNoNullPhaseTable[] = { PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP};
-  const MovegenPhaseT LowSearchPhaseTable[]  = { PH_TT_MOVES, PH_GOOD_CAPTURES, PH_NULL_MOVE, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP};
+  const MovegenPhaseT MainSearchPhaseTable[] = { PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP};
   const MovegenPhaseT EvasionsPhaseTable[] = { PH_EVASIONS, PH_STOP};
   const MovegenPhaseT QsearchWithChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_QCHECKS, PH_STOP};
   const MovegenPhaseT QsearchWithoutChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_STOP};
@@ -57,7 +52,7 @@ namespace {
 ////
 
 
-/// Constructor for the MovePicker class.  Apart from the position for which
+/// Constructor for the MovePicker class. Apart from the position for which
 /// it is asked to pick legal moves, MovePicker also wants some information
 /// to help it to return the presumably good moves first, to decide which
 /// moves to return (in the quiescence search, for instance, we only want to
@@ -65,18 +60,18 @@ namespace {
 /// move ordering is at the current node.
 
 MovePicker::MovePicker(const Position& p, Move ttm, Depth d,
-                       const History& h, SearchStack* ss, bool useNullMove) : pos(p), H(h) {
-  ttMoves[0] = ttm;
+                       const History& h, SearchStack* ss) : pos(p), H(h) {
+  ttMoves[0].move = ttm;
   if (ss)
   {
-      ttMoves[1] = (ss->mateKiller == ttm)? MOVE_NONE : ss->mateKiller;
-      killers[0] = ss->killers[0];
-      killers[1] = ss->killers[1];
+      ttMoves[1].move = (ss->mateKiller == ttm)? MOVE_NONE : ss->mateKiller;
+      killers[0].move = ss->killers[0];
+      killers[1].move = ss->killers[1];
   } else
-      ttMoves[1] = killers[0] = killers[1] = MOVE_NONE;
+      ttMoves[1].move = killers[0].move = killers[1].move = MOVE_NONE;
 
-  numOfBadCaptures = 0;
   finished = false;
+  numOfBadCaptures = 0;
 
   Color us = pos.side_to_move();
 
@@ -85,10 +80,8 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d,
 
   if (p.is_check())
       phasePtr = EvasionsPhaseTable;
-  else if (d >= Depth(3 * OnePly))
-      phasePtr = useNullMove ? MainSearchPhaseTable : MainSearchNoNullPhaseTable;
   else if (d > Depth(0))
-      phasePtr = useNullMove ? LowSearchPhaseTable : MainSearchNoNullPhaseTable;
+      phasePtr = MainSearchPhaseTable;
   else if (d == Depth(0))
       phasePtr = QsearchWithChecksPhaseTable;
   else
@@ -108,9 +101,9 @@ void MovePicker::go_next_phase() {
   phase = *(++phasePtr);
   switch (phase) {
 
-  case PH_NULL_MOVE:
   case PH_TT_MOVES:
-      movesPicked = 0;
+      curMove = ttMoves;
+      lastMove = curMove + 2;
       return;
 
   case PH_GOOD_CAPTURES:
@@ -120,7 +113,8 @@ void MovePicker::go_next_phase() {
       return;
 
   case PH_KILLERS:
-      movesPicked = 0;
+      curMove = killers;
+      lastMove = curMove + 2;
       return;
 
   case PH_NONCAPTURES:
@@ -202,14 +196,16 @@ void MovePicker::score_noncaptures() {
   // First score by history, when no history is available then use
   // piece/square tables values. This seems to be better then a
   // random choice when we don't have an history for any move.
+  Move m;
   Piece piece;
   Square from, to;
   int hs;
 
   for (MoveStack* cur = moves; cur != lastMove; cur++)
   {
-      from = move_from(cur->move);
-      to = move_to(cur->move);
+      m = cur->move;
+      from = move_from(m);
+      to = move_to(m);
       piece = pos.piece_on(from);
       hs = H.move_ordering_score(piece, to);
 
@@ -224,15 +220,17 @@ void MovePicker::score_noncaptures() {
 
 void MovePicker::score_evasions() {
 
+  Move m;
+
   for (MoveStack* cur = moves; cur != lastMove; cur++)
   {
-      Move m = cur->move;
-      if (m == ttMoves[0])
-          cur->score = 2*HistoryMax;
+      m = cur->move;
+      if (m == ttMoves[0].move)
+          cur->score = 2 * HistoryMax;
       else if (!pos.square_is_empty(move_to(m)))
       {
           int seeScore = pos.see(m);
-          cur->score = (seeScore >= 0)? seeScore + HistoryMax : seeScore;
+          cur->score = seeScore + (seeScore >= 0 ? HistoryMax : 0);
       } else
           cur->score = H.move_ordering_score(pos.piece_on(move_from(m)), move_to(m));
   }
@@ -253,14 +251,10 @@ Move MovePicker::get_next_move() {
   {
       switch (phase) {
 
-      case PH_NULL_MOVE:
-          go_next_phase();
-          return MOVE_NULL;
-
       case PH_TT_MOVES:
-          while (movesPicked < 2)
+          while (curMove != lastMove)
           {
-              Move move = ttMoves[movesPicked++];
+              Move move = (curMove++)->move;
               if (   move != MOVE_NONE
                   && move_is_legal(pos, move, pinned))
                   return move;
@@ -271,8 +265,8 @@ Move MovePicker::get_next_move() {
           while (curMove != lastMove)
           {
               Move move = (curMove++)->move;
-              if (   move != ttMoves[0]
-                  && move != ttMoves[1]
+              if (   move != ttMoves[0].move
+                  && move != ttMoves[1].move
                   && pos.pl_move_is_legal(move, pinned))
               {
                   // Check for a non negative SEE now
@@ -290,12 +284,12 @@ Move MovePicker::get_next_move() {
           break;
 
       case PH_KILLERS:
-          while (movesPicked < 2)
+          while (curMove != lastMove)
           {
-              Move move = killers[movesPicked++];
+              Move move = (curMove++)->move;
               if (   move != MOVE_NONE
-                  && move != ttMoves[0]
-                  && move != ttMoves[1]
+                  && move != ttMoves[0].move
+                  && move != ttMoves[1].move
                   && move_is_legal(pos, move, pinned)
                   && !pos.move_is_capture(move))
                   return move;
@@ -306,10 +300,10 @@ Move MovePicker::get_next_move() {
           while (curMove != lastMove)
           {
               Move move = (curMove++)->move;
-              if (   move != ttMoves[0]
-                  && move != ttMoves[1]
-                  && move != killers[0]
-                  && move != killers[1]
+              if (   move != ttMoves[0].move
+                  && move != ttMoves[1].move
+                  && move != killers[0].move
+                  && move != killers[1].move
                   && pos.pl_move_is_legal(move, pinned))
                   return move;
           }
@@ -327,7 +321,7 @@ Move MovePicker::get_next_move() {
           {
               Move move = (curMove++)->move;
               // Maybe postpone the legality check until after futility pruning?
-              if (   move != ttMoves[0]
+              if (   move != ttMoves[0].move
                   && pos.pl_move_is_legal(move, pinned))
                   return move;
           }
@@ -342,7 +336,6 @@ Move MovePicker::get_next_move() {
       }
       go_next_phase();
   }
-  return MOVE_NONE;
 }
 
 /// A variant of get_next_move() which takes a lock as a parameter, used to