Greatly speedup has_mate_threat()

Instead of loop across all legal moves to find a mate
loop across possible check moves only.

This reduces more then 10 times the number of moves to
check for a possible mate.

Also rename generate_checks() in generate_non_capture_checks()
so to better clarify what the function does.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/movegen.cpp b/src/movegen.cpp
index dff9e8c3b4624056f0642b29e152ffac3e9e12eb..b3a25806aaa5593ae064ca5d816735e4806dc628 100644 (file)
--- a/src/movegen.cpp
+++ b/src/movegen.cpp
@@ -176,10 +176,10 @@ int generate_noncaptures(const Position& pos, MoveStack* mlist) {
 }
 
 
-/// generate_checks() generates all pseudo-legal non-capturing, non-promoting
-/// checks. It returns the number of generated moves.
+/// generate_non_capture_checks() generates all pseudo-legal non-capturing,
+/// non-promoting checks. It returns the number of generated moves.
 
-int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc) {
+int generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard dc) {
 
   assert(pos.is_ok());
   assert(!pos.is_check());

diff --git a/src/movegen.h b/src/movegen.h
index 18715683ec309330ca66b6eeb449415df93662ec..c844efcd5742e69ea79219509af96369926e658e 100644 (file)
--- a/src/movegen.h
+++ b/src/movegen.h
@@ -34,7 +34,7 @@
 
 extern int generate_captures(const Position& pos, MoveStack* mlist);
 extern int generate_noncaptures(const Position& pos, MoveStack* mlist);
-extern int generate_checks(const Position& pos, MoveStack* mlist, Bitboard dc);
+extern int generate_non_capture_checks(const Position& pos, MoveStack* mlist, Bitboard dc);
 extern int generate_evasions(const Position& pos, MoveStack* mlist, Bitboard pinned);
 extern int generate_legal_moves(const Position& pos, MoveStack* mlist);
 extern bool move_is_legal(const Position& pos, const Move m, Bitboard pinned);

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 280a61a1117bea419091c05223e1a053d6efc5cd..6c3f4264dec1af0745aa575d2802f56ad39e362f 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -163,7 +163,7 @@ Move MovePicker::get_next_move() {
         break;
 
     case PH_QCHECKS:
-        numOfMoves = generate_checks(pos, moves, dc);
+        numOfMoves = generate_non_capture_checks(pos, moves, dc);
         movesPicked = 0;
         break;
 

diff --git a/src/position.cpp b/src/position.cpp
index 3e72c0e9c88c1185f6eb1a03e44fa60cd2a1a160..abe75807e2869044b05aad7b1cdfd696c31594bf 100644 (file)
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -1903,20 +1903,13 @@ bool Position::is_mate() const {
 
 
 /// Position::has_mate_threat() tests whether a given color has a mate in one
-/// from the current position. This function is quite slow, but it doesn't
-/// matter, because it is currently only called from PV nodes, which are rare.
+/// from the current position.
 
 bool Position::has_mate_threat(Color c) {
 
   StateInfo st1, st2;
   Color stm = side_to_move();
 
-  // The following lines are useless and silly, but prevents gcc from
-  // emitting a stupid warning stating that u1.lastMove and u1.epSquare might
-  // be used uninitialized.
-  st1.lastMove = st->lastMove;
-  st1.epSquare = st->epSquare;
-
   if (is_check())
       return false;
 
@@ -1927,18 +1920,26 @@ bool Position::has_mate_threat(Color c) {
   MoveStack mlist[120];
   int count;
   bool result = false;
+  Bitboard dc = discovered_check_candidates(sideToMove);
+  Bitboard pinned = pinned_pieces(sideToMove);
 
-  // Generate legal moves
-  count = generate_legal_moves(*this, mlist);
+  // Generate pseudo-legal non-capture and capture check moves
+  count = generate_non_capture_checks(*this, mlist, dc);
+  count += generate_captures(*this, mlist + count);
 
   // Loop through the moves, and see if one of them is mate
   for (int i = 0; i < count; i++)
   {
-      do_move(mlist[i].move, st2);
+      Move move = mlist[i].move;
+
+      if (!pl_move_is_legal(move, pinned))
+          continue;
+
+      do_move(move, st2);
       if (is_mate())
           result = true;
 
-      undo_move(mlist[i].move);
+      undo_move(move);
   }
 
   // Undo null move, if necessary