X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fsearch.cpp;h=7cc51c60cb4f23e474f687e8e9c601a0b8d4c116;hb=c0334c7bac92fe0569dc61d1af63a8cc07e2020f;hp=1f980fbb78038d6cf098e1b3cafaa37761bfd808;hpb=8425b2b4997c90aaad35ced6ab190df098f24212;p=stockfish

diff --git a/src/search.cpp b/src/search.cpp
index 1f980fbb..7cc51c60 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -82,7 +82,7 @@ namespace {
     bool thread_should_stop(int threadID) const;
     void wake_sleeping_threads();
     void put_threads_to_sleep();
-    void idle_loop(int threadID, SplitPoint* waitSp);
+    void idle_loop(int threadID, SplitPoint* sp);
     bool split(const Position& pos, SearchStack* ss, int ply, Value* alpha, const Value beta, Value* bestValue,
                Depth depth, bool mateThreat, int* moves, MovePicker* mp, int master, bool pvNode);
 
@@ -549,8 +549,8 @@ void init_search() {
   for (int i = 1; i < 64; i++) // i == depth (OnePly = 1)
       for (int j = 1; j < 64; j++) // j == moveNumber
       {
-          double    pvRed = 0.5 + log(double(i)) * log(double(j)) / 6.0;
-          double nonPVRed = 0.5 + log(double(i)) * log(double(j)) / 3.0;
+          double    pvRed = log(double(i)) * log(double(j)) / 3.0;
+          double nonPVRed = log(double(i)) * log(double(j)) / 1.5;
           PVReductionMatrix[i][j]    = (int8_t) (   pvRed >= 1.0 ? floor(   pvRed * int(OnePly)) : 0);
           NonPVReductionMatrix[i][j] = (int8_t) (nonPVRed >= 1.0 ? floor(nonPVRed * int(OnePly)) : 0);
       }
@@ -1627,9 +1627,6 @@ namespace {
     {
         assert(tte->type() != VALUE_TYPE_EVAL);
 
-        // Refresh tte entry to avoid aging
-        TT.store(pos.get_key(), tte->value(), tte->type(), tte->depth(), ttMove);
-
         ss[ply].currentMove = ttMove; // Can be MOVE_NONE
         return value_from_tt(tte->value(), ply);
     }
@@ -1657,7 +1654,7 @@ namespace {
     if (bestValue >= beta)
     {
         // Store the score to avoid a future costly evaluation() call
-        if (!isCheck && !tte && ei.futilityMargin[pos.side_to_move()] == 0)
+        if (!isCheck && !tte && ei.kingDanger[pos.side_to_move()] == 0)
             TT.store(pos.get_key(), value_to_tt(bestValue, ply), VALUE_TYPE_EV_LO, Depth(-127*OnePly), MOVE_NONE);
 
         return bestValue;
@@ -1676,7 +1673,7 @@ namespace {
     MovePicker mp = MovePicker(pos, ttMove, deepChecks ? Depth(0) : depth, H);
     CheckInfo ci(pos);
     enoughMaterial = pos.non_pawn_material(pos.side_to_move()) > RookValueMidgame;
-    futilityBase = staticValue + FutilityMarginQS + ei.futilityMargin[pos.side_to_move()];
+    futilityBase = staticValue + FutilityMarginQS + ei.kingDanger[pos.side_to_move()];
 
     // Loop through the moves until no moves remain or a beta cutoff occurs
     while (   alpha < beta
@@ -1756,7 +1753,7 @@ namespace {
     {
         // If bestValue isn't changed it means it is still the static evaluation
         // of the node, so keep this info to avoid a future evaluation() call.
-        ValueType type = (bestValue == staticValue && !ei.futilityMargin[pos.side_to_move()] ? VALUE_TYPE_EV_UP : VALUE_TYPE_UPPER);
+        ValueType type = (bestValue == staticValue && !ei.kingDanger[pos.side_to_move()] ? VALUE_TYPE_EV_UP : VALUE_TYPE_UPPER);
         TT.store(pos.get_key(), value_to_tt(bestValue, ply), type, d, MOVE_NONE);
     }
     else if (bestValue >= beta)
@@ -2639,10 +2636,10 @@ namespace {
 
 
   // idle_loop() is where the threads are parked when they have no work to do.
-  // The parameter "waitSp", if non-NULL, is a pointer to an active SplitPoint
+  // The parameter 'sp', if non-NULL, is a pointer to an active SplitPoint
   // object for which the current thread is the master.
 
-  void ThreadsManager::idle_loop(int threadID, SplitPoint* waitSp) {
+  void ThreadsManager::idle_loop(int threadID, SplitPoint* sp) {
 
     assert(threadID >= 0 && threadID < MAX_THREADS);
 
@@ -2652,7 +2649,7 @@ namespace {
         // master should exit as last one.
         if (AllThreadsShouldExit)
         {
-            assert(!waitSp);
+            assert(!sp);
             threads[threadID].state = THREAD_TERMINATED;
             return;
         }
@@ -2661,7 +2658,7 @@ namespace {
         // instead of wasting CPU time polling for work.
         while (AllThreadsShouldSleep || threadID >= ActiveThreads)
         {
-            assert(!waitSp);
+            assert(!sp);
             assert(threadID != 0);
             threads[threadID].state = THREAD_SLEEPING;
 
@@ -2698,8 +2695,13 @@ namespace {
 
         // If this thread is the master of a split point and all threads have
         // finished their work at this split point, return from the idle loop.
-        if (waitSp != NULL && waitSp->cpus == 0)
+        if (sp && sp->cpus == 0)
         {
+            // Because sp->cpus is decremented under lock protection,
+            // be sure sp->lock has been released before to proceed.
+            lock_grab(&(sp->lock));
+            lock_release(&(sp->lock));
+
             assert(threads[threadID].state == THREAD_AVAILABLE);
 
             threads[threadID].state = THREAD_SEARCHING;