Remove unnecessary generation check in TT save

[stockfish] / src / tt.h

diff --git a/src/tt.h b/src/tt.h
index 48c5638a7d971d1ed3c581a37b7a87529948d462..dd667841419f26b0b0c82b3638049f86afba2565 100644 (file)
--- a/src/tt.h
+++ b/src/tt.h
@@ -43,34 +43,22 @@ struct TTEntry {
 
   void save(Key k, Value v, Bound b, Depth d, Move m, Value ev, uint8_t g) {
 
-      if (key16 != (k >> 48))
-      {
-          key16     = (uint16_t)(k >> 48);
-          move16    = (uint16_t)m;
-          value16   = (int16_t)v;
-          eval16    = (int16_t)ev;
-          genBound8 = (uint8_t)(g | b);
-          depth8    = (int8_t)d;
-      }
-      else
-      {
-          // Preserve any existing move for the same position
-          if (m)
-              move16 = (uint16_t)m;
-
-          // Don't overwrite more valuable values
-          if (   d + 2 > depth8 
-              || g != (genBound8 & 0xFC) 
-              || b == BOUND_EXACT)
-          {
-              value16   = (int16_t)v;
-              genBound8 = (uint8_t)(g | b);
-              depth8    = (int8_t)d;
-          }
-
-          if (ev != VALUE_NONE)
-              eval16 = (int16_t)ev;
-      }
+    // Preserve any existing move for the same position
+    if (m || (k >> 48) != key16)
+        move16 = (uint16_t)m;
+
+    // Don't overwrite more valuable entries
+    if (  (k >> 48) != key16
+        || d > depth8 - 2
+     /* || g != (genBound8 & 0xFC) // Any matching keys are already refreshed by probe() */
+        || b == BOUND_EXACT)
+    {
+        key16     = (uint16_t)(k >> 48);
+        value16   = (int16_t)v;
+        eval16    = (int16_t)ev;
+        genBound8 = (uint8_t)(g | b);
+        depth8    = (int8_t)d;
+    }
   }
 
 private: