Cleanup, fix style issues

use naming convention for variables, functions, constants

closes https://github.com/official-stockfish/Stockfish/pull/6416

no functional change
This commit is contained in:
Shawn Xu
2025-11-14 17:29:01 +01:00
committed by Joost VandeVondele
parent 7b7a9485d6
commit bd82b9e01f
2 changed files with 39 additions and 38 deletions
+19 -18
View File
@@ -636,25 +636,26 @@ void update_accumulator_incremental(
(target_state.template acc<TransformedFeatureDimensions>()).computed[Perspective] = true;
}
Bitboard get_changed_pieces(const Piece old[SQUARE_NB], const Piece new_[SQUARE_NB]) {
Bitboard get_changed_pieces(const Piece oldPieces[SQUARE_NB], const Piece newPieces[SQUARE_NB]) {
#if defined(USE_AVX512) || defined(USE_AVX2)
static_assert(sizeof(Piece) == 1);
Bitboard same_bb = 0;
Bitboard sameBB = 0;
for (int i = 0; i < 64; i += 32)
{
const __m256i old_v = _mm256_loadu_si256(reinterpret_cast<const __m256i*>(old + i));
const __m256i new_v = _mm256_loadu_si256(reinterpret_cast<const __m256i*>(new_ + i));
const __m256i cmp_equal = _mm256_cmpeq_epi8(old_v, new_v);
const std::uint32_t equal_mask = _mm256_movemask_epi8(cmp_equal);
same_bb |= static_cast<Bitboard>(equal_mask) << i;
const __m256i old_v = _mm256_loadu_si256(reinterpret_cast<const __m256i*>(oldPieces + i));
const __m256i new_v = _mm256_loadu_si256(reinterpret_cast<const __m256i*>(newPieces + i));
const __m256i cmpEqual = _mm256_cmpeq_epi8(old_v, new_v);
const std::uint32_t equalMask = _mm256_movemask_epi8(cmpEqual);
sameBB |= static_cast<Bitboard>(equalMask) << i;
}
return ~same_bb;
return ~sameBB;
#else
Bitboard changed = 0;
for (Square sq = SQUARE_ZERO; sq < SQUARE_NB; ++sq)
{
changed |= static_cast<Bitboard>(old[sq] != new_[sq]) << sq;
}
changed |= static_cast<Bitboard>(oldPieces[sq] != newPieces[sq]) << sq;
return changed;
#endif
}
@@ -671,18 +672,18 @@ void update_accumulator_refresh_cache(const FeatureTransformer<Dimensions>& feat
auto& entry = cache[ksq][Perspective];
PSQFeatureSet::IndexList removed, added;
const Bitboard changed_bb = get_changed_pieces(entry.pieces, pos.piece_array().data());
Bitboard removed_bb = changed_bb & entry.pieceBB;
Bitboard added_bb = changed_bb & pos.pieces();
const Bitboard changedBB = get_changed_pieces(entry.pieces, pos.piece_array().data());
Bitboard removedBB = changedBB & entry.pieceBB;
Bitboard addedBB = changedBB & pos.pieces();
while (removed_bb)
while (removedBB)
{
Square sq = pop_lsb(removed_bb);
Square sq = pop_lsb(removedBB);
removed.push_back(PSQFeatureSet::make_index<Perspective>(sq, entry.pieces[sq], ksq));
}
while (added_bb)
while (addedBB)
{
Square sq = pop_lsb(added_bb);
Square sq = pop_lsb(addedBB);
added.push_back(PSQFeatureSet::make_index<Perspective>(sq, pos.piece_on(sq), ksq));
}
+20 -20
View File
@@ -1096,13 +1096,13 @@ void Position::update_piece_threats(Piece pc, Square s, DirtyThreats* const dts)
while (threatened)
{
Square threatened_sq = pop_lsb(threatened);
Piece threatened_pc = piece_on(threatened_sq);
Square threatenedSq = pop_lsb(threatened);
Piece threatenedPc = piece_on(threatenedSq);
assert(threatened_sq != s);
assert(threatened_pc);
assert(threatenedSq != s);
assert(threatenedPc);
add_dirty_threat<PutPiece>(dts, pc, threatened_pc, s, threatened_sq);
add_dirty_threat<PutPiece>(dts, pc, threatenedPc, s, threatenedSq);
}
Bitboard sliders = (rookQueens & rAttacks) | (bishopQueens & bAttacks);
@@ -1111,30 +1111,30 @@ void Position::update_piece_threats(Piece pc, Square s, DirtyThreats* const dts)
{
while (sliders)
{
Square slider_sq = pop_lsb(sliders);
Piece slider = piece_on(slider_sq);
Square sliderSq = pop_lsb(sliders);
Piece slider = piece_on(sliderSq);
const Bitboard ray = RayPassBB[slider_sq][s] & ~BetweenBB[slider_sq][s];
const Bitboard ray = RayPassBB[sliderSq][s] & ~BetweenBB[sliderSq][s];
const Bitboard discovered = ray & qAttacks & occupied;
assert(!more_than_one(discovered));
if (discovered)
{
const Square threatened_sq = lsb(discovered);
const Piece threatened_pc = piece_on(threatened_sq);
add_dirty_threat<!PutPiece>(dts, slider, threatened_pc, slider_sq, threatened_sq);
const Square threatenedSq = lsb(discovered);
const Piece threatenedPc = piece_on(threatenedSq);
add_dirty_threat<!PutPiece>(dts, slider, threatenedPc, sliderSq, threatenedSq);
}
add_dirty_threat<PutPiece>(dts, slider, pc, slider_sq, s);
add_dirty_threat<PutPiece>(dts, slider, pc, sliderSq, s);
}
}
else
{
while (sliders)
{
Square slider_sq = pop_lsb(sliders);
Piece slider = piece_on(slider_sq);
add_dirty_threat<PutPiece>(dts, slider, pc, slider_sq, s);
Square sliderSq = pop_lsb(sliders);
Piece slider = piece_on(sliderSq);
add_dirty_threat<PutPiece>(dts, slider, pc, sliderSq, s);
}
}
@@ -1144,13 +1144,13 @@ void Position::update_piece_threats(Piece pc, Square s, DirtyThreats* const dts)
while (incoming_threats)
{
Square src_sq = pop_lsb(incoming_threats);
Piece src_pc = piece_on(src_sq);
Square srcSq = pop_lsb(incoming_threats);
Piece srcPc = piece_on(srcSq);
assert(src_sq != s);
assert(src_pc != NO_PIECE);
assert(srcSq != s);
assert(srcPc != NO_PIECE);
add_dirty_threat<PutPiece>(dts, src_pc, pc, src_sq, s);
add_dirty_threat<PutPiece>(dts, srcPc, pc, srcSq, s);
}
}