Bench: 30658368

TerjeKir · Nov 18, 2023 · ffed687 · ffed687
1 parent 865bc25
commit ffed687
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/src/search.c b/src/search.c
@@ -37,8 +37,8 @@
 
 
 SearchLimits Limits = { .multiPV = 1 };
-volatile bool ABORT_SIGNAL;
-volatile bool SEARCH_STOPPED = true;
+atomic_bool ABORT_SIGNAL;
+atomic_bool SEARCH_STOPPED = true;
 
 static int Reductions[2][32][32];
 
@@ -70,7 +70,7 @@ static int Quiescence(Thread *thread, Stack *ss, int alpha, const int beta) {
     int bestScore = -INFINITE;
 
     // Check time situation
-    if (OutOfTime(thread) || ABORT_SIGNAL)
+    if (OutOfTime(thread) || LoadRelaxed(ABORT_SIGNAL))
         longjmp(thread->jumpBuffer, true);
 
     // Position is drawn
@@ -193,7 +193,7 @@ static int AlphaBeta(Thread *thread, Stack *ss, int alpha, int beta, Depth depth
     const bool root   = ss->ply == 0;
 
     // Check time situation
-    if (OutOfTime(thread) || ABORT_SIGNAL)
+    if (OutOfTime(thread) || LoadRelaxed(ABORT_SIGNAL))
         longjmp(thread->jumpBuffer, true);
 
     // Early exits

diff --git a/src/search.h b/src/search.h
@@ -34,8 +34,8 @@ typedef struct {
 
 
 extern SearchLimits Limits;
-extern volatile bool ABORT_SIGNAL;
-extern volatile bool SEARCH_STOPPED;
+extern atomic_bool ABORT_SIGNAL;
+extern atomic_bool SEARCH_STOPPED;
 
 
 void *SearchPosition(void *pos);
diff --git a/src/threads.c b/src/threads.c
@@ -147,9 +147,9 @@ void RunWithAllThreads(void *(*func)(void *)) {
 }
 
 // Thread sleeps until it is woken up
-void Wait(volatile bool *condition) {
+void Wait(atomic_bool *condition) {
     pthread_mutex_lock(&mutex);
-    while (!*condition)
+    while (!atomic_load(condition))
         pthread_cond_wait(&sleepCondition, &mutex);
     pthread_mutex_unlock(&mutex);
 }

diff --git a/src/threads.h b/src/threads.h
@@ -91,5 +91,5 @@ void StartHelpers(void *(*func)(void *));
 void WaitForHelpers();
 void ResetThreads();
 void RunWithAllThreads(void *(*func)(void *));
-void Wait(volatile bool *condition);
+void Wait(atomic_bool *condition);
 void Wake();
diff --git a/src/types.h b/src/types.h
@@ -20,6 +20,7 @@
 
 #include <assert.h>
 #include <inttypes.h>
+#include <stdatomic.h>
 #include <stdbool.h>
 #include <stdio.h>
 
@@ -31,6 +32,8 @@
 #define INLINE static inline __attribute__((always_inline))
 #define CONSTR(prio) static __attribute__((constructor (1000 + prio))) void
 
+#define LoadRelaxed(x) atomic_load_explicit(&(x), memory_order_relaxed)
+
 #define lastMoveNullMove (!root && history(-1).move == NOMOVE)
 #define history(offset) (pos->gameHistory[pos->histPly + offset])