mirror of
https://github.com/official-stockfish/Stockfish.git
synced 2026-07-24 05:37:13 +00:00
After merging the HalfKA and Threats accumulators (7c7fe322) and the
subsequent removal of the double-incremental/fused update, a number of
NNUE helpers and fields became unreachable. Each was verified to have
zero callers/readers across the source tree:
- FusedUpdateData logic in FullThreats: the fused-update branch of
append_changed_indices and the FusedUpdateData parameter are unused;
the accumulator update no longer passes fused data.
- FullThreats::requires_refresh: never called. The live king-bucket
refresh check is HalfKAv2_hm::requires_refresh (PSQFeatureSet), used
in nnue_accumulator.
- HalfKAv2_hm::append_active_indices: never called. The live
active-index builder is FullThreats::append_active_indices
(ThreatFeatureSet).
- DirtyThreats::us, prevKsq and ksq: written in do_move but only read by
the now-removed FullThreats::requires_refresh. Removing them also
drops three stores from the do_move path.
- Unused feature Name constants and the unused FtOneVal / HiddenMaxVal
constants in nnue_common.h.
- Two stale feature-header banner comments.
closes https://github.com/official-stockfish/Stockfish/pull/6898
No functional change
128 lines
5.5 KiB
C++
128 lines
5.5 KiB
C++
/*
|
|
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
|
|
Copyright (C) 2004-2026 The Stockfish developers (see AUTHORS file)
|
|
|
|
Stockfish is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
Stockfish is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
//Definition of input features HalfKAv2_hm of NNUE evaluation function
|
|
|
|
#ifndef NNUE_FEATURES_HALF_KA_V2_HM_H_INCLUDED
|
|
#define NNUE_FEATURES_HALF_KA_V2_HM_H_INCLUDED
|
|
|
|
#include "../../misc.h"
|
|
#include "../../types.h"
|
|
#include "../nnue_common.h"
|
|
|
|
namespace Stockfish::Eval::NNUE::Features {
|
|
|
|
// Feature HalfKAv2_hm: Combination of the position of own king and the
|
|
// position of pieces. Position mirrored such that king is always on e..h files.
|
|
class HalfKAv2_hm {
|
|
|
|
// Unique number for each piece type on each square
|
|
enum {
|
|
PS_NONE = 0,
|
|
PS_W_PAWN = 0,
|
|
PS_B_PAWN = 1 * SQUARE_NB,
|
|
PS_W_KNIGHT = 2 * SQUARE_NB,
|
|
PS_B_KNIGHT = 3 * SQUARE_NB,
|
|
PS_W_BISHOP = 4 * SQUARE_NB,
|
|
PS_B_BISHOP = 5 * SQUARE_NB,
|
|
PS_W_ROOK = 6 * SQUARE_NB,
|
|
PS_B_ROOK = 7 * SQUARE_NB,
|
|
PS_W_QUEEN = 8 * SQUARE_NB,
|
|
PS_B_QUEEN = 9 * SQUARE_NB,
|
|
PS_KING = 10 * SQUARE_NB,
|
|
PS_NB = 11 * SQUARE_NB
|
|
};
|
|
|
|
static constexpr IndexType PieceSquareIndex[COLOR_NB][PIECE_NB] = {
|
|
// Convention: W - us, B - them
|
|
// Viewed from other side, W and B are reversed
|
|
{PS_NONE, PS_W_PAWN, PS_W_KNIGHT, PS_W_BISHOP, PS_W_ROOK, PS_W_QUEEN, PS_KING, PS_NONE,
|
|
PS_NONE, PS_B_PAWN, PS_B_KNIGHT, PS_B_BISHOP, PS_B_ROOK, PS_B_QUEEN, PS_KING, PS_NONE},
|
|
{PS_NONE, PS_B_PAWN, PS_B_KNIGHT, PS_B_BISHOP, PS_B_ROOK, PS_B_QUEEN, PS_KING, PS_NONE,
|
|
PS_NONE, PS_W_PAWN, PS_W_KNIGHT, PS_W_BISHOP, PS_W_ROOK, PS_W_QUEEN, PS_KING, PS_NONE}};
|
|
|
|
public:
|
|
// Hash value embedded in the evaluation file
|
|
static constexpr u32 HashValue = 0x7f234cb8u;
|
|
|
|
// Number of feature dimensions
|
|
static constexpr IndexType Dimensions =
|
|
static_cast<IndexType>(SQUARE_NB) * static_cast<IndexType>(PS_NB) / 2;
|
|
|
|
#define B(v) (v * PS_NB)
|
|
// clang-format off
|
|
static constexpr IndexType KingBuckets[SQUARE_NB] = {
|
|
B(28), B(29), B(30), B(31), B(31), B(30), B(29), B(28),
|
|
B(24), B(25), B(26), B(27), B(27), B(26), B(25), B(24),
|
|
B(20), B(21), B(22), B(23), B(23), B(22), B(21), B(20),
|
|
B(16), B(17), B(18), B(19), B(19), B(18), B(17), B(16),
|
|
B(12), B(13), B(14), B(15), B(15), B(14), B(13), B(12),
|
|
B( 8), B( 9), B(10), B(11), B(11), B(10), B( 9), B( 8),
|
|
B( 4), B( 5), B( 6), B( 7), B( 7), B( 6), B( 5), B( 4),
|
|
B( 0), B( 1), B( 2), B( 3), B( 3), B( 2), B( 1), B( 0),
|
|
};
|
|
// clang-format on
|
|
#undef B
|
|
// clang-format off
|
|
// Orient a square according to perspective (rotates by 180 for black)
|
|
static constexpr IndexType OrientTBL[SQUARE_NB] = {
|
|
SQ_H1, SQ_H1, SQ_H1, SQ_H1, SQ_A1, SQ_A1, SQ_A1, SQ_A1,
|
|
SQ_H1, SQ_H1, SQ_H1, SQ_H1, SQ_A1, SQ_A1, SQ_A1, SQ_A1,
|
|
SQ_H1, SQ_H1, SQ_H1, SQ_H1, SQ_A1, SQ_A1, SQ_A1, SQ_A1,
|
|
SQ_H1, SQ_H1, SQ_H1, SQ_H1, SQ_A1, SQ_A1, SQ_A1, SQ_A1,
|
|
SQ_H1, SQ_H1, SQ_H1, SQ_H1, SQ_A1, SQ_A1, SQ_A1, SQ_A1,
|
|
SQ_H1, SQ_H1, SQ_H1, SQ_H1, SQ_A1, SQ_A1, SQ_A1, SQ_A1,
|
|
SQ_H1, SQ_H1, SQ_H1, SQ_H1, SQ_A1, SQ_A1, SQ_A1, SQ_A1,
|
|
SQ_H1, SQ_H1, SQ_H1, SQ_H1, SQ_A1, SQ_A1, SQ_A1, SQ_A1 ,
|
|
};
|
|
// clang-format on
|
|
|
|
// Maximum number of simultaneously active features.
|
|
static constexpr IndexType MaxActiveDimensions = 32;
|
|
using IndexList = ValueList<IndexType, MaxActiveDimensions>;
|
|
using DiffType = DirtyPiece;
|
|
|
|
#if defined(USE_AVX512ICL)
|
|
// Compute all changed feature indices and write them to the given lists
|
|
static void write_indices(const std::array<Piece, SQUARE_NB>& oldPieces,
|
|
const std::array<Piece, SQUARE_NB>& newPieces,
|
|
Bitboard removedBB,
|
|
Bitboard addedBB,
|
|
Color perspective,
|
|
Square ksq,
|
|
IndexList& removed,
|
|
IndexList& added);
|
|
#endif
|
|
|
|
// Index of a feature for a given king position and another piece on some square
|
|
|
|
static IndexType make_index(Color perspective, Square s, Piece pc, Square ksq);
|
|
|
|
// Get a list of indices for recently changed features
|
|
static void append_changed_indices(
|
|
Color perspective, Square ksq, const DiffType& diff, IndexList& removed, IndexList& added);
|
|
|
|
// Returns whether the change stored in this DirtyPiece means
|
|
// that a full accumulator refresh is required.
|
|
static bool requires_refresh(const DiffType& diff, Color perspective);
|
|
};
|
|
|
|
} // namespace Stockfish::Eval::NNUE::Features
|
|
|
|
#endif // #ifndef NNUE_FEATURES_HALF_KA_V2_HM_H_INCLUDED
|