This not only cleans up the code but gives another
speed boost of 1.8%
From revision
595a90dfd0 we have increased pgo compiled binary
speed of a whopping +5.2% without any functional change !!
This is really awsome considering that we have also
cut line count by 25 lines.
Sometime we spend days for getting an extra 1% from move
generation while instead the biggest optimizations come
from anonymous and apparently dull parts of the code.
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
+ lastMove = curMove + 1; // hack to be friendly for get_next_move()
assert(!pos.is_check() || *phasePtr == PH_EVASIONS || *phasePtr == PH_STOP);
assert( pos.is_check() || *phasePtr != PH_EVASIONS);
assert(!pos.is_check() || *phasePtr == PH_EVASIONS || *phasePtr == PH_STOP);
assert( pos.is_check() || *phasePtr != PH_EVASIONS);
+ while (curMove != lastMove)
+ {
+ move = (curMove++)->move;
+
+ switch (phase) {
- case PH_TT_MOVES:
- while (curMove != lastMove)
- {
- Move move = (curMove++)->move;
if ( move != MOVE_NONE
&& move_is_legal(pos, move, pinned))
return move;
if ( move != MOVE_NONE
&& move_is_legal(pos, move, pinned))
return move;
- case PH_GOOD_CAPTURES:
- while (curMove != lastMove)
- {
- Move move = (curMove++)->move;
if ( move != ttMoves[0].move
&& move != ttMoves[1].move
&& pos.pl_move_is_legal(move, pinned))
if ( move != ttMoves[0].move
&& move != ttMoves[1].move
&& pos.pl_move_is_legal(move, pinned))
badCaptures[numOfBadCaptures].move = move;
badCaptures[numOfBadCaptures++].score = seeValue;
}
badCaptures[numOfBadCaptures].move = move;
badCaptures[numOfBadCaptures++].score = seeValue;
}
- case PH_KILLERS:
- while (curMove != lastMove)
- {
- Move move = (curMove++)->move;
if ( move != MOVE_NONE
&& move != ttMoves[0].move
&& move != ttMoves[1].move
&& move_is_legal(pos, move, pinned)
&& !pos.move_is_capture(move))
return move;
if ( move != MOVE_NONE
&& move != ttMoves[0].move
&& move != ttMoves[1].move
&& move_is_legal(pos, move, pinned)
&& !pos.move_is_capture(move))
return move;
- case PH_NONCAPTURES:
- while (curMove != lastMove)
- {
- Move move = (curMove++)->move;
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;
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;
- }
- break;
-
- case PH_EVASIONS:
- case PH_BAD_CAPTURES:
- if (curMove != lastMove)
- return (curMove++)->move;
- break;
-
- case PH_QCAPTURES:
- case PH_QCHECKS:
- while (curMove != lastMove)
- {
- Move move = (curMove++)->move;
+ break;
+
+ case PH_EVASIONS:
+ case PH_BAD_CAPTURES:
+ return move;
+
+ case PH_QCAPTURES:
+ case PH_QCHECKS:
// Maybe postpone the legality check until after futility pruning?
if ( move != ttMoves[0].move
&& pos.pl_move_is_legal(move, pinned))
return move;
// Maybe postpone the legality check until after futility pruning?
if ( move != ttMoves[0].move
&& pos.pl_move_is_legal(move, pinned))
return move;
- case PH_STOP:
- return MOVE_NONE;
+ case PH_STOP:
+ return MOVE_NONE;
- default:
- assert(false);
- break;
+ default:
+ assert(false);
+ break;
+ }