move-do: use castling flags, other improvements (~12% on perft)

- always set K square and castling flags (remove expensive tests on K and castling flags)
- simplify castling rook move
- more restrictive sq_castle[]

Makefile

@@ -39,7 +39,9 @@ OBJ       := $(addprefix $(OBJDIR)/,$(SRC_FN:.c=.o))
 TSTSRC    := $(wildcard $(TSTDIR)/*.c)
 
 LIB       := br_$(shell uname -m)                           # library name
-LIBS      := $(strip -l$(LIB))
+LIB       := $(strip $(LIB))
+LIBFILE   := ${BRLIBDIR}/lib$(strip ${LIB}).a
+LIBS      := $(addprefix -l,$(strip $(LIB)))
 
 DEP_FN    := $(SRC_FN)
 DEP       := $(addprefix $(DEPDIR)/,$(DEP_FN:.c=.d))
@@ -102,7 +104,7 @@ endif
 # if no version, use last commit and date.
 # else, if last commit != last tag commit, add commit and date to version number
 ifeq ($(VERSION),)
-  VERSION := $(build)-$(COMMIT)-$(DATE)
+  VERSION := $(build)-git.$(COMMIT)-$(DATE)
 else ifneq ($(COMMIT), $(TAG_COMMIT))
   VERSION := $(VERSION)-next-$(build)-$(COMMIT)-$(DATE)
 endif
@@ -124,7 +126,7 @@ else # ifeq ($(build),dev)
         #        fen.c
         #CPPFLAGS  += -DDEBUG_FEN                           # FEN decoding
         #        hash / TT
-        #CPPFLAGS  += -DZOBRIST_VERIFY                      # double chk zobrist
+        CPPFLAGS  += -DZOBRIST_VERIFY                       # double chk zobrist
         #CPPFLAGS  += -DPERFT_MOVE_HISTORY                  # perft, keep prev moves
         #        attack.c
         #CPPFLAGS  += -DDEBUG_ATTACK_ATTACKERS              # sq_attackers
@@ -157,22 +159,22 @@ ifeq ($(build),release)
         #CFLAGS    += -g
         #CFLAGS    += -ginline-points                   # inlined funcs debug info
         LDFLAGS   += -flto
+else ifeq ($(build),perf)
+        CFLAGS    += -O3
+        CFLAGS    += -ggdb0                            # symbols (gdb, perf, etc.)
+        CFLAGS    += -ginline-points                   # inlined funcs debug info
+        CFLAGS    += -funroll-loops
 else ifeq ($(build),dev)
-        CFLAGS    += -Og
+        CFLAGS    += -O1
-        CFLAGS    += -g                                # symbols (gdb, perf, etc.)
+        CFLAGS    += -ggdb                             # symbols (gdb, perf, etc.)
         CFLAGS    += -ginline-points                   # inlined funcs debug info
         #CFLAGS += -pg                                 # gprof
         # Next one may be useful for valgrind (when invalid instructions)
         #CFLAGS += -mno-tbm
-else ifeq ($(build),perf)
-        CFLAGS    += -O3
-        CFLAGS    += -g                                # symbols (gdb, perf, etc.)
-        CFLAGS    += -ginline-points                   # inlined funcs debug info
-        CFLAGS    += -funroll-loops
 else ifeq ($(build),debug)
-        CFLAGS    += -Og
+        CFLAGS    += -O0                               # -Og hides some variables
-        CFLAGS    += -g                                # symbols (gdb, perf, etc.)
+        CFLAGS    += -ggdb3                            # symbols (including macro)
-        CFLAGS    += -ginline-points                   # inlined funcs debug info
+        #CFLAGS    += -ginline-points                   # inlined funcs debug info
         # for gprof
         #CFLAGS += -pg
         # Next one may be useful for valgrind (when invalid instructions)
@@ -227,16 +229,16 @@ else
 all: libs testing $(TARGET)
 
 release:
-	$(MAKE) BUILD=release clean all
+	$(MAKE) build=release clean all
 
 dev:
-	$(MAKE) BUILD=dev clean all
+	$(MAKE) build=dev clean all
 
 perf:
-	$(MAKE) BUILD=perf clean all
+	$(MAKE) build=perf clean all
 
 debug:
-	$(MAKE) BUILD=debug clean all
+	$(MAKE) build=debug clean all
 
 compile: brlib objs
 
@@ -344,6 +346,7 @@ brlib:
 	$(info calling with build=$(build))
 	$(MAKE) -e -C $(BRLIB) lib-static
 unexport build
+
 ##################################### brchess binaries
 .PHONY: targets cleanbin cleanbindir
 
@@ -355,9 +358,9 @@ cleanbin:
 cleanbindir:
 	$(call rmdir,$(BINDIR),binaries)
 
-$(TARGET): libs $(OBJ) | $(BINDIR)
+$(TARGET): $(LIBFILE) $(OBJ) | $(BINDIR) libs
 	@echo linking $@.
-	$(CC) $(LDFLAGS) $(OBJ) $(LIBS) -o $@
+	$(CC) $(ALL_LDFLAGS) $(OBJ) -o $@
 
 ##################################### pre-processed (.i) and assembler (.s) output
 .PHONY: cleanasmcpp
@@ -414,13 +417,13 @@ TEST          += movedo-test perft-test tt-test
 
 PIECE_OBJS    := piece.o
 FEN_OBJS      := $(PIECE_OBJS) fen.o position.o bitboard.o board.o \
-	hq.o attack.o hash.o init.o misc.o alloc.o move.o \
+	hq.o attack.o hash.o init.o util.o alloc.o move.o \
-	eval.o eval-defs.o eval-simple.o
+	eval.o eval-defs.o eval-simple.o hist.o
 BB_OBJS       := $(FEN_OBJS)
 MOVEGEN_OBJS  := $(BB_OBJS) move-gen.o
 ATTACK_OBJS   := $(MOVEGEN_OBJS)
 MOVEDO_OBJS   := $(ATTACK_OBJS) move-do.o
-PERFT_OBJS    := $(MOVEDO_OBJS) search.o
+PERFT_OBJS    := $(MOVEDO_OBJS) perft.o
 TT_OBJS       := $(MOVEDO_OBJS)
 
 TEST          := $(addprefix $(BINDIR)/,$(TEST))
@@ -490,6 +493,7 @@ wtf:
 	@#echo LIBSRC=$(LIBSRC)
 
 zob:
+	echo $(LIBFILE)
 	@#$(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) $< $(LIBS) src/util.c -o util
 
 ##################################### End of multi-targets

src/bitboard.h

@@ -182,19 +182,6 @@ static __always_inline bitboard_t bb_file(int file)
 }
 */
 
-/**
- * bb_first_bb() - return bitboard of first square of a bitboard.
- * @bb: bitboard
- *
- * bb must be non-zero.
- *
- * @return: bitboard of first square (lsb) of @bb.
- */
-static __always_inline square_t bb_first_bb(bitboard_t bb)
-{
-    return bb & -bb;
-}
-
 /**
  * bb_next() - clear and return next (lsb) square of a bitboard.
  * @bb: &bitboard
@@ -205,7 +192,7 @@ static __always_inline square_t bb_first_bb(bitboard_t bb)
  */
 static __always_inline square_t bb_next(bitboard_t *bb)
 {
-    square_t sq = ctz64(*bb);
+    square_t sq = lsb64(*bb);
     *bb &= *bb - 1;
     return sq;
 }

src/chessdefs.h

@@ -16,9 +16,10 @@
 
 #include <brlib.h>                                /* brlib types */
 
-#define ONE                1ul
 #define U64(const_u64)     const_u64##UL
-#define BIT(i)             ( (u64) (ONE << (i)) )
+#define BIT(i)             ( U64(1) << (i) )
+#define BIT_NONE           ( U64(0) )
+#define BIT_ALL            ( ~BIT_NONE )
 
 #define BOARDSIZE          (8*8)
 #define GAMESIZE           1024                   /* max game size (512 moves) */
@@ -50,7 +51,7 @@
 
 /* castle_t bits structure
  */
-typedef enum {
+enum {
     CASTLE_NONE = 0,
     CASTLE_WK   = (1 << 0),                       /* 0001 */
     CASTLE_WQ   = (1 << 1),                       /* 0010 */
@@ -64,7 +65,9 @@ typedef enum {
     CASTLE_K  = (1 << 0),                         /* generic K/Q, bits 0 and 1 */
     CASTLE_Q  = (1 << 1),
     CASTLE_KQ = (CASTLE_K |CASTLE_Q),
-} castle_rights_t;
+};
+
+typedef u8 castle_rights_t;
 
 /* determine is oo or ooo is possible with castle flags f and color c
  */
@@ -142,42 +145,6 @@ typedef u8 dir_t;
 #define sq_upwest(up)     ((up) - 1)
 #define sq_upeast(up)     ((up) + 1)
 
-#include <time.h>
-
-typedef struct mclock {
-    clockid_t clocktype;
-    ulong elapsed_l;
-    double elapsed_f;
-    struct timespec start;
-} mclock_t;
-
-#define CLOCK_WALL    CLOCK_REALTIME
-#define CLOCK_SYSTEM  CLOCK_MONOTONIC_RAW
-#define CLOCK_PROCESS CLOCK_PROCESS_CPUTIME_ID
-#define CLOCK_THREAD  CLOCK_THREAD_CPUTIME_ID
-
-/**
- * CLOCK_DEFINE - define a clock type.
- * @name: clock name
- * @type: clock type
- *
- * This macro is equivalent to:
- *   mclock_t name;
- *   clock_init(&name, type);
- */
-#define CLOCK_DEFINE(name, type) struct mclock name = { .clocktype = type }
-
-void clock_init(mclock_t *clock, clockid_t type);
-void clock_start(mclock_t *clock);
-s64 clock_elapsed_μs(mclock_t *clock);
-s64 clock_elapsed_ms(mclock_t *clock);
-double clock_elapsed_sec(mclock_t *clock);
-
-#define RAND_SEED_DEFAULT U64(0xb0d1ccea)
-
-void rand_init(u64 seed);
-u64 rand64(void);
-
 void init_all(void);
 
 #endif  /* _CHESSDEFS_H */

src/eval-defs.c

@@ -18,14 +18,18 @@
 #include "position.h"
 #include "piece.h"
 #include "eval-defs.h"
+#include "util.h"
 //#include "eval-simple.h"
 //#include "eval.h"
 
 /* eval parameters definition. */
 static const struct ev_params ev_param_def [EV_PARAMS_NB] = {
-    /*           default  min    max  setable    string */
+    /*                type      setable def   min    max  name */
-    [WT_MAT] = {    100,    0,   400,    true,   "material weight" },
+    [WT_MAT]  =     { PAR_SPN,  true,   100,    0,   400, "material weight" },
-    [WT_PST] = {    100,    0,   400,    true,   "pst weight" },
+    [WT_PST]  =     { PAR_SPN,  true,   100,    0,   400, "pst weight" },
+    [TST_CHK] =     { PAR_CHK,  true,     1,    0,     0, "test check" },
+    [TST_SPN] =     { PAR_BTN,  true,     0,    0,     0, "test button" },
+
 };
 
 void param_init()
@@ -37,7 +41,7 @@ void param_init()
 int param_find_name(char *name)
 {
     for (int i = 0; i < EV_PARAMS_NB; ++i)
-        if (!strcmp(ev_param_def[i].name, name))
+        if (str_eq_case(ev_param_def[i].name, name))
             return i;
     return -1;
 }
@@ -58,6 +62,14 @@ eval_t param_max(const int num)
 {
     return ev_param_def[num].max;
 }
+bool param_setable(const int num)
+{
+    return ev_param_def[num].setable;
+}
+int param_type(const int num)
+{
+    return ev_param_def[num].type;
+}
 
 /* parameters in use */
 eval_t parameters[EV_PARAMS_NB];
@@ -80,16 +92,6 @@ void param_set(int num, eval_t val)
  *        A1 .... H1
  *      }
  */
-/**
- * pst_defs - pre-defined piece-square tables.
- */
-enum {
-    PST_ROFCHADE,
-    PST_CPW,
-    PST_SJENG,
-    PST_NB
-};
-
 static const struct pst {
     char *name;                                   /* one word only, no spaces */
     int val[PIECE_TYPE_NB][PHASE_NB][SQUARE_NB];  /* MG then EG */
@@ -99,7 +101,7 @@ static const struct pst {
          * rofchade:
          * https://www.talkchess.com/forum3/viewtopic.php?f=2&t=68311&start=19
          */
-        "rofchade",
+        "Rofchade",
         {
             /* A8 ..... H8
              * ...........
@@ -247,15 +249,14 @@ static const struct pst {
          * https://www.chessprogramming.org/Simplified_Evaluation_Function
          * Note: ≠ https://github.com/nescitus/cpw-engine
          */
-        "cpw",
+        "CPW",
         {
             /* A8 ..... H8
              * ...........
              * A1 ..... H1
              */
             [PAWN] = {
-                { /* H1                                 H8 */
+                {                                 /* midgame */
-                    /* midgame */
                     +0,  0,   0,   0,   0,   0,  0,  0,
                     50, 50,  50,  50,  50,  50, 50, 50,
                     10, 10,  20,  30,  30,  20, 10, 10,
@@ -394,7 +395,7 @@ static const struct pst {
          * sjeng: https://github.com/gcp/sjeng
          * Rook and Queen from CPW.
          */
-        "sjeng",
+        "Sjeng",
         {
             /* A8 ..... H8
              * ...........
@@ -536,15 +537,21 @@ static const struct pst {
     },                                            /* sjeng end */
 };
 
-int pst_current = 0;
+int pst_current = PST_DEFAULT;
 eval_t pst_mg[COLOR_NB][PT_NB][SQUARE_NB];
 eval_t pst_eg[COLOR_NB][PT_NB][SQUARE_NB];
 
+void pst_set(char *str)
+{
+    pst_init(pst_find(str));
+}
+
 int pst_find(char *str)
 {
-    for (int i = 0; i < PST_NB; ++i)
+    for (int i = 0; i < PST_NB; ++i) {
-        if (!strcmp(pst_defs[i].name, str))
+        if (str_eq_case(pst_defs[i].name, str))
             return i;
+    }
     return -1;
 }
 
@@ -567,8 +574,8 @@ void pst_init(int set)
         eval_t mid_pc = piece_midval(pt);
         eval_t end_pc = piece_endval(pt);
         for (square_t sq = 0; sq < SQUARE_NB; ++sq) {
-            eval_t mid_pst = pst->val[MIDGAME][pt][sq];
+            eval_t mid_pst = pst->val[pt][MIDGAME][sq];
-            eval_t end_pst = pst->val[ENDGAME][pt][sq];
+            eval_t end_pst = pst->val[pt][ENDGAME][sq];
 
             pst_mg[BLACK][pt][sq] = (mid_pc * wmat + mid_pst * wpst) / 100;
             pst_eg[BLACK][pt][sq] = (end_pc * wmat + end_pst * wpst) / 100;
@@ -578,3 +585,10 @@ void pst_init(int set)
         }
     }
 }
+
+char *pst_name(int i)
+{
+    if (i >= 0 && i < PST_NB)
+        return pst_defs[i].name;
+    return "undef";
+}

src/eval-defs.h

@@ -54,19 +54,31 @@ enum {
     WT_MAT,
     WT_PST,
 
+    TST_SPN,
+    TST_CHK,
+
     EV_PARAMS_NB
 };
 
+enum {
+    PAR_CHK,
+    PAR_SPN,
+    PAR_BTN,
+    PAR_STR,
+};
+
 /**
  * ev_params - parameters definition
  * @init: eval_t default value
  * @min, @max: eval_t min and max values
+ * @type: variable type (PARAM_CHECK, etc...)
  * @setable: bool setable (proposed in UCI options)
  * @name: char * human readable name
  */
 struct ev_params {
-    eval_t init, min, max;
+    int type;
     bool setable;                                 /* true: proposed in UCI options */
+    eval_t init, min, max;
     char *name;
 };
 void param_init(void);
@@ -76,6 +88,8 @@ char *param_name(const int num);
 eval_t param_default(const int num);              /* get default param value */
 eval_t param_min(const int num);
 eval_t param_max(const int num);
+bool param_setable(const int num);
+int param_type(const int num);
 
 /* parameters in use */
 extern eval_t parameters[EV_PARAMS_NB];
@@ -83,11 +97,22 @@ extern eval_t parameters[EV_PARAMS_NB];
 void param_set (int num, eval_t val);
 
 /* PST data */
-#define PST_DEFAULT "cpw"
+/**
+ * pst_defs - pre-defined piece-square tables.
+ */
+enum {
+    PST_ROFCHADE,
+    PST_CPW,
+    PST_SJENG,
+    PST_NB
+};
+
+#define PST_DEFAULT PST_CPW
 extern int pst_current;
 extern eval_t pst_mg[COLOR_NB][PT_NB][SQUARE_NB];
 extern eval_t pst_eg[COLOR_NB][PT_NB][SQUARE_NB];
 
+void pst_set(char *str);
 int pst_find(char *str);
 void pst_init(int pst);
 

src/eval.c

@@ -41,7 +41,7 @@ s16 calc_phase(pos_t *pos)
 
     phase = max(phase, 0);
 #   ifdef DEBUG_EVAL
-    printf("calc phase:%d\n", phase);
+    printf("calculated phase:%d\n", phase);
 #   endif
     return phase;
 }

src/hash.c

@@ -19,6 +19,7 @@
 #include <bug.h>
 
 #include "chessdefs.h"
+#include "util.h"
 #include "alloc.h"
 #include "position.h"
 #include "piece.h"
@@ -201,7 +202,7 @@ int tt_create(s32 sizemb)
         hash_tt.bytes    = hash_tt.nbuckets * sizeof(bucket_t);
         hash_tt.mb       = hash_tt.bytes / 1024 / 1024;
 
-        hash_tt.mask     = -1ull >> (64 - nbits);
+        hash_tt.mask     = BIT_ALL >> (64 - nbits);
 
         hash_tt.keys     = safe_alloc_aligned_hugepage(hash_tt.bytes);
 
@@ -294,6 +295,7 @@ hentry_t *tt_probe_perft(const hkey_t key, const u16 depth)
     /* find key in buckets */
     for (i = 0; i < ENTRIES_PER_BUCKET; ++i) {
         entry = bucket->entry + i;
+        bug_on(entry->key && (key & hash_tt.mask) != (entry->key & hash_tt.mask));
         if (key == entry->key && HASH_PERFT_DEPTH(entry->data) == depth) {
             hash_tt.hits++;
             /*
@@ -389,7 +391,7 @@ hentry_t *tt_store_perft(const hkey_t key, const u16 depth, const u64 nodes)
 void tt_info()
 {
     if (hash_tt.keys) {
-        printf("TT: Mb:%d buckets:%'lu (bits:%u mask:%#x) entries:%'lu\n",
+        printf("TT: Mb:%d buckets:%'lu (bits:%u mask:%#lx) entries:%'lu\n",
                hash_tt.mb, hash_tt.nbuckets, hash_tt.nbits,
                hash_tt.mask, hash_tt.nkeys);
     } else {

src/hash.h

@@ -76,15 +76,15 @@ typedef struct {
 
     /* memory size in bytes/mb */
     size_t bytes;
-    u32  mb;
+    u32 mb;
 
     /* size in buckets/keys */
     size_t nbuckets;
     size_t nkeys;                                 /* nbuckets * NBUCKETS */
 
     /* internal representation */
-    u32  nbits;                                   /* #buckets in bits, power of 2 */
+    u32 nbits;                                    /* #buckets in bits, power of 2 */
-    u32  mask;                                    /* nbuckets - 1, key mask */
+    u64 mask;                                     /* nbuckets - 1, bucket mask */
 
     /* stats - unsure about usage */
     //size_t used_buckets;
@@ -106,8 +106,8 @@ typedef struct {
 
 extern hkey_t zobrist_pieces[16][64];
 extern hkey_t zobrist_castling[4 * 4 + 1];
-extern hkey_t zobrist_turn;                        /* for black, XOR each ply */
+extern hkey_t zobrist_turn;                       /* for black, XOR each ply */
-extern hkey_t zobrist_ep[9];                       /* 0-7: ep file, 8: SQUARE_NONE */
+extern hkey_t zobrist_ep[9];                      /* 0-7: ep file, 8: SQUARE_NONE */
 
 extern hasht_t hash_tt;                           /* main transposition table */
 

src/init.c

@@ -16,7 +16,7 @@
 #include <locale.h>
 
 #include "chessdefs.h"
-
+#include "util.h"
 #include "bitboard.h"
 #include "hq.h"
 #include "eval-defs.h"
@@ -32,9 +32,10 @@ void init_all(void)
     printff("stdout buffering... ");
     setlinebuf(stdout);
 
-    /* for printf() numeric thousands separator */
     printff("locale... ");
+    /* for printf() thousands separator */
     setlocale(LC_NUMERIC, "");
+    setlocale(LC_CTYPE, "C");
 
     /* pseudo random generator seed */
     printff("random generator... ");
@@ -68,9 +69,7 @@ void init_all(void)
 
     /* eval tables */
     printf("pst tables... ");
-    int pst;
+    pst_init(PST_DEFAULT);
-    bug_on_always((pst = pst_find(PST_DEFAULT)) < 0);
-    pst_init(pst);
 
     printf("done.\n");
 }

src/move-do.c

@@ -25,6 +25,20 @@
 #include "move-do.h"
 #include "hash.h"
 
+/**
+ * sq_castle - castling rights per square.
+ *
+ * position castling rights mask has to be AND'ed with this array 'from' and 'to'.
+ */
+castle_rights_t sq_castle[64] = {
+    [A1] = ~CASTLE_WQ, [B1 ... D1] = CASTLE_ALL,
+    [E1] = ~CASTLE_W,  [F1 ... G1] = CASTLE_ALL,
+    [H1] = ~CASTLE_WK, [A2 ... H7] = CASTLE_ALL,
+    [A8] = ~CASTLE_BQ, [B8 ... D8] = CASTLE_ALL,
+    [E8] = ~CASTLE_B,  [F8 ... G8] = CASTLE_ALL,
+    [H8] = ~CASTLE_BK,
+};
+
 /**
  * move_do() - do move.
  * @pos:    &pos_t position
@@ -60,9 +74,8 @@ pos_t *move_do(pos_t *pos, const move_t move, state_t *state)
 
     *state = pos->state;                          /* save irreversible changes */
 
-    /* update key: switch turn, reset castling and ep */
+    /* update key: switch turn, reset ep */
     key ^= zobrist_turn;
-    key ^= zobrist_castling[pos->castle];
     key ^= zobrist_ep[EP_ZOBRIST_IDX(pos->en_passant)];
 
     ++pos->clock_50;
@@ -74,80 +87,69 @@ pos_t *move_do(pos_t *pos, const move_t move, state_t *state)
 
     bug_on(COLOR(piece) != us);
 
-    if (is_promotion(move)) {
+    /* special moves: captures, pawn double push, en-passant, castling.
-        bug_on(sq_rank(to) != sq_rel_rank(RANK_8, us));
+     * All these moves are exclusive (so we use if ... else)
-        new_piece = MAKE_PIECE(move_promoted(move), us);
+     */
-    }
+    if (captured != EMPTY) {                      /* capture: remove piece */
-
-    if (captured != EMPTY) {
         pos->clock_50 = 0;
         bug_on(pos->board[to] == EMPTY || COLOR(pos->captured) != them);
         key ^= zobrist_pieces[captured][to];
-        pos_clr_sq(pos, to);                      /* clear square */
+        pos_clr_sq(pos, to);
-    } else if (is_castle(move)) {                 /* handle rook move */
+    } else if (ptype == PAWN) {
-        square_t rookfrom, rookto;
-        if (to > from) {
-            rookfrom = sq_rel(H1, us);
-            rookto = sq_rel(F1, us);
-        } else {
-            rookfrom = sq_rel(A1, us);
-            rookto = sq_rel(D1, us);
-        }
-        key ^= zobrist_pieces[pos->board[rookfrom]][rookto] ^
-            zobrist_pieces[pos->board[rookfrom]][rookfrom];
-        pos_set_sq(pos, rookto, pos->board[rookfrom]);
-        pos_clr_sq(pos, rookfrom);
-        pos->castle = clr_castle(pos->castle, us);
-    } else if (ptype == PAWN) {                   /* pawn non capture or e.p. */
         pos->clock_50 = 0;
-        if (from + up + up == to) {               /* if pawn double push, set e.p. */
+        if (from + up + up == to) {               /* double push: set e.p. */
             square_t ep = from + up;
+            /* check that opponent can e.p. */
             if (bb_pawn_attacks[us][ep] & pos->bb[them][PAWN]) {
                 pos->en_passant = ep;
                 key ^= zobrist_ep[EP_ZOBRIST_IDX(pos->en_passant)];
             }
-        } else if (is_enpassant(move)) {          /* clear grabbed pawn */
+        } else if (is_enpassant(move)) {          /* e.p.: clear grabbed pawn */
             square_t grabbed = to - up;
             piece_t pc = pos->board[grabbed];
             key ^= zobrist_pieces[pc][grabbed];
             pos_clr_sq(pos, grabbed);
         }
+    } else if (is_castle(move)) {                 /* castling: handle rook move */
+        square_t rookfrom, rookto;
+        if (to > from) {                          /* o-o */
+            rookfrom = to + 1;
+            rookto = to - 1;
+        } else {                                  /* o-o-o */
+            rookfrom = to - 2;
+            rookto = to + 1;
+        }
+        key ^= zobrist_pieces[pos->board[rookfrom]][rookto] ^
+            zobrist_pieces[pos->board[rookfrom]][rookfrom];
+        pos_set_sq(pos, rookto, pos->board[rookfrom]);
+        pos_clr_sq(pos, rookfrom);
+    }
+
+    /* common part: captures and non captures
+     * We could improve slightly, as en-passant and double push will make
+     * the following tests.
+     * Improvement could be to add promotion test and king test twice above.
+     * (in capture and after ).
+     */
+    if (is_promotion(move)) {
+        bug_on(sq_rank(to) != sq_rel_rank(RANK_8, us));
+        new_piece = MAKE_PIECE(move_promoted(move), us);
     }
 
     key ^= zobrist_pieces[piece][from] ^ zobrist_pieces[new_piece][to];
-    pos_clr_sq(pos, from);                        /* clear "from" and set "to" */
+    pos_clr_sq(pos, from);
     pos_set_sq(pos, to, new_piece);
 
-    if (ptype == KING)
+    /* update castling flags */
-        pos->king[us] = to;
-
-    /* update castling flags
-     * As we always consider flags are valid, we :
-     * - adjust our flags if relative from is "E1", "A1", H1"
-     * - adjust opp flags if relative to   if "A8", H8"
-     */
-    if (can_castle(pos->castle, us)) {            /* do we save time with this test ? */
-        square_t rel_e1 = sq_rel(E1, us);
-        square_t rel_a1 = sq_rel(A1, us);
-        square_t rel_h1 = sq_rel(H1, us);
-        if (from == rel_e1)
-            pos->castle = clr_castle(pos->castle, us);
-        else if (from == rel_a1)
-            pos->castle = clr_ooo(pos->castle, us);
-        else if (from == rel_h1)
-            pos->castle = clr_oo(pos->castle, us);
-    }
-    if (can_castle(pos->castle, them)) {
-        square_t rel_a8 = sq_rel(A8, us);
-        square_t rel_h8 = sq_rel(H8, us);
-        if (to == rel_a8)
-            pos->castle = clr_ooo(pos->castle, them);
-        else if (to == rel_h8)
-            pos->castle = clr_oo(pos->castle, them);
-    }
-
-    /* update castling rights key */
     key ^= zobrist_castling[pos->castle];
+    pos->castle &= sq_castle[from] & sq_castle[to];
+    key ^= zobrist_castling[pos->castle];
+
+    //if (ptype == KING) {
+    //    pos->king[us] = to;
+    //} else
+    /* do this always, cheaper than test on K move */
+    pos->king[us] = ctz64(pos->bb[us][KING]);
 
     pos->key = key;
 
@@ -180,33 +182,43 @@ pos_t *move_undo(pos_t *pos, const move_t move, const state_t *state)
     piece_t piece = pos->board[to];
     int up = sq_up(them);
 
+    /* common part: captures and non captures
+     * We could improve slightly, as en-passant and double push will make
+     * the following tests.
+     * Improvement could be to add promotion test and king test twice above.
+     * (in capture and after ).
+     */
     if (is_promotion(move))
         piece = MAKE_PIECE(PAWN, us);
 
-    pos_clr_sq(pos, to);                          /* always clear "to" ... */
+    pos_clr_sq(pos, to);
-    pos_set_sq(pos, from, piece);                 /* ... and set "from" */
+    pos_set_sq(pos, from, piece);
 
-    if (PIECE(piece) == KING)
+    /* special moves: capture, king (+ castling), en-passant
-        pos->king[us] = from;
+     */
-
+    if (pos->captured != EMPTY) {                 /* captured: restore piece */
-    if (pos->captured != EMPTY) {
+        pos_set_sq(pos, to, pos->captured);
-        pos_set_sq(pos, to, pos->captured);       /* restore captured piece */
+    } else if (is_castle(move)) {                 /* castle: rook move */
-    } else if (is_castle(move)) {                 /* make reverse rook move */
         square_t rookfrom, rookto;
-        if (to > from) {
+        if (to > from) {                          /* o-o */
-            rookfrom = sq_rel(F1, us);
+            rookfrom = to - 1;
-            rookto = sq_rel(H1, us);
+            rookto = to + 1;
-        } else {
+        } else {                                  /* o-o-o */
-            rookfrom = sq_rel(D1, us);
+            rookfrom = to + 1;
-            rookto = sq_rel(A1, us);
+            rookto = to - 2;
         }
         pos_set_sq(pos, rookto, pos->board[rookfrom]);
         pos_clr_sq(pos, rookfrom);
-    } else if (is_enpassant(move)) {              /* restore grabbed pawn */
+    } else if (is_enpassant(move)) {              /* e.p.: restore grabbed pawn */
         square_t grabbed = to + up;
         pos_set_sq(pos, grabbed, MAKE_PIECE(PAWN, them));
     }
 
+    /* do this always, cheaper than test on K move */
+    pos->king[us] = ctz64(pos->bb[us][KING]);
+    //if (PIECE(piece) == KING)
+    //    pos->king[us] = from;
+
     pos->state = *state;                          /* restore irreversible changes */
     pos->turn = us;
     return pos;
@@ -284,7 +296,7 @@ pos_t *move_do_alt(pos_t *pos, const move_t move, state_t *state)
     }
 
     key ^= zobrist_pieces[piece][from] ^ zobrist_pieces[new_piece][to];
-    pos_clr_sq(pos, from);                        /* clear "from" and set "to" */
+    pos_clr_sq(pos, from);
     pos_set_sq(pos, to, new_piece);
 
     if (ptype == KING)

src/move-do.h

@@ -14,8 +14,11 @@
 #ifndef MOVE_DO_H
 #define MOVE_DO_H
 
+#include "chessdefs.h"
 #include "position.h"
 
+extern castle_rights_t sq_castle[64];             /* to adjust castling rights */
+
 pos_t *move_do(pos_t *pos, const move_t move, state_t *state);
 pos_t *move_undo(pos_t *pos, const move_t move, const state_t *state);
 

src/move-gen.c

@@ -480,3 +480,18 @@ finish:
     return movelist;
     //return movelist->nmoves = moves - movelist->move;
 }
+
+/**
+ * pos_gen_legal() - generate position legal moves
+ * @pos: position
+ * @movelist: &movelist_t array to store moves
+ *
+ * Generate all @pos legal moves for player-to-move.
+ * @movelist is filled with the moves.
+ *
+ * @Return: movelist
+ */
+movelist_t *pos_gen_legal(pos_t *pos, movelist_t *movelist)
+{
+    return pos_legal(pos, pos_gen_pseudo(pos, movelist));
+}

src/move-gen.h

@@ -27,5 +27,6 @@ movelist_t *pos_legal_dup(const pos_t *pos, movelist_t *pseudo, movelist_t *lega
 movelist_t *pos_legal(const pos_t *pos, movelist_t *list);
 
 movelist_t *pos_gen_pseudo(pos_t *pos, movelist_t *movelist);
+movelist_t *pos_gen_legal(pos_t *pos, movelist_t *movelist);
 
 #endif  /* MOVEGEN_H */

src/perft.c

@@ -0,0 +1,131 @@
+/* perft.c - perft functions.
+ *
+ * Copyright (C) 2023-2024 Bruno Raoult ("br")
+ * Licensed under the GNU General Public License v3.0 or later.
+ * Some rights reserved. See COPYING.
+ *
+ * You should have received a copy of the GNU General Public License along with this
+ * program. If not, see <https://www.gnu.org/licenses/gpl-3.0-standalone.html>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later <https://spdx.org/licenses/GPL-3.0-or-later.html>
+ *
+ */
+
+#include <stdio.h>
+
+#include <brlib.h>
+
+#include "perft.h"
+#include "move-gen.h"
+#include "move-do.h"
+
+/**
+ * perft() - Perform perft on position
+ * @pos:    &position to search
+ * @depth:  Wanted depth.
+ * @ply:    current perft depth level (root = 1)
+ * @divide: output total for 1st level moves.
+ *
+ * Run perft on a position. This function displays the available moves at @depth
+ * level for each possible first move, and the total of moves.
+ *
+ * This version uses the algorithm:
+ *    if last depth
+ *      return 1;
+ *    gen legal moves
+ *    loop for legal move
+ *      do-move
+ *      perft (depth -1)
+ *      undo-move
+ *
+ * @return: total moves found at @depth level.
+ */
+u64 perft(pos_t *pos, int depth, int ply, bool divide)
+{
+    u64 subnodes = 0, nodes = 0;
+    movelist_t movelist;
+    move_t *move, *last;
+    state_t state;
+
+    pos_set_checkers_pinners_blockers(pos);
+
+    pos_legal(pos, pos_gen_pseudo(pos, &movelist));
+    last = movelist.move + movelist.nmoves;
+    for (move = movelist.move; move < last; ++move) {
+        if (depth == 1) {
+            subnodes = 1;
+        } else {
+            move_do(pos, *move, &state);
+            if (depth == 2) {
+                movelist_t movelist2;
+                pos_set_checkers_pinners_blockers(pos);
+                subnodes = pos_legal(pos, pos_gen_pseudo(pos, &movelist2))->nmoves;
+            } else if (ply >= 3) {
+                hentry_t *entry = tt_probe_perft(pos->key, depth);
+                if (entry != TT_MISS) {
+                    subnodes = HASH_PERFT_VAL(entry->data);
+                } else {
+                    subnodes = perft(pos, depth - 1, ply + 1, divide);
+                    tt_store_perft(pos->key, depth, subnodes);
+                }
+            } else {
+                subnodes = perft(pos, depth - 1, ply + 1, divide);
+            }
+            move_undo(pos, *move, &state);
+        }
+        nodes += subnodes;
+        if (ply == 1 && divide) {
+            char movestr[8];
+            printf("%s: %lu\n", move_to_str(movestr, *move, 0), subnodes);
+        }
+    }
+
+    return nodes;
+}
+
+/**
+ * perft_alt() - Perform perft on position, experimental version.
+ * @pos:    &position to search
+ * @depth:  Wanted depth.
+ * @ply:    current perft depth level (root = 1)
+ * @divide: output total for 1st level moves.
+ *
+ * Run perft on a position. This function displays the available moves at @depth
+ * level for each possible first move, and the total of moves.
+ *
+ * @return: total moves found at @depth level.
+ */
+u64 perft_alt(pos_t *pos, int depth, int ply, bool divide)
+{
+    u64 subnodes = 0, nodes = 0;
+    movelist_t movelist;
+    move_t *move, *last;
+    state_t state;
+
+    pos_set_checkers_pinners_blockers(pos);
+
+    pos_legal(pos, pos_gen_pseudo(pos, &movelist));
+    last = movelist.move + movelist.nmoves;
+    for (move = movelist.move; move < last; ++move) {
+        if (depth == 1) {
+            subnodes = 1;
+        } else {
+            move_do_alt(pos, *move, &state);
+            if (depth == 2) {
+                movelist_t movelist2;
+                pos_set_checkers_pinners_blockers(pos);
+                subnodes = pos_legal(pos, pos_gen_pseudo(pos, &movelist2))->nmoves;
+            } else {
+                subnodes = perft_alt(pos, depth - 1, ply + 1, divide);
+            }
+            move_undo_alt(pos, *move, &state);
+        }
+        nodes += subnodes;
+        if (ply == 1 && divide) {
+            char movestr[8];
+            printf("%s: %lu\n", move_to_str(movestr, *move, 0), subnodes);
+        }
+    }
+
+    return nodes;
+}

src/perft.h

@@ -1,6 +1,6 @@
-/* util.h - various util functions.
+/* perft.h.h - perft.
  *
- * Copyright (C) 2024 Bruno Raoult ("br")
+ * Copyright (C) 2021-2024 Bruno Raoult ("br")
  * Licensed under the GNU General Public License v3.0 or later.
  * Some rights reserved. See COPYING.
  *
@@ -11,8 +11,12 @@
  *
  */
 
-#ifndef _UTIL_H
+#ifndef PERFT_H
-#define _UTIL_H
+#define PERFT_H
 
+#include "position.h"
 
-#endif  /* UTIL_H */
+u64 perft(pos_t *pos, int depth, int ply, bool output);
+u64 perft_alt(pos_t *pos, int depth, int ply, bool output);
+
+#endif  /* PERFT_H */

src/position.h

@@ -88,8 +88,8 @@ static __always_inline void pos_set_sq(pos_t *pos, square_t square, piece_t piec
     bug_on(pos->board[square] != EMPTY);
 
     pos->board[square] = piece;
-    pos->bb[color][type] |= BIT(square);
+    pos->bb[color][type] ^= BIT(square);
-    pos->bb[color][ALL_PIECES] |= BIT(square);
+    pos->bb[color][ALL_PIECES] ^= BIT(square);
     //if (type == KING)
     //    pos->king[color] = square;
 
@@ -114,12 +114,38 @@ static __always_inline void pos_clr_sq(pos_t *pos, square_t square)
     //pos->key ^= zobrist_pieces[piece][square];
 
     pos->board[square] = EMPTY;
-    pos->bb[color][type] &= ~BIT(square);
+    pos->bb[color][type] ^= BIT(square);
-    pos->bb[color][ALL_PIECES] &= ~BIT(square);
+    pos->bb[color][ALL_PIECES] ^= BIT(square);
     //if (type == KING)
     //    pos->king[color] = SQUARE_NONE;
 }
 
+/**
+ * pos_mv_sq - move a piece from a square to another one.
+ * @pos: position
+ * @from: source square
+ * @to: dest square
+ *
+ * Both position board and bitboards are modified.
+ * This function is equivalent to:
+ *      pos_set_sq(pos, to, pos->board[from]);
+ *      pos_clr_sq(pos, from);
+ */
+static __always_inline void pos_mv_sq(pos_t *pos, square_t from, square_t to)
+{
+    piece_t pc = pos->board[from];
+    piece_type_t pt = PIECE(pc);
+    color_t color = COLOR(pc);
+    bitboard_t bb_squares = BIT(from) | BIT(to);
+
+    bug_on(pc == EMPTY || pos->board[to] != EMPTY);
+
+    pos->board[from] = EMPTY;
+    pos->board[to] = pc;
+    pos->bb[color][pt] ^= bb_squares;
+    pos->bb[color][ALL_PIECES] ^= bb_squares;
+}
+
 /**
  * pos_occ() - get position occupation (all pieces)
  * @pos: position

src/search.c

@@ -1,4 +1,4 @@
-/* search.c - perft + search.
+/* search.c - search for perfect move.
  *
  * Copyright (C) 2023-2024 Bruno Raoult ("br")
  * Licensed under the GNU General Public License v3.0 or later.
@@ -21,117 +21,6 @@
 #include "search.h"
 #include "attack.h"
 
-/**
- * perft() - Perform perft on position
- * @pos:    &position to search
- * @depth:  Wanted depth.
- * @ply:    current perft depth level (root = 1)
- * @divide: output total for 1st level moves.
- *
- * Run perft on a position. This function displays the available moves at @depth
- * level for each possible first move, and the total of moves.
- *
- * This version uses the algorithm:
- *    if last depth
- *      return 1;
- *    gen legal moves
- *    loop for legal move
- *      do-move
- *      perft (depth -1)
- *      undo-move
- *
- * @return: total moves found at @depth level.
- */
-u64 perft(pos_t *pos, int depth, int ply, bool divide)
-{
-    u64 subnodes = 0, nodes = 0;
-    movelist_t movelist;
-    move_t *move, *last;
-    state_t state;
-
-    pos_set_checkers_pinners_blockers(pos);
-
-    pos_legal(pos, pos_gen_pseudo(pos, &movelist));
-    last = movelist.move + movelist.nmoves;
-    for (move = movelist.move; move < last; ++move) {
-        if (depth == 1) {
-            subnodes = 1;
-        } else {
-            move_do(pos, *move, &state);
-            if (depth == 2) {
-                movelist_t movelist2;
-                pos_set_checkers_pinners_blockers(pos);
-                subnodes = pos_legal(pos, pos_gen_pseudo(pos, &movelist2))->nmoves;
-            } else if (ply >= 3) {
-                hentry_t *entry = tt_probe_perft(pos->key, depth);
-                if (entry != TT_MISS) {
-                    subnodes = HASH_PERFT_VAL(entry->data);
-                } else {
-                    subnodes = perft(pos, depth - 1, ply + 1, divide);
-                    tt_store_perft(pos->key, depth, subnodes);
-                }
-            } else {
-                subnodes = perft(pos, depth - 1, ply + 1, divide);
-            }
-            move_undo(pos, *move, &state);
-        }
-        nodes += subnodes;
-        if (ply == 1 && divide) {
-            char movestr[8];
-            printf("%s: %lu\n", move_to_str(movestr, *move, 0), subnodes);
-        }
-    }
-
-    return nodes;
-}
-
-/**
- * perft_alt() - Perform perft on position, experimental version.
- * @pos:    &position to search
- * @depth:  Wanted depth.
- * @ply:    current perft depth level (root = 1)
- * @divide: output total for 1st level moves.
- *
- * Run perft on a position. This function displays the available moves at @depth
- * level for each possible first move, and the total of moves.
- *
- * @return: total moves found at @depth level.
- */
-u64 perft_alt(pos_t *pos, int depth, int ply, bool divide)
-{
-    u64 subnodes = 0, nodes = 0;
-    movelist_t movelist;
-    move_t *move, *last;
-    state_t state;
-
-    pos_set_checkers_pinners_blockers(pos);
-
-    pos_legal(pos, pos_gen_pseudo(pos, &movelist));
-    last = movelist.move + movelist.nmoves;
-    for (move = movelist.move; move < last; ++move) {
-        if (depth == 1) {
-            subnodes = 1;
-        } else {
-            move_do_alt(pos, *move, &state);
-            if (depth == 2) {
-                movelist_t movelist2;
-                pos_set_checkers_pinners_blockers(pos);
-                subnodes = pos_legal(pos, pos_gen_pseudo(pos, &movelist2))->nmoves;
-            } else {
-                subnodes = perft_alt(pos, depth - 1, ply + 1, divide);
-            }
-            move_undo_alt(pos, *move, &state);
-        }
-        nodes += subnodes;
-        if (ply == 1 && divide) {
-            char movestr[8];
-            printf("%s: %lu\n", move_to_str(movestr, *move, 0), subnodes);
-        }
-    }
-
-    return nodes;
-}
-
 /**
  * negamax() - search position negamax.
  * @pos: &position to search

src/search.h

@@ -19,7 +19,4 @@
 //eval_t negamax(pos_t *pos, int depth, int color);
 //eval_t pvs(pos_t *pos, int depth, int alpha, int beta, int color);
 
-u64 perft(pos_t *pos, int depth, int ply, bool output);
-u64 perft_alt(pos_t *pos, int depth, int ply, bool output);
-
 #endif  /* SEARCH_H */

src/thread.c

@@ -0,0 +1,70 @@
+/* thread.c - thread management.
+ *
+ * Copyright (C) 2024 Bruno Raoult ("br")
+ * Licensed under the GNU General Public License v3.0 or later.
+ * Some rights reserved. See COPYING.
+ *
+ * You should have received a copy of the GNU General Public License along with this
+ * program. If not, see <https://www.gnu.org/licenses/gpl-3.0-standalone.html>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later <https://spdx.org/licenses/GPL-3.0-or-later.html>
+ *
+ */
+
+#include <stdio.h>
+
+#include <brlib.h>
+#include <pthread.h>
+#include <poll.h>
+#include <sys/socket.h>
+
+#include "thread.h"
+
+/* Still have to decide: thread or process ?
+ *
+ */
+thread_pool_t threadpool;
+
+
+/**
+ * thrd_create - initialize thrd.
+ */
+int thrd_create(__unused int num)
+{
+    int fd[2];
+    /* shall we make a communication channel via a pipe or socket ? */
+    int __unused ret = socketpair(AF_LOCAL, SOCK_SEQPACKET, PF_LOCAL, fd);
+    return 1;
+}
+
+/**
+ * thread_init - initialize thread pool.
+ */
+int thread_init(int nb)
+{
+    nb = clamp(nb, MIN_THRDS, MAX_THRDS);
+
+    /* stop unwanted threads, always keep 1 */
+    for (int i = nb + 1; i < threadpool.nb; ++i) {
+        printf("stopping thread %d - status = \n", i);
+        threadpool.thread[i].cmd = THRD_DO_QUIT;
+    }
+    for (int i = threadpool.nb; i < nb; ++i) {
+        printf("creating thread %d - status = \n", i);
+        thrd_create(i);
+
+    }
+
+    return nb;
+}
+
+/*
+  communication:
+  main thread -> thread
+           commands via memory
+  thread -> main thread
+           status via memory
+           output via pipe/socket
+  thread output will be output/filtered by main thread
+
+ */

src/thread.h

@@ -0,0 +1,55 @@
+/* thread.h - thread management.
+ *
+ * Copyright (C) 2021-2024 Bruno Raoult ("br")
+ * Licensed under the GNU General Public License v3.0 or later.
+ * Some rights reserved. See COPYING.
+ *
+ * You should have received a copy of the GNU General Public License along with this
+ * program. If not, see <https://www.gnu.org/licenses/gpl-3.0-standalone.html>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later <https://spdx.org/licenses/GPL-3.0-or-later.html>
+ *
+ */
+
+#ifndef THREAD_H
+#define THREAD_H
+
+#include <pthread.h>
+
+#include <brlib.h>
+
+#include "position.h"
+
+#define MIN_THRDS 1
+#define MAX_THRDS 16
+
+typedef enum {
+    THRD_DEAD,
+    THRD_IDLE,
+    THRD_WORKING,
+} thread_status_t;
+
+typedef enum {
+    /* main thread to subs */
+    THRD_DO_SEARCH,
+    THRD_DO_STOP,
+    THRD_DO_QUIT,
+} thread_cmd_t;
+
+typedef struct {
+    int id;
+    thread_status_t status;
+    thread_cmd_t cmd;
+    int fd[2];
+    pos_t pos;
+} thread_t;
+
+typedef struct {
+    int nb;
+    thread_t thread[MAX_THRDS + 1];
+} thread_pool_t;
+
+int thrd_create(__unused int num);
+int thread_init(int nb);
+
+#endif  /* THREAD_H */

src/uci.c

@@ -13,20 +13,22 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
 #include <unistd.h>
+#include <ctype.h>
 
 #include <brlib.h>
 
 #include "chessdefs.h"
+#include "util.h"
 #include "position.h"
-#include "uci.h"
 #include "hist.h"
 #include "fen.h"
 #include "move-gen.h"
 #include "move-do.h"
 #include "search.h"
+#include "perft.h"
+#include "eval-defs.h"
+#include "uci.h"
 
 struct command {
     char *name;                                   /* command name */
@@ -35,11 +37,10 @@ struct command {
 };
 
 int execute_line (pos_t *, struct command *, char *);
-
 struct command *find_command (char *);
-int string_trim (char *str);
 
-/* The names of functions that actually do the manipulation. */
+/* The names of functions that actually do the stuff.
+ */
 
 /* standard UCI commands */
 int do_ucinewgame(pos_t *, char *);
@@ -47,6 +48,7 @@ int do_uci(pos_t *, char *);
 int do_isready(pos_t *, char *);
 int do_quit(pos_t *, char *);
 
+int do_setoption(pos_t *, char *);
 int do_position(pos_t *, char *);
 
 /* commands *NOT* in UCI standard */
@@ -58,20 +60,19 @@ int do_hist(pos_t *, char *);
 int do_help(pos_t *, char *);
 
 struct command commands[] = {
-    { "help",       do_help, "(not UCI) This help" },
-    { "?",          do_help, "(not UCI) This help" },
     { "quit",       do_quit, "Quit" },
-
     { "uci",        do_uci, "" },
     { "ucinewgame", do_ucinewgame, "" },
     { "isready",    do_isready, "" },
-
+    { "setoption",  do_setoption, ""},
     { "position",   do_position, "position startpos|fen [moves ...]" },
 
     { "perft",      do_perft, "(not UCI) perft [divide] [alt] depth" },
     { "moves",      do_moves, "(not UCI) moves ..." },
     { "diagram",    do_diagram, "(not UCI) print current position diagram" },
     { "hist",       do_hist, "(not UCI) print history states" },
+    { "help",       do_help, "(not UCI) This help" },
+    { "?",          do_help, "(not UCI) This help" },
 
     { NULL, (int(*)()) NULL, NULL }
 };
@@ -87,7 +88,7 @@ int execute_line(pos_t *pos, struct command *command, char *args)
  * @name: &command string
  *
  * Look up NAME as the name of a command, and return a pointer to that
- *   command.  Return a NULL pointer if NAME isn't a command name.
+ * command.  Return a NULL pointer if NAME isn't a command name.
  */
 struct command *find_command(char *name)
 {
@@ -224,8 +225,37 @@ int do_uci(__unused pos_t *pos, __unused char *arg)
 {
     printf("id name brchess " VERSION "\n");
     printf("id author Bruno Raoult\n");
-    printf("option option name Hash type spin default %d min %d max %d\n",
+    printf("option name Hash type spin default %d min %d max %d\n",
            hash_tt.mb, HASH_SIZE_MIN, HASH_SIZE_MAX);
+
+    if (PST_NB > 1) {
+        printf("option name pst type combo default %s",
+               pst_name(pst_current));
+        for (int i = 0; i < PST_NB; ++i)
+            printf(" var %s", pst_name(i));
+    }
+    printf("\n");
+    for (int var = 0; var < EV_PARAMS_NB; ++var) {
+        if (param_setable(var)) {
+            int ptyp = param_type(var);
+            int pmin = param_min(var);
+            int pmax = param_max(var);
+            int pval = parameters[var];
+
+            printf("option name %s ", param_name(var));
+            switch(ptyp) {
+                case PAR_BTN:
+                    printf("type button\n");
+                    break;
+                case PAR_CHK:
+                    printf("type check default %s\n", pval? "true": "false");
+                    break;
+                case PAR_SPN:
+                    printf("type spin default %d min %d max %d\n", pval, pmin, pmax);
+                    break;
+            };
+        }
+    }
     printf("uciok\n");
     return 1;
 }
@@ -236,6 +266,72 @@ int do_isready(__unused pos_t *pos, __unused char *arg)
     return 1;
 }
 
+int do_setoption(__unused pos_t *pos, __unused char *arg)
+{
+    char *name, *value = NULL;
+
+    if (str_token(arg, "name") != arg)
+        return 1;
+    if (!(name = str_skip_word(arg)))
+        return 1;
+    /* at this point, we got a valid parameter name */
+    value = str_token(name, "value");             /* put '\0' at name end */
+    if (value) {
+        value = str_skip_word(value);
+        if (!value)
+            return 1;
+    }
+    if (str_eq_case(name, "hash") && value) {
+        tt_create(atoi(value));
+    } else if (str_eq_case(name, "pst")) {
+        pst_set(value);
+    } else {
+        int var = param_find_name(name);
+        if (var < 0) {
+            printf("wrong parameter '%s'\n", name);
+            return 1;
+        }
+        char *pname = param_name(var);
+        printf("found param <%s> = %d\n", pname, var);
+        if (param_setable(var)) {
+            int ptyp = param_min(var);
+            int pmin = param_min(var);
+            int pmax = param_max(var);
+            int pval;
+
+            switch(ptyp) {
+                case PAR_BTN:
+                    bug_on (value);
+                    printf("do button '%s'\n", pname);
+                    break;
+                case PAR_CHK:
+                    bug_on (!value);
+                    if (str_eq_case(value, "true"))
+                        pval = 1;
+                    else if (str_eq_case(value, "false"))
+                        pval = 0;
+                    else {
+                        printf("wrong value '%s' to '%s' boolean parameter\n",
+                               value, pname);
+                        return 1;
+                    }
+                    printf("set '%s' to %s\n", pname, pval? "true": "false");
+                    param_set(var, pval);
+                    break;
+                case PAR_SPN:
+                    bug_on (!value);
+                    pval = clamp(atoi(value), pmin, pmax);
+                    printf("set '%s' to %d\n", param_name(var), pval);
+                    param_set(var, pval);
+                    break;
+            }
+        }
+    }
+
+    return 0;
+}
+
+
 int do_position(pos_t *pos, char *arg)
 {
     char *saveptr, *token, *fen, *moves;
@@ -243,9 +339,7 @@ int do_position(pos_t *pos, char *arg)
     hist_init();
 
     /* separate "moves" section */
-    if ((moves = strstr(arg, "moves"))) {
+    moves = str_token(arg, "moves");
-        *(moves - 1) = 0;
-    }
     saveptr = NULL;
     token = strtok_r(arg, " ", &saveptr);
     if (!strcmp(token, "startpos")) {
@@ -414,48 +508,6 @@ int do_help(__unused pos_t *pos, __unused char *arg)
  * }
  */
 
-/**
- * string_trim - cleanup (trim) blank characters in string.
- * @str: &string to clean
- *
- * str is cleaned and packed with the following rules:
- * - Leading and trailing blank characters are removed.
- * - consecutive blank characters are replaced by one space.
- * - non printable characters are removed.
- *
- * "blank" means characters as understood by isspace(3): space, form-feed ('\f'),
- * newline ('\n'), carriage return ('\r'), horizontal tab  ('\t'), and vertical
- * tab ('\v').
- *
- * @return: new @str len.
- */
-int string_trim(char *str)
-{
-    char *to = str, *from = str;
-    int state = 1;
-
-    while (*from) {
-        switch (state) {
-            case 1:                               /* blanks */
-                while (*from && isspace(*from))
-                    from++;
-                state = 0;
-                break;
-            case 0:                               /* token */
-                while (*from && !isspace(*from)) {
-                    if (isprint(*from))
-                        *to++ = *from;
-                    from++;
-                }
-                *to++ = ' ';
-                state = 1;
-        }
-    }
-    if (to > str)
-        to--;
-    *to = 0;
-    return to - str;
-}
 
 static int done = 0;
 
@@ -467,15 +519,15 @@ int do_quit(__unused pos_t *pos, __unused char *arg)
 int uci(pos_t *pos)
 {
     char *str = NULL, *saveptr, *token, *args;
-    int len;
     size_t lenstr = 0;
     struct command *command;
 
     while (!done && getline(&str, &lenstr, stdin) >= 0) {
-        if (!(len = string_trim(str)))
+        str = str_trim(str);
+        if (! *str)
             continue;
         token = strtok_r(str, " ", &saveptr);
-        if (! (command= find_command(token))) {
+        if (! (command = find_command(token))) {
             fprintf(stderr, "Unknown [%s] command. Try 'help'.\n", token);
             continue;
         }

src/util.c

@@ -1,4 +1,4 @@
-/* misc.c - generic/catchall functions.
+/* util.c - generic/catchall functions.
  *
  * Copyright (C) 2024 Bruno Raoult ("br")
  * Licensed under the GNU General Public License v3.0 or later.
@@ -11,12 +11,15 @@
  *
  */
 
-#include <time.h>
+//#include <time.h>
-#include <stdlib.h>
+//#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
 
 #include <bug.h>
 
 #include "chessdefs.h"
+#include "util.h"
 
 /*
  * 1 sec      = 1000 millisec
@@ -146,3 +149,126 @@ u64 rand64(void)
     rand_seed ^= rand_seed >> 27;
     return rand_seed * 0x2545f4914f6cdd1dull;
 }
+
+/**
+ * str_eq_case - test if two strings are equal ignoring case
+ * @str1: string1
+ * @str2: string2
+ *
+ * Compare @str1 and @str2 byte-by-byte, ignoring case.
+ *
+ * @return: true is equal, false otherwise.
+ */
+bool str_eq_case(char *str1, char *str2)
+{
+    uchar *s1 = (uchar *) str1;
+    uchar *s2 = (uchar *) str2;
+
+    for (; *s1 && *s2; ++s1, ++s2) {
+        if (tolower(*s1) != tolower(*s2))
+            break;
+    }
+    //printf("d=%lu *s1=%d *s2=%d\n", s1 - (uchar *) str1, *s1, *s2);
+    return *s2 == *s1;
+}
+
+/**
+ * str_trim - cleanup (trim) blank characters in string.
+ * @str: &string to clean
+ *
+ * str is cleaned and packed with the following rules:
+ * - Leading and trailing blank characters are removed.
+ * - consecutive blank characters are replaced by one space.
+ * - non printable characters are removed.
+ *
+ * "blank" means characters as understood by isspace(3): space, form-feed ('\f'),
+ * newline ('\n'), carriage return ('\r'), horizontal tab  ('\t'), and vertical
+ * tab ('\v').
+ *
+ * @return: new @str len.
+ */
+char *str_trim(char *str)
+{
+    char *to = str, *from = str;
+    int state = 1;
+
+    bug_on(!str);
+    while (*from) {
+        switch (state) {
+            case 1:                               /* blanks */
+                while (*from && isspace(*from))
+                    from++;
+                state = 0;
+                break;
+            case 0:                               /* token */
+                while (*from && !isspace(*from)) {
+                    if (isprint(*from))
+                        *to++ = *from;
+                    from++;
+                }
+                *to++ = ' ';
+                state = 1;
+        }
+    }
+    if (to > str)
+        to--;
+    *to = 0;
+    return str;
+}
+
+/**
+ * str_token - split a string from next token.
+ * @str:   string to search
+ * @token: token to look for
+ *
+ * Look for token @token in string @str, and if found, split @str just before it.
+ * A token is a string delimited by one space character. However, it may contain
+ * space characters itself.
+ * @str should normally be normalized with @str_trim(), so that all consecutive
+ * blank characters are replaced by one, and leading/trailing ones removed.
+ *
+ * @return: @token address if found, NULL otherwise.
+ */
+char *str_token(char *str, const char *token)
+{
+    int len = strlen(token);
+    char *found = str;
+
+    bug_on(!str || !token);
+    if (!*token)                                  /* nothing to search */
+        return str;
+
+    while (found && *found) {
+        //printf("trying pos=%ld\n", found - str);
+        found = strstr(found, token);
+        if (found) {
+            if (!found[len] || isspace(found[len]))
+                break;
+            found = strchr(found, ' ') + 1;
+            //printf("new pos=%ld\n", found - str);
+        }
+    }
+    if (found > str)                              /* split string */
+        *(found - 1) = 0;
+    return found;
+}
+
+/**
+ * str_skip_word - find next word in a string.
+ * @str:   input string
+ *
+ * skip current word and following blank char.
+ * @str must be normalized with @str_trim(), so that all consecutive blank
+ * characters are already replaced by one, and leading/trailing ones removed.
+ * Note that 'word' means any sequence of non-space character.
+ *
+ * @str is not modified.
+ *
+ * @return: next word if found, NULL otherwise.
+ */
+char *str_skip_word(char *str)
+{
+    bug_on(!str);
+    str = strchr(str, ' ');
+    return str? str + 1: NULL;
+}

src/util.h

@@ -0,0 +1,61 @@
+/* util.h - various util functions.
+ *
+ * Copyright (C) 2024 Bruno Raoult ("br")
+ * Licensed under the GNU General Public License v3.0 or later.
+ * Some rights reserved. See COPYING.
+ *
+ * You should have received a copy of the GNU General Public License along with this
+ * program. If not, see <https://www.gnu.org/licenses/gpl-3.0-standalone.html>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later <https://spdx.org/licenses/GPL-3.0-or-later.html>
+ *
+ */
+
+#ifndef _UTIL_H
+#define _UTIL_H
+
+#include <brlib.h>
+
+#include <time.h>
+
+typedef struct mclock {
+    clockid_t clocktype;
+    ulong elapsed_l;
+    double elapsed_f;
+    struct timespec start;
+} mclock_t;
+
+#define CLOCK_WALL    CLOCK_REALTIME
+#define CLOCK_SYSTEM  CLOCK_MONOTONIC_RAW
+#define CLOCK_PROCESS CLOCK_PROCESS_CPUTIME_ID
+#define CLOCK_THREAD  CLOCK_THREAD_CPUTIME_ID
+
+/**
+ * CLOCK_DEFINE - define a clock type.
+ * @name: clock name
+ * @type: clock type
+ *
+ * This macro is equivalent to:
+ *   mclock_t name;
+ *   clock_init(&name, type);
+ */
+#define CLOCK_DEFINE(name, type) struct mclock name = { .clocktype = type }
+
+void clock_init(mclock_t *clock, clockid_t type);
+void clock_start(mclock_t *clock);
+s64 clock_elapsed_μs(mclock_t *clock);
+s64 clock_elapsed_ms(mclock_t *clock);
+double clock_elapsed_sec(mclock_t *clock);
+
+#define RAND_SEED_DEFAULT U64(0xb0d1ccea)
+
+void rand_init(u64 seed);
+u64 rand64(void);
+
+
+bool str_eq_case(char *str1, char *str2);
+char *str_trim(char *str);
+char *str_token(char *str, const char *token);
+char *str_skip_word(char *str);
+
+#endif  /* UTIL_H */

test/common-test.h

@@ -198,6 +198,10 @@ struct fentest {
     /*****************************************************
      * tests from talkchess                              *
      *****************************************************/
+    { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
+      "https://talkchess.com/viewtopic.php?t=21343",
+      "8/k7/3p4/p2P1p2/P2P1P2/8/8/K7 w - - 0 1"
+    },
     { __LINE__, FEN | MOVEGEN | MOVEDO | PERFT,
       "https://www.talkchess.com/forum3/viewtopic.php?f=7&t=71379",
       "8/6kR/8/8/8/bq6/1rqqqqqq/K1nqnbrq b - - 0 1"
@@ -447,7 +451,12 @@ struct fentest {
 
 static int fentest_cur = -1;
 
-static char *next_fen(uint module)
+static __unused void restart_fen(void)
+{
+    fentest_cur = -1;
+}
+
+static __unused char *next_fen(uint module)
 {
     fentest_cur++;
 

test/movedo-test.c

@@ -52,8 +52,8 @@ int main(int __unused ac, __unused char**av)
         for (move = movelist.move; move < last; ++move) {
             //pos_print(pos);
             //printf("i=%d j=%d  turn=%d move=[%s]\n", i, j, pos->turn,
-            //       move_str(movebuf, move, 0));
+            //       move_to_str(movebuf, *move, 0));
-            //move_p
+
             move_do(pos, *move, &state);
             //pos_print(pos);
             //fflush(stdout);
@@ -67,6 +67,7 @@ int main(int __unused ac, __unused char**av)
             move_undo(pos, *move, &state);
             pos->state = state;
             if (!pos_ok(pos, false)) {
+                //pos_print(pos);
                 printf("*** fen %d [%s] move %d [%s] invalid position after move_undo\n",
                        test_line, fen, j, movebuf);
                 exit(0);

test/perft-test.c

@@ -19,12 +19,13 @@
 #include <limits.h>
 
 #include "chessdefs.h"
+#include "util.h"
 #include "fen.h"
 #include "position.h"
 #include "move.h"
 #include "move-do.h"
 #include "move-gen.h"
-#include "search.h"
+#include "perft.h"
 
 #include "common-test.h"
 
@@ -241,7 +242,9 @@ static int usage(char *prg)
     fprintf(stderr, "Usage: %s [-cms][-d depth] [-p version] [-t size:\n", prg);
     fprintf(stderr, "\t-c:         do *not* print FEN comments\n");
     fprintf(stderr, "\t-d depth:   perft depth (default: 6)\n");
+    fprintf(stderr, "\t-l line:    start from 'line' test\n");
     fprintf(stderr, "\t-m:         print moves details\n");
+    fprintf(stderr, "\t-n number:  do 'number' tests (default: all)\n");
     fprintf(stderr, "\t-s:         use Stockfish to validate perft result\n");
     fprintf(stderr, "\t-t size:    Transposition Table size (Mb). Default: 32\n");
     fprintf(stderr,
@@ -251,7 +254,7 @@ static int usage(char *prg)
 
 int main(int ac, char**av)
 {
-    int curtest = 0;
+    int curtest = 0, totalfen = 0;
     u64 sf_count = 0, my_count;
     bool comment = true, sf_run = false, divide = false;
     char *fen;
@@ -261,6 +264,8 @@ int main(int ac, char**av)
     FILE *outfd = NULL;
     s64 ms, lps;
     int opt, depth = 6, run = 3, tt, newtt = HASH_SIZE_DEFAULT;
+    int startline = 1, ntests = INT_MAX;
+
     struct {
         s64 count, countskipped, ms;
         s64 minlps, maxlps;
@@ -272,7 +277,8 @@ int main(int ac, char**av)
         { .minlps = LONG_MAX },
     };
 
-    while ((opt = getopt(ac, av, "cd:mp:st:")) != -1) {
+    printf("Perft " VERSION "\n");
+    while ((opt = getopt(ac, av, "cd:l:mn:p:st:")) != -1) {
         switch (opt) {
             case 'c':
                 comment = false;
@@ -282,9 +288,15 @@ int main(int ac, char**av)
                 if (depth <= 0)
                     depth = 6;
                 break;
+            case 'l':
+                startline = atoi(optarg);
+                break;
             case 'm':
                 divide = true;
                 break;
+            case 'n':
+                ntests = atoi(optarg);
+                break;
             case 'p':
                 run = atoi(optarg);
                 break;
@@ -324,14 +336,23 @@ int main(int ac, char**av)
     if (sf_run)
         outfd = open_stockfish();
 
+    /* count total fen tests we will do */
+    while (next_fen(PERFT | MOVEDO))
+        totalfen++;
+    restart_fen();
+
     CLOCK_DEFINE(clock, CLOCK_MONOTONIC);
     while ((fen = next_fen(PERFT | MOVEDO))) {
+        if (cur_line() < startline)
+            continue;
+        if (curtest >= ntests)
+            break;
         if (!(fenpos = fen2pos(pos, fen))) {
             printf("wrong fen line:%d fen:%s\n\n", cur_line(), fen);
             continue;
         }
         curtest++;
-        printf("test:%d line:%d fen:%s\n", curtest, cur_line(), fen);
+        printf("test:%d/%d line:%d fen:%s\n", curtest, totalfen, cur_line(), fen);
         if (comment)
             printf("\t\"%s\"\n",
                    *cur_comment()? cur_comment(): "no test desc");