Fix bug with Accum resets on weight loading

AndyGrant · AndyGrant · commit 1a71fe486e0e · 2023-10-14T00:16:14.000-04:00
No functional change

Bench 3271193
diff --git a/src/nnue/accumulator.h b/src/nnue/accumulator.h
@@ -31,26 +31,33 @@ extern ALIGN64 int16_t in_weights[INSIZE * KPSIZE];
 extern ALIGN64 int16_t in_biases[KPSIZE];
 
 INLINE NNUEEvaluator* nnue_create_evaluator() {
+    return align_malloc(sizeof(NNUEEvaluator));
+}
 
-    NNUEEvaluator* nnue = align_malloc(sizeof(NNUEEvaluator));
+INLINE void nnue_reset_evaluator(NNUEEvaluator* ptr) {
 
     #if USE_NNUE
 
-    for (size_t i = 0; i < SQUARE_NB; i++) {
-        memset(nnue->table[i].occupancy, 0, sizeof(nnue->table[i].occupancy));
-        memcpy(nnue->table[i].accumulator.values[WHITE], in_biases, sizeof(int16_t) * KPSIZE);
-        memcpy(nnue->table[i].accumulator.values[BLACK], in_biases, sizeof(int16_t) * KPSIZE);
-    }
+        // Reset the Finny table Accumulators
+        for (size_t i = 0; i < SQUARE_NB; i++) {
+            memset(ptr->table[i].occupancy, 0, sizeof(ptr->table[i].occupancy));
+            memcpy(ptr->table[i].accumulator.values[WHITE], in_biases, sizeof(int16_t) * KPSIZE);
+            memcpy(ptr->table[i].accumulator.values[BLACK], in_biases, sizeof(int16_t) * KPSIZE);
+        }
 
-    #endif
+        // Reset the base of the Accumulator stack
+        ptr->current = &ptr->stack[0];
+        ptr->current->accurate[WHITE] = 0;
+        ptr->current->accurate[BLACK] = 0;
 
-    return nnue;
+    #endif
 }
 
-INLINE void nnue_delete_accumulators(NNUEEvaluator* ptr) {
+INLINE void nnue_delete_evaluator(NNUEEvaluator* ptr) {
     align_free(ptr);
 }
 
+
 INLINE void nnue_pop(Board *board) {
     if (USE_NNUE && board->thread != NULL)
         --board->thread->nnue->current;
diff --git a/src/thread.c b/src/thread.c
@@ -58,7 +58,7 @@ Thread* createThreadPool(int nthreads) {
 void deleteThreadPool(Thread *threads) {
 
     for (int i = 0; i < threads->nthreads; i++)
-        nnue_delete_accumulators(threads[i].nnue);
+        nnue_delete_evaluator(threads[i].nnue);
 
     free(threads);
 }
@@ -100,12 +100,8 @@ void newSearchThreadPool(Thread *threads, Board *board, Limits *limits, TimeMana
         memcpy(&threads[i].board, board, sizeof(Board));
         threads[i].board.thread = &threads[i];
 
-        // Reset the accumulator stack. The table can remain
-        threads[i].nnue->current = &threads[i].nnue->stack[0];
-        threads[i].nnue->current->accurate[WHITE] = 0;
-        threads[i].nnue->current->accurate[BLACK] = 0;
-
         memset(threads[i].nodeStates, 0, sizeof(NodeState) * STACK_SIZE);
+        nnue_reset_evaluator(threads[i].nnue);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ Thread* createThreadPool(int nthreads) {`
`58`	`58`	`void deleteThreadPool(Thread *threads) {`
`59`	`59`
`60`	`60`	`for (int i = 0; i < threads->nthreads; i++)`
`61`		`- nnue_delete_accumulators(threads[i].nnue);`
	`61`	`+ nnue_delete_evaluator(threads[i].nnue);`
`62`	`62`
`63`	`63`	`free(threads);`
`64`	`64`	`}`
`@@ -100,12 +100,8 @@ void newSearchThreadPool(Thread threads, Board board, Limits *limits, TimeMana`
`100`	`100`	`memcpy(&threads[i].board, board, sizeof(Board));`
`101`	`101`	`threads[i].board.thread = &threads[i];`
`102`	`102`
`103`		`- // Reset the accumulator stack. The table can remain`
`104`		`- threads[i].nnue->current = &threads[i].nnue->stack[0];`
`105`		`- threads[i].nnue->current->accurate[WHITE] = 0;`
`106`		`- threads[i].nnue->current->accurate[BLACK] = 0;`
`107`		`-`
`108`	`103`	`memset(threads[i].nodeStates, 0, sizeof(NodeState) * STACK_SIZE);`
	`104`	`+ nnue_reset_evaluator(threads[i].nnue);`
`109`	`105`	`}`
`110`	`106`	`}`
`111`	`107`