diff options
| author | Scott Gasch <[email protected]> | 2026-09-03 17:40:17 -0700 |
|---|---|---|
| committer | Scott Gasch <[email protected]> | 2026-09-03 17:40:17 -0700 |
| commit | dddcaa09ad12f1972a3128748b5d90d22f9a9326 (patch) | |
| tree | c9a3088e1a42e50baed9d51dac3324580715946b /src/chess.h | |
| parent | 879fbe58abc497cb47115d66a4eaca9df15fb4bc (diff) | |
Cherry-pick non-LMR fixes and tooling from the "LMR" stash
Pulled the parts of the stashed LMR work that are genuinely independent
of the reduction logic itself, leaving the actual LMR redesign for
separate review:
- Fix extension-taper table overflow: remove the flat MAX_EXTEND_PER_LINE
cap and instead clamp the depth used to build g_uExtensionReduction[]
so a deep `sd` request can't leave the whole taper table stuck at "0
penalty" (every index unreachable).
- Remove a spuriously-firing ASSERT(fMovesRescoredByIID) in Search():
RescoreMovesViaSearch's own fail-high branch deliberately leaves that
flag FALSE by contract, so the assert could fire on any DEBUG build
given an unlucky rescore, making the DEBUG/TEST harness unreliable.
- Misc correctness/portability fixes: unix.c pointer-truncation casts,
chess.h's CONTAINING_STRUCT/IS_ENPASSANT/ABS_DIFF macro hardening
(plus gating the branchless bit-tricks on _X64_ too, not just _X86_),
removal of dead Slide*WithoutSigs prototypes, main.c's hash default
bumped to 256m and its CPP self-test's arch gate widened to _X64_.
- eval_tune/match_play.py: cosmetic SPRT progress-bar/output rework.
- Delete eval_tune/run_ecm.sh (superseded, unreferenced elsewhere).
- run_tests.sh: parameterize suites/SD/SN via args/env vars instead of
hardcoding the three curated suites and sd10/sn5M (defaults kept
pointing at the existing curated suites, since the stash's own
lmr_sensitive_30/lmr_control_30 default suites aren't present in the
repo).
Deliberately left out of this commit: the stash's actual LMR reduction
logic, the M-SIGNAL-SHADOW diagnostic subsystem, the large PERF_COUNTERS
instrumentation buildout, the history-table gravity rework, and the
FindEnprisePiece pre-move staleness fix (skipped per request pending a
decision on whether to also change EFP's pruning behavior).
Co-Authored-By: Claude Sonnet 5 <[email protected]>
Claude-Session: https://claude.ai/code/session_01MjdDfHry3i2jfJzyDXaG8A
Diffstat (limited to 'src/chess.h')
| -rwxr-xr-x | src/chess.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/chess.h b/src/chess.h index 062e3dc..5e1d4a5 100755 --- a/src/chess.h +++ b/src/chess.h @@ -162,7 +162,7 @@ typedef struct _DLIST_ENTRY #endif #ifndef CONTAINING_STRUCT #define CONTAINING_STRUCT(address, type, field) \ - ((type *)((BYTE *)(address) - (OFFSET_OF(field, type)))) + ((type *)((BYTE *)(address) - (BYTE *)(OFFSET_OF(field, type)))) #endif #define WHITE (1) @@ -189,7 +189,6 @@ typedef struct _DLIST_ENTRY #define THREE_PLY 192 #define FOUR_PLY 256 #define MAX_DEPTH_PER_SEARCH (MAX_PLY_PER_SEARCH * ONE_PLY) -#define MAX_EXTEND_PER_LINE (MAX_PLY_PER_SEARCH * ONE_PLY / 2) #define IS_VALID_DEPTH(x) (((x) >= 0) && \ ((x) <= MAX_DEPTH_PER_SEARCH) && \ @@ -521,7 +520,7 @@ typedef union _MOVE ((mv).uMove & 0x0FF00000) #define IS_ENPASSANT(mv) \ - (IS_SPECIAL_MOVE(mv) && (mv.pCaptured) && !IS_PROMOTION(mv)) + (IS_SPECIAL_MOVE(mv) && ((mv).pCaptured) && !IS_PROMOTION(mv)) #define IS_DOUBLE_JUMP(mv) \ (IS_SPECIAL_MOVE(mv) && !IS_CAPTURE_OR_PROMOTION(mv)) @@ -1206,7 +1205,13 @@ _assert(CHAR *szFile, ULONG uLine); #define MIN(x, y) (((x) < (y)) ? (x) : (y)) #define MAX(x, y) (((x) > (y)) ? (x) : (y)) -#ifdef _X86_ +#if defined(_X86_) || defined(_X64_) +// +// Note: these are 32-bit int bit tricks, not actually x86-specific -- +// they only require sizeof(int) == 4, which still holds under the LP64 +// data model used by 64-bit (_X64_) builds. Gated on both so a SIXTYFOUR +// build (which defines _X64_, not _X86_) still gets the branchless +// versions instead of falling through to the plain-C fallbacks below. // // Note: MAXU, MINU and ABS_DIFF require arguments with the high order // bit CLEAR to work right. @@ -1236,7 +1241,7 @@ _assert(CHAR *szFile, ULONG uLine); #define ABS_DIFF(a, b) \ (((b)-(a)) - ((((b) - (a)) & (((int)((b) - (a))) >> 31) ) << 1)) -#endif // _X86_ +#endif // _X86_ || _X64_ #ifndef MINU #define MINU(x, y) (MIN((x), (y))) @@ -1255,7 +1260,7 @@ _assert(CHAR *szFile, ULONG uLine); #endif #ifndef ABS_DIFF -#define ABS_DIFF(a, b) (abs((int)(a) - (int)(b))) +#define ABS_DIFF(a, b) (abs((a) - (b))) #endif #define FILE_DISTANCE(a, b) (ABS_DIFF(FILE((a)), FILE((b)))) @@ -1746,14 +1751,8 @@ void SlidePiece(POSITION *pos, COOR cFrom, COOR cTo); void -SlidePieceWithoutSigs(POSITION *pos, COOR cFrom, COOR cTo); - -void SlidePawn(POSITION *pos, COOR cFrom, COOR cTo); -void -SlidePawnWithoutSigs(POSITION *pos, COOR cFrom, COOR cTo); - PIECE LiftPiece(POSITION *pos, COOR cSquare); |
