Compare commits
7 Commits
4733a1d65f
...
thread
Author | SHA1 | Date | |
---|---|---|---|
c0bbf03551 | |||
01af1f5c49 | |||
6ea77c85e1 | |||
3fb0c92653 | |||
a6a21626c7 | |||
2cd1289cd6 | |||
d5920886a3 |
4
Makefile
4
Makefile
@@ -414,13 +414,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
|
||||
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))
|
||||
|
@@ -142,42 +142,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 */
|
||||
|
@@ -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 */
|
||||
[WT_MAT] = { 100, 0, 400, true, "material weight" },
|
||||
[WT_PST] = { 100, 0, 400, true, "pst weight" },
|
||||
/* type setable def min max name */
|
||||
[WT_MAT] = { PAR_SPN, true, 100, 0, 400, "material 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,7 +249,7 @@ static const struct pst {
|
||||
* https://www.chessprogramming.org/Simplified_Evaluation_Function
|
||||
* Note: ≠ https://github.com/nescitus/cpw-engine
|
||||
*/
|
||||
"cpw",
|
||||
"CPW",
|
||||
{
|
||||
/* A8 ..... H8
|
||||
* ...........
|
||||
@@ -394,7 +396,7 @@ static const struct pst {
|
||||
* sjeng: https://github.com/gcp/sjeng
|
||||
* Rook and Queen from CPW.
|
||||
*/
|
||||
"sjeng",
|
||||
"Sjeng",
|
||||
{
|
||||
/* A8 ..... H8
|
||||
* ...........
|
||||
@@ -536,15 +538,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)
|
||||
if (!strcmp(pst_defs[i].name, str))
|
||||
for (int i = 0; i < PST_NB; ++i) {
|
||||
if (str_eq_case(pst_defs[i].name, str))
|
||||
return i;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -578,3 +586,10 @@ void pst_init(int set)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
char *pst_name(int i)
|
||||
{
|
||||
if (i >= 0 && i < PST_NB)
|
||||
return pst_defs[i].name;
|
||||
return "undef";
|
||||
}
|
||||
|
@@ -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);
|
||||
|
||||
|
@@ -19,6 +19,7 @@
|
||||
#include <bug.h>
|
||||
|
||||
#include "chessdefs.h"
|
||||
#include "util.h"
|
||||
#include "alloc.h"
|
||||
#include "position.h"
|
||||
#include "piece.h"
|
||||
|
@@ -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;
|
||||
bug_on_always((pst = pst_find(PST_DEFAULT)) < 0);
|
||||
pst_init(pst);
|
||||
pst_init(PST_DEFAULT);
|
||||
|
||||
printf("done.\n");
|
||||
}
|
||||
|
131
src/perft.c
Normal file
131
src/perft.c
Normal file
@@ -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;
|
||||
}
|
@@ -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
|
||||
#define _UTIL_H
|
||||
#ifndef PERFT_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 */
|
113
src/search.c
113
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
|
||||
|
@@ -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 */
|
||||
|
69
src/thread.c
Normal file
69
src/thread.c
Normal file
@@ -0,0 +1,69 @@
|
||||
/* 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
|
||||
|
||||
*/
|
55
src/thread.h
Normal file
55
src/thread.h
Normal file
@@ -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 */
|
172
src/uci.c
172
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 - 1) = 0;
|
||||
}
|
||||
moves = str_token(arg, "moves");
|
||||
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;
|
||||
}
|
||||
|
@@ -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 <stdlib.h>
|
||||
//#include <time.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;
|
||||
}
|
61
src/util.h
Normal file
61
src/util.h
Normal file
@@ -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 */
|
@@ -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"
|
||||
|
||||
|
Reference in New Issue
Block a user