Check if key matches for Hash move (#49)

Aryan1508 · web-flow · commit 75a4cc8bf52c · 2021-06-21T21:23:39.000+05:30
Bench: 29013338
diff --git a/Bit-Genie/src/moveorder.cpp b/Bit-Genie/src/moveorder.cpp
@@ -88,11 +88,6 @@ static int16_t see(Position &position, Move move)
     return scores[0];
 }
 
-static Move get_hash_move(Position &position, TTable &tt)
-{
-    return (Move)tt.retrieve(position).move;
-}
-
 template <bool quiet = false>
 static void order_normal_movelist(Position &position, Movelist &movelist, Search &search)
 {
@@ -129,11 +124,11 @@ bool MovePicker::next(Move &move)
     if (stage == Stage::HashMove)
     {
         stage = Stage::GenNoisy;
-        Move hash_move = get_hash_move(*position, *table);
-
-        if (can_move(hash_move))
+        auto& entry = table->retrieve(*position);
+        
+        if (entry.hash == position->key.data() && can_move((Move)entry.move))
         {
-            move = hash_move;
+            move = (Move)entry.move;
             return true;
         }
     }
diff --git a/Bit-Genie/src/uci.cpp b/Bit-Genie/src/uci.cpp
@@ -25,7 +25,7 @@
 #include "benchmark.h"
 #include "searchinit.h"
 
-const char *version = "5.55";
+const char *version = "5.6";
 
 namespace
 {

Original file line number	Diff line number	Diff line change
`@@ -88,11 +88,6 @@ static int16_t see(Position &position, Move move)`
`88`	`88`	`return scores[0];`
`89`	`89`	`}`
`90`	`90`
`91`		`-static Move get_hash_move(Position &position, TTable &tt)`
`92`		`-{`
`93`		`- return (Move)tt.retrieve(position).move;`
`94`		`-}`
`95`		`-`
`96`	`91`	`template <bool quiet = false>`
`97`	`92`	`static void order_normal_movelist(Position &position, Movelist &movelist, Search &search)`
`98`	`93`	`{`
`@@ -129,11 +124,11 @@ bool MovePicker::next(Move &move)`
`129`	`124`	`if (stage == Stage::HashMove)`
`130`	`125`	`{`
`131`	`126`	`stage = Stage::GenNoisy;`
`132`		`- Move hash_move = get_hash_move(position, table);`
`133`		`-`
`134`		`- if (can_move(hash_move))`
	`127`	`+ auto& entry = table->retrieve(*position);`
	`128`	`+`
	`129`	`+ if (entry.hash == position->key.data() && can_move((Move)entry.move))`
`135`	`130`	`{`
`136`		`- move = hash_move;`
	`131`	`+ move = (Move)entry.move;`
`137`	`132`	`return true;`
`138`	`133`	`}`
`139`	`134`	`}`