rshogi-core 0.1.8

A high-performance shogi engine core library with NNUE evaluation
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
//! 評価・補正ヘルパー関数群
//!
//! 補正履歴、静的評価コンテキスト、置換表プローブ等。

use crate::eval::evaluate_pass_rights;
use crate::position::Position;
use crate::types::{Bound, Color, Depth, Move, Value, MAX_PLY};

use super::alpha_beta::{
    to_corrected_static_eval, EvalContext, ProbeOutcome, SearchContext, SearchState, TTContext,
};
use super::history::CORRECTION_HISTORY_SIZE;
use super::search_helpers::{ensure_nnue_accumulator, nnue_evaluate};
use super::stats::inc_stat_by_depth;
use super::types::{value_from_tt, NodeType};

// =============================================================================
// 補正履歴
// =============================================================================

/// 補正履歴から静的評価の補正値を算出
#[inline]
pub(super) fn correction_value(
    st: &SearchState,
    ctx: &SearchContext<'_>,
    pos: &Position,
    ply: i32,
) -> i32 {
    let us = pos.side_to_move();
    let pawn_idx = (pos.pawn_key() as usize) & (CORRECTION_HISTORY_SIZE - 1);
    let minor_idx = (pos.minor_piece_key() as usize) & (CORRECTION_HISTORY_SIZE - 1);
    let non_pawn_idx_w = (pos.non_pawn_key(Color::White) as usize) & (CORRECTION_HISTORY_SIZE - 1);
    let non_pawn_idx_b = (pos.non_pawn_key(Color::Black) as usize) & (CORRECTION_HISTORY_SIZE - 1);

    // continuation_value 用の事前計算
    let cont_params = if ply >= 2 {
        let prev_move = st.stack[(ply - 1) as usize].current_move;
        if prev_move.is_normal() {
            st.stack[(ply - 2) as usize].cont_hist_key.map(|prev2_key| {
                let pc = pos.piece_on(prev_move.to());
                (prev2_key.piece, prev2_key.to, pc, prev_move.to())
            })
        } else {
            None
        }
    } else {
        None
    };

    ctx.history.with_read(|h| {
        let pcv = h.correction_history.pawn_value(pawn_idx, us) as i32;
        let micv = h.correction_history.minor_value(minor_idx, us) as i32;
        let wnpcv = h.correction_history.non_pawn_value(non_pawn_idx_w, Color::White, us) as i32;
        let bnpcv = h.correction_history.non_pawn_value(non_pawn_idx_b, Color::Black, us) as i32;

        let cntcv = cont_params
            .map(|(piece, to, pc, prev_to)| {
                h.correction_history.continuation_value(piece, to, pc, prev_to) as i32
            })
            .unwrap_or(0);

        8867 * pcv + 8136 * micv + 10_757 * (wnpcv + bnpcv) + 7232 * cntcv
    })
}

/// 補正履歴の更新
#[inline]
pub(super) fn update_correction_history(
    st: &SearchState,
    ctx: &SearchContext<'_>,
    pos: &Position,
    ply: i32,
    bonus: i32,
) {
    let us = pos.side_to_move();
    let pawn_idx = (pos.pawn_key() as usize) & (CORRECTION_HISTORY_SIZE - 1);
    let minor_idx = (pos.minor_piece_key() as usize) & (CORRECTION_HISTORY_SIZE - 1);
    let non_pawn_idx_w = (pos.non_pawn_key(Color::White) as usize) & (CORRECTION_HISTORY_SIZE - 1);
    let non_pawn_idx_b = (pos.non_pawn_key(Color::Black) as usize) & (CORRECTION_HISTORY_SIZE - 1);

    // continuation_update 用の事前計算
    let cont_params = if ply >= 2 {
        let prev_move = st.stack[(ply - 1) as usize].current_move;
        if prev_move.is_normal() {
            st.stack[(ply - 2) as usize].cont_hist_key.map(|prev2_key| {
                let pc = pos.piece_on(prev_move.to());
                (prev2_key.piece, prev2_key.to, pc, prev_move.to())
            })
        } else {
            None
        }
    } else {
        None
    };

    const NON_PAWN_WEIGHT: i32 = 165;

    ctx.history.with_write(|h| {
        h.correction_history.update_pawn(pawn_idx, us, bonus);
        h.correction_history.update_minor(minor_idx, us, bonus * 153 / 128);
        h.correction_history.update_non_pawn(
            non_pawn_idx_w,
            Color::White,
            us,
            bonus * NON_PAWN_WEIGHT / 128,
        );
        h.correction_history.update_non_pawn(
            non_pawn_idx_b,
            Color::Black,
            us,
            bonus * NON_PAWN_WEIGHT / 128,
        );

        if let Some((piece, to, pc, prev_to)) = cont_params {
            h.correction_history
                .update_continuation(piece, to, pc, prev_to, bonus * 153 / 128);
        }
    });
}

// =============================================================================
// 置換表プローブ
// =============================================================================

/// 置換表プローブ
#[allow(clippy::too_many_arguments)]
pub(super) fn probe_transposition<const NT: u8>(
    st: &mut SearchState,
    ctx: &SearchContext<'_>,
    pos: &mut Position,
    depth: Depth,
    beta: Value,
    ply: i32,
    pv_node: bool,
    in_check: bool,
    excluded_move: Move,
) -> ProbeOutcome {
    let key = pos.key();
    let tt_result = ctx.tt.probe(key, pos);
    let tt_hit = tt_result.found;
    let tt_data = tt_result.data;

    st.stack[ply as usize].tt_hit = tt_hit;
    // excludedMoveがある場合は前回のttPvを維持(YaneuraOu準拠)
    st.stack[ply as usize].tt_pv = if excluded_move.is_some() {
        st.stack[ply as usize].tt_pv
    } else {
        pv_node || (tt_hit && tt_data.is_pv)
    };

    let tt_move = if tt_hit { tt_data.mv } else { Move::NONE };
    let tt_value = if tt_hit {
        value_from_tt(tt_data.value, ply)
    } else {
        Value::NONE
    };
    let tt_capture = tt_move.is_some() && pos.is_capture(tt_move);

    // TT統計収集
    inc_stat_by_depth!(st, tt_probe_by_depth, depth);
    if tt_hit {
        inc_stat_by_depth!(st, tt_hit_by_depth, depth);
    }

    // excludedMoveがある場合はカットオフしない(YaneuraOu準拠)
    if !pv_node
        && excluded_move.is_none()
        && tt_hit
        && tt_data.depth >= depth
        && tt_value != Value::NONE
        && tt_data.bound.can_cutoff(tt_value, beta)
    {
        return ProbeOutcome::Cutoff(tt_value);
    }

    // TTカットオフ失敗理由の統計
    #[cfg(feature = "search-stats")]
    if !pv_node && excluded_move.is_none() && tt_hit && tt_value != Value::NONE {
        if tt_data.depth < depth {
            inc_stat_by_depth!(st, tt_fail_depth_by_depth, depth);
        } else if !tt_data.bound.can_cutoff(tt_value, beta) {
            inc_stat_by_depth!(st, tt_fail_bound_by_depth, depth);
        }
    }

    // 1手詰め判定(置換表未ヒット時のみ、Rootでは実施しない)
    // excludedMoveがある場合も実施しない(詰みがあればsingular前にbeta cutするため)
    if NT != NodeType::Root as u8 && !in_check && !tt_hit && excluded_move.is_none() {
        let mate_move = pos.mate_1ply();
        if mate_move.is_some() {
            let value = Value::mate_in(ply + 1);
            let stored_depth = (depth + 6).min(MAX_PLY - 1);
            tt_result.write(
                key,
                value,
                st.stack[ply as usize].tt_pv,
                Bound::Exact,
                stored_depth,
                mate_move,
                Value::NONE,
                ctx.tt.generation(),
            );
            inc_stat_by_depth!(st, tt_write_by_depth, stored_depth);
            return ProbeOutcome::Cutoff(value);
        }
    }

    ProbeOutcome::Continue(TTContext {
        key,
        result: tt_result,
        data: tt_data,
        hit: tt_hit,
        mv: tt_move,
        value: tt_value,
        capture: tt_capture,
    })
}

// =============================================================================
// 静的評価コンテキスト
// =============================================================================

/// 静的評価と補正値の計算
///
/// # 引数
/// - `pv_node`: PVノードかどうか。PVノードでは必ずNNUE評価を実行する(YaneuraOu準拠)
#[allow(clippy::too_many_arguments)]
pub(super) fn compute_eval_context(
    st: &mut SearchState,
    ctx: &SearchContext<'_>,
    pos: &mut Position,
    ply: i32,
    in_check: bool,
    pv_node: bool,
    tt_ctx: &TTContext,
    excluded_move: Move,
) -> EvalContext {
    let corr_value = correction_value(st, ctx, pos, ply);

    // excludedMoveがある場合は、前回のstatic_evalをそのまま使用(YaneuraOu準拠)
    if excluded_move.is_some() {
        let static_eval = st.stack[ply as usize].static_eval;
        let improving = if ply >= 2 && !in_check && static_eval != Value::NONE {
            static_eval > st.stack[(ply - 2) as usize].static_eval
        } else {
            false
        };
        let opponent_worsening = if ply >= 1 && static_eval != Value::NONE {
            let prev_eval = st.stack[(ply - 1) as usize].static_eval;
            prev_eval != Value::NONE && static_eval > -prev_eval
        } else {
            false
        };
        return EvalContext {
            static_eval,
            unadjusted_static_eval: static_eval, // excludedMove時は未補正値も同じ
            correction_value: corr_value,
            improving,
            opponent_worsening,
        };
    }

    let mut unadjusted_static_eval = Value::NONE;

    // デバッグ: TTヒット時のeval状態を確認
    #[cfg(feature = "search-stats")]
    {
        use std::sync::atomic::{AtomicU64, Ordering};
        static TT_EVAL_VALID: AtomicU64 = AtomicU64::new(0);
        static TT_EVAL_NONE: AtomicU64 = AtomicU64::new(0);
        static TT_MISS: AtomicU64 = AtomicU64::new(0);
        static TT_PV_NODE: AtomicU64 = AtomicU64::new(0);

        if !in_check {
            if tt_ctx.hit {
                if tt_ctx.data.eval != Value::NONE {
                    if !pv_node {
                        TT_EVAL_VALID.fetch_add(1, Ordering::Relaxed);
                    } else {
                        TT_PV_NODE.fetch_add(1, Ordering::Relaxed);
                    }
                } else {
                    TT_EVAL_NONE.fetch_add(1, Ordering::Relaxed);
                }
            } else {
                TT_MISS.fetch_add(1, Ordering::Relaxed);
            }
        }

        // 一定間隔でログ出力
        let total = TT_EVAL_VALID.load(Ordering::Relaxed)
            + TT_EVAL_NONE.load(Ordering::Relaxed)
            + TT_MISS.load(Ordering::Relaxed)
            + TT_PV_NODE.load(Ordering::Relaxed);
        if total > 0 && total.is_multiple_of(100000) {
            eprintln!(
                "[TT-EVAL-DEBUG] valid={}, none={}, miss={}, pv={}",
                TT_EVAL_VALID.load(Ordering::Relaxed),
                TT_EVAL_NONE.load(Ordering::Relaxed),
                TT_MISS.load(Ordering::Relaxed),
                TT_PV_NODE.load(Ordering::Relaxed),
            );
        }
    }

    // YaneuraOu準拠: TTからのeval取得 + PvNodeでは必ずevaluate()
    // yaneuraou-search.cpp:2680-2706 参照
    // 「🌈 これ書かないとR70ぐらい弱くなる。」
    let mut static_eval = if in_check {
        Value::NONE
    } else if tt_ctx.hit && tt_ctx.data.eval != Value::NONE && !pv_node {
        // TTヒット && eval有効 && 非PVノード → TTからevalを取得
        ensure_nnue_accumulator(st, pos);
        unadjusted_static_eval = tt_ctx.data.eval;

        // デバッグ: TTから取得したevalとNNUE評価を比較
        #[cfg(feature = "search-stats")]
        {
            use std::sync::atomic::{AtomicU64, Ordering};
            static EVAL_MATCH: AtomicU64 = AtomicU64::new(0);
            static EVAL_MISMATCH: AtomicU64 = AtomicU64::new(0);

            let nnue_eval = nnue_evaluate(st, pos);
            if unadjusted_static_eval == nnue_eval {
                EVAL_MATCH.fetch_add(1, Ordering::Relaxed);
            } else {
                EVAL_MISMATCH.fetch_add(1, Ordering::Relaxed);
                // 不一致時の差分を出力(最初の10回のみ)
                static MISMATCH_LOG_COUNT: AtomicU64 = AtomicU64::new(0);
                let log_count = MISMATCH_LOG_COUNT.fetch_add(1, Ordering::Relaxed);
                if log_count < 10 {
                    eprintln!(
                        "[EVAL-MISMATCH] tt_eval={}, nnue_eval={}, diff={}",
                        unadjusted_static_eval.raw(),
                        nnue_eval.raw(),
                        (unadjusted_static_eval.raw() - nnue_eval.raw()).abs()
                    );
                }
            }

            let m = EVAL_MATCH.load(Ordering::Relaxed);
            let mm = EVAL_MISMATCH.load(Ordering::Relaxed);
            let total = m + mm;
            // 毎回出力(デバッグ用)
            if total == 1
                || total == 100
                || total == 1000
                || total == 5000
                || total == 10000
                || total == 18000
            {
                eprintln!(
                    "[EVAL-COMPARE] match={}, mismatch={} (mismatch rate: {:.2}%)",
                    m,
                    mm,
                    if total > 0 {
                        mm as f64 / total as f64 * 100.0
                    } else {
                        0.0
                    },
                );
            }
        }

        unadjusted_static_eval
    } else {
        // PVノード または TTミス/eval無効 → 常にNNUE評価
        unadjusted_static_eval = nnue_evaluate(st, pos);
        unadjusted_static_eval
    };

    if !in_check && unadjusted_static_eval != Value::NONE {
        static_eval = to_corrected_static_eval(unadjusted_static_eval, corr_value);
        // パス権評価を動的に追加(TTには保存されないので手数依存でもOK)
        static_eval += evaluate_pass_rights(pos, pos.game_ply() as u16);
    }

    if !in_check
        && tt_ctx.hit
        && tt_ctx.value != Value::NONE
        && !tt_ctx.value.is_mate_score()
        && ((tt_ctx.value > static_eval && tt_ctx.data.bound == Bound::Lower)
            || (tt_ctx.value < static_eval && tt_ctx.data.bound == Bound::Upper))
    {
        static_eval = tt_ctx.value;
    }

    st.stack[ply as usize].static_eval = static_eval;

    let improving = if ply >= 2 && !in_check {
        static_eval > st.stack[(ply - 2) as usize].static_eval
    } else {
        false
    };
    let opponent_worsening = if ply >= 1 && static_eval != Value::NONE {
        let prev_eval = st.stack[(ply - 1) as usize].static_eval;
        prev_eval != Value::NONE && static_eval > -prev_eval
    } else {
        false
    };

    EvalContext {
        static_eval,
        unadjusted_static_eval,
        correction_value: corr_value,
        improving,
        opponent_worsening,
    }
}