Small cleanup April 2022 #3973

G-Lorenz · 2022-04-01T16:48:22Z

The purpose of this pr is to collect various small cleanups: feel free to leave a comment proposing a new cleanup or a different approach to an existing one!

Commit messages are self-explanatory (at least for the first two cleanups... :-) )

Compiling with gcc and: `make build -j ARCH=x86-64-bmi2 debug=yes sanitize=undefined` shows a warning: `evaluate.cpp:1115:38: warning: ‘v’ may be used uninitialized [-Wmaybe-uninitialized]` The code seems to be safe (i.e. is impossible to evade both ifs) but the warning is annoying. This patch somehow mute the warning in `gcc`. I don't know how other compilers behave. No functional change

Use `true` instead. Thanks amchess No functional change

locutus2 · 2022-04-10T08:08:35Z

Correct indention for function from_to in types.h line 453 (one space is missing):

thanks locutus2 No functional change

niklasf · 2022-04-23T15:56:43Z

Stockfish/src/syzygy/tbprobe.cpp

Line 1293 in e1f12aa

// MapKK[] encodes all the 461 possible legal positions of two kings where

There are actually 462 combinations. Later, correctly:

Stockfish/src/syzygy/tbprobe.cpp

Lines 802 to 803 in e1f12aa

    
           // Usually the first step is to take the wK and bK together. There are just 
        
           // 462 ways legal and not-mirrored ways to place the wK and bK on the board.

…2022 (Solve conflicts in evaluate.cpp) Bench: 7729968

thanks niklasf No functional change

dubslow · 2022-05-03T19:27:09Z

src/evaluate.cpp

+  bool useClassical = (pos.this_thread()->depth > 9 || pos.count<ALL_PIECES>() > 7) &&
+                      abs(eg_value(pos.psq_score())) * 5 > (856 + pos.non_pawn_material() / 64) * (10 + pos.rule50_count());

  // Deciding between classical and NNUE eval (~10 Elo): for high PSQ imbalance we use classical,
  // but we switch to NNUE during long shuffling or with high material on the board.
  if (  !useNNUE
-      || ((pos.this_thread()->depth > 9 || pos.count<ALL_PIECES>() > 7) &&
-          abs(eg_value(pos.psq_score())) * 5 > (856 + pos.non_pawn_material() / 64) * (10 + pos.rule50_count())))
+      || useClassical)


I like this cleanup, makes code easier to read, but the comments describing the code should move with the code.

…2022 Bench: 6174823

vondele · 2022-05-14T12:08:51Z

Small CI leftover:

diff --git a/README.md b/README.md
index 6e6e762e6..bc2b1b185 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 ## Overview
 
 [![Build Status](https://github.com/official-stockfish/Stockfish/actions/workflows/stockfish.yml/badge.svg)](https://github.com/official-stockfish/Stockfish/actions)
-[![Build Status](https://ci.appveyor.com/api/projects/status/github/official-stockfish/Stockfish?branch=master&svg=true)](https://ci.appveyor.com/project/mcostalba/stockfish/branch/master)
 
 [Stockfish](https://stockfishchess.org) is a free, powerful UCI chess engine
 derived from Glaurung 2.1. Stockfish is not a complete chess program and requires a

dav1312 · 2022-05-15T19:19:34Z

I'm not sure if this could be added to this PR but there is some inconsistent indentation in the nnue_feature_transformer.h and specially in the Makefile

Stockfish/src/nnue/nnue_feature_transformer.h

Lines 155 to 156 in 22b7909

    
           const int8x16_t compacted = vcombine_s8(shifta,shiftb); 
        
           return *reinterpret_cast<const vec_t*> (&compacted);

Stockfish/src/nnue/nnue_feature_transformer.h

Line 293 in 22b7909

constexpr IndexType OutputChunkSize = MaxChunkSize;

Stockfish/src/Makefile

Lines 825 to 829 in 22b7909

    
           $(eval curl_or_wget := $(shell if hash curl 2>/dev/null; then echo "curl -skL"; elif hash wget 2>/dev/null; then echo "wget -qO-"; fi)) 
        
           @if test -f "$(nnuenet)"; then \ 
        
                      echo "Already available."; \ 
        
                   else \ 
        
                      if [ "x$(curl_or_wget)" = "x" ]; then \

Also, it looks like the last commit added a seemingly unnecessary new line

Stockfish/src/evaluate.cpp

Lines 193 to 195 in 22b7909

	namespace {

…2022 Bench: 6407734

No functional change

Thanks vondele No functional change

remove extra line in evaluate.cpp fix indentation of inlines in `nnue_feature_trasformer.h` fix indentation of ifdefs in `Makefile` (using tabs) thanks dav1312 No functional change

Disservin · 2022-05-17T21:04:02Z

futility_move_count has its own function and is only used in one place, thus this can simply be removed
similar to this master...Disservin:removeFunc
maybe even leaving the int futility_move_count away

pb00067 · 2022-05-18T12:06:10Z

For me the logic in probcut's TT condition is hard to follow:

             && !(   ss->ttHit
             && tte->depth() >= depth - 3
             && ttValue != VALUE_NONE
             && ttValue < probCutBeta))

Personally I would prefer this equivalent which corresponds more to human thinking

             && (   !ss->ttHit
                   || tte->depth() < depth - 3
                   || ttValue == VALUE_NONE
                   || ttValue >= probCutBeta))

dubslow · 2022-05-18T12:09:34Z

For me the logic in probcut's TT condition is hard to follow:

In either case, a grouped-together set of conditions should get more indentation for the operators within that group

dsmsgms · 2022-05-28T02:42:34Z

Stack->depth is simply not used. Might as well remove the field from the struct.

niklasf · 2022-05-28T06:51:08Z

README.md refers to Readme.md (inconsistent casing)

vondele · 2022-05-29T16:44:20Z

I'll be merging this shortly, thanks for maintaining this PR.

mstembera · 2022-05-29T23:52:48Z

The comment in evaluate.cpp starting with "// Deciding between..." is now duplicated on lines 1086 and 1091 after this PR.

vondele · 2022-05-30T05:10:00Z

that was a merge mistake... will fix. Probably a good reason to start a new cleanup PR ;-)

closes official-stockfish#3973 No functional change

G-Lorenz added 2 commits April 1, 2022 18:33

Remove captureOrPromotion in ProbCut

f06614d

Use `true` instead. Thanks amchess No functional change

Correct indention for function from_to in types.h

03a25b9

thanks locutus2 No functional change

G-Lorenz added 2 commits April 23, 2022 21:12

Merge remote-tracking branch 'official/master' into smallCleanupApril…

d255d32

…2022 (Solve conflicts in evaluate.cpp) Bench: 7729968

Fix comment about number of possible king combinations

6836eca

thanks niklasf No functional change

dubslow reviewed May 3, 2022

View reviewed changes

Merge remote-tracking branch 'official/master' into smallCleanupApril…

31f1c46

…2022 Bench: 6174823

G-Lorenz and others added 4 commits May 17, 2022 09:11

Merge remote-tracking branch 'official/master' into smallCleanupApril…

7308b97

…2022 Bench: 6407734

Move comment with the code it's attached to

c5dbb6e

No functional change

Remove appveyor badge

c20703f

Thanks vondele No functional change

Fix indentation and extra lines

01f50bb

remove extra line in evaluate.cpp fix indentation of inlines in `nnue_feature_trasformer.h` fix indentation of ifdefs in `Makefile` (using tabs) thanks dav1312 No functional change

vondele added the to be merged Will be merged shortly label May 29, 2022

vondele closed this in f7d1491 May 29, 2022

dav1312 pushed a commit to dav1312/Stockfish that referenced this pull request Oct 21, 2022

Assorted small cleanups

3bd9a4d

closes official-stockfish#3973 No functional change

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Small cleanup April 2022 #3973

Small cleanup April 2022 #3973

G-Lorenz commented Apr 1, 2022

locutus2 commented Apr 10, 2022

niklasf commented Apr 23, 2022

dubslow May 3, 2022

vondele commented May 14, 2022

dav1312 commented May 15, 2022 •

edited

Loading

Disservin commented May 17, 2022

pb00067 commented May 18, 2022 •

edited

Loading

dubslow commented May 18, 2022

dsmsgms commented May 28, 2022 •

edited

Loading

niklasf commented May 28, 2022

vondele commented May 29, 2022

mstembera commented May 29, 2022

vondele commented May 30, 2022

Small cleanup April 2022 #3973

Small cleanup April 2022 #3973

Conversation

G-Lorenz commented Apr 1, 2022

locutus2 commented Apr 10, 2022

niklasf commented Apr 23, 2022

dubslow May 3, 2022

Choose a reason for hiding this comment

vondele commented May 14, 2022

dav1312 commented May 15, 2022 • edited Loading

Disservin commented May 17, 2022

pb00067 commented May 18, 2022 • edited Loading

dubslow commented May 18, 2022

dsmsgms commented May 28, 2022 • edited Loading

niklasf commented May 28, 2022

vondele commented May 29, 2022

mstembera commented May 29, 2022

vondele commented May 30, 2022

dav1312 commented May 15, 2022 •

edited

Loading

pb00067 commented May 18, 2022 •

edited

Loading

dsmsgms commented May 28, 2022 •

edited

Loading