use a single info struct

.gitignore

@@ -1,3 +1,6 @@
+# net file
+nn.net
+
 # Prerequisites
 *.d
 

src/bench.cpp

@@ -66,7 +66,7 @@ const char* benchmarkfens[52] = {
 void StartBench(int depth) {
     // init all
     UciOptions uciOptions;
-    ThreadData* td(new ThreadData());
+    ThreadData* td = &mainTD;
     uint64_t totalNodes = 0;
     InitTT(64);
     InitNewGame(td);
@@ -75,13 +75,12 @@ void StartBench(int depth) {
         ParseFen(benchmarkfens[positions], &td->pos);
         std::cout << "\nPosition: " << positions + 1 << " fen: " << benchmarkfens[positions] << std::endl;
         RootSearch(depth, td, &uciOptions);
-        totalNodes += td->info.nodes;
+        totalNodes += td->nodes;
     }
     auto end = std::chrono::steady_clock::now();
     auto totalTime = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
     std::cout << "\n";
     std::cout << totalNodes << " nodes " << signed(totalNodes / (totalTime + 1) * 1000) << " nps" << std::endl;
-    delete td;
 }
 
 void BenchInference() {

src/init.cpp

@@ -218,7 +218,6 @@ void InitNewGame(ThreadData* td) {
     // Extract data structures from ThreadData
     Position* pos = &td->pos;
     SearchData* sd = &td->sd;
-    SearchInfo* info = &td->info;
 
     CleanHistories(sd);
 
@@ -232,11 +231,10 @@ void InitNewGame(ThreadData* td) {
 
     std::memset(sd->counterMoves, NOMOVE, sizeof(sd->counterMoves));
 
-    // Reset plies and search info
-    info->starttime = GetTimeMs();
-    info->stopped = 0;
-    info->nodes = 0;
-    info->seldepth = 0;
+    // Reset plies and search info  
+    info.starttime = GetTimeMs();
+    setStop(false);
+    info.seldepth = 0;
     // Clear TT
     ClearTT();
 

src/io.cpp

@@ -165,27 +165,27 @@ std::string Pick_color(int score) {
 }
 
 // Prints the uci output
-void PrintUciOutput(const int score, const int depth, const ThreadData* td, const UciOptions* options) {
+void PrintUciOutput(const int score, const int depth, const UciOptions* options) {
     // We are benching the engine and we don't care about the output
     if (tryhardmode)
         return;
     // This handles the basic console output
-    long time = GetTimeMs() - td->info.starttime;
-    uint64_t nodes = td->info.nodes + GetTotalNodes();
+    long time = GetTimeMs() - info.starttime;
+    uint64_t nodes = mainTD.nodes + GetTotalNodes();
 
     uint64_t nps = nodes / (time + !time) * 1000;
     if (print_uci) {
         if (score > -MATE_SCORE && score < -MATE_FOUND)
-            std::cout << "info score mate " << -(score + MATE_SCORE) / 2 << " depth " << depth << " seldepth " << td->info.seldepth << " multipv " << options->MultiPV << " nodes " << nodes <<
-            " nps " << nps << " time " << GetTimeMs() - td->info.starttime << " pv ";
+            std::cout << "info score mate " << -(score + MATE_SCORE) / 2 << " depth " << depth << " seldepth " << info.seldepth << " multipv " << options->MultiPV << " nodes " << nodes <<
+            " nps " << nps << " time " << GetTimeMs() - info.starttime << " pv ";
 
         else if (score > MATE_FOUND && score < MATE_SCORE)
-            std::cout << "info score mate " << (MATE_SCORE - score) / 2 + 1 << " depth " << depth << " seldepth " << td->info.seldepth << " multipv " << options->MultiPV << " nodes " << nodes <<
-            " nps " << nps << " time " << GetTimeMs() - td->info.starttime << " pv ";
+            std::cout << "info score mate " << (MATE_SCORE - score) / 2 + 1 << " depth " << depth << " seldepth " << info.seldepth << " multipv " << options->MultiPV << " nodes " << nodes <<
+            " nps " << nps << " time " << GetTimeMs() - info.starttime << " pv ";
 
         else
-            std::cout << "info score cp " << score << " depth " << depth << " seldepth " << td->info.seldepth << " multipv " << options->MultiPV << " nodes " << nodes <<
-            " nps " << nps << " hashfull "<< GetHashfull() << " time " << GetTimeMs() - td->info.starttime << " pv ";
+            std::cout << "info score cp " << score << " depth " << depth << " seldepth " << info.seldepth << " multipv " << options->MultiPV << " nodes " << nodes <<
+            " nps " << nps << " hashfull "<< GetHashfull() << " time " << GetTimeMs() - info.starttime << " pv ";
 
         // loop over the moves within a PV line
         for (int count = 0; count < std::max(pvTable.pvLength[0], 1); count++) {
@@ -262,7 +262,7 @@ void PrintUciOutput(const int score, const int depth, const ThreadData* td, cons
 
         // Pretty print search info
         std::cout << std::setw(3) << depth << "/";
-        std::cout << std::left << std::setw(3) << td->info.seldepth;
+        std::cout << std::left << std::setw(3) << info.seldepth;
 
         std::cout << std::right << std::setw(8) << time_string;
         std::cout << std::right << std::setw(10) << node_string;
@@ -279,4 +279,4 @@ void PrintUciOutput(const int score, const int depth, const ThreadData* td, cons
         // print new line
         std::cout << std::endl;
     }
-}
+}

src/io.h

@@ -23,4 +23,4 @@ void PrintMoveList(const MoveList* list);
 
 [[nodiscard]] char* FormatMove(const Move move);
 
-void PrintUciOutput(const int score, const int depth, const ThreadData* td, const UciOptions* options);
+void PrintUciOutput(const int score, const int depth, const UciOptions* options);

src/position.cpp

@@ -9,6 +9,7 @@
 #include "magic.h"
 #include "init.h"
 #include "cuckoo.h"
+#include "search.h"
 
 NNUE nnue = NNUE();
 
@@ -27,17 +28,16 @@ void ResetBoard(Position* pos) {
     pos->state.plyFromNull = 0;
 }
 
-void ResetInfo(SearchInfo* info) {
-    info->depth = 0;
-    info->nodes = 0;
-    info->starttime = 0;
-    info->stoptimeOpt = 0;
-    info->stoptimeMax = 0;
-    info->movestogo = -1;
-    info->stopped = false;
-    info->timeset = false;
-    info->movetimeset = false;
-    info->nodeset = false;
+void ResetInfo() {
+    info.depth = 0;
+    info.starttime = 0;
+    info.stoptimeOpt = 0;
+    info.stoptimeMax = 0;
+    info.movestogo = -1;
+    info.timeset = false;
+    info.movetimeset = false;
+    info.nodeset = false;
+    setStop(false);
 }
 
 // Generates zobrist key from scratch
@@ -522,4 +522,4 @@ bool hasGameCycle(Position* pos, int ply) {
         }
     }
     return false;
-}
+}

src/position.h

@@ -191,7 +191,7 @@ void ParseFen(const std::string& command, Position* pos);
 // Parse a string of moves in coordinate format and plays them
 void parse_moves(const std::string& moves, Position* pos);
 
-void ResetInfo(SearchInfo* info);
+void ResetInfo();
 
 // Retrieve a generic piece (useful when we don't know what type of piece we are dealing with
 [[nodiscard]] Bitboard GetPieceBB(const Position* pos, const int piecetype);