Skip to content

Commit bd82b9e

Browse files
xu-shawnvondele
xu-shawn
authored and
vondele
committed
Cleanup, fix style issues
use naming convention for variables, functions, constants closes #6416 no functional change
1 parent 7b7a948 commit bd82b9e

File tree

2 files changed

+39
-38
lines changed

2 files changed

+39
-38
lines changed

‎src/nnue/nnue_accumulator.cpp‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -636,25 +636,26 @@ void update_accumulator_incremental(
636636
(target_state.template acc<TransformedFeatureDimensions>()).computed[Perspective] = true;
637637
}
638638

639-
Bitboard get_changed_pieces(const Piece old[SQUARE_NB], const Piece new_[SQUARE_NB]) {
639+
Bitboard get_changed_pieces(const Piece oldPieces[SQUARE_NB], const Piece newPieces[SQUARE_NB]) {
640640
#if defined(USE_AVX512) || defined(USE_AVX2)
641641
static_assert(sizeof(Piece) == 1);
642-
Bitboard same_bb = 0;
642+
Bitboard sameBB = 0;
643+
643644
for (int i = 0; i < 64; i += 32)
644645
{
645-
const __m256i old_v = _mm256_loadu_si256(reinterpret_cast<const __m256i*>(old + i));
646-
const __m256i new_v = _mm256_loadu_si256(reinterpret_cast<const __m256i*>(new_ + i));
647-
const __m256i cmp_equal = _mm256_cmpeq_epi8(old_v, new_v);
648-
const std::uint32_t equal_mask = _mm256_movemask_epi8(cmp_equal);
649-
same_bb |= static_cast<Bitboard>(equal_mask) << i;
646+
const __m256i old_v = _mm256_loadu_si256(reinterpret_cast<const __m256i*>(oldPieces + i));
647+
const __m256i new_v = _mm256_loadu_si256(reinterpret_cast<const __m256i*>(newPieces + i));
648+
const __m256i cmpEqual = _mm256_cmpeq_epi8(old_v, new_v);
649+
const std::uint32_t equalMask = _mm256_movemask_epi8(cmpEqual);
650+
sameBB |= static_cast<Bitboard>(equalMask) << i;
650651
}
651-
return ~same_bb;
652+
return ~sameBB;
652653
#else
653654
Bitboard changed = 0;
655+
654656
for (Square sq = SQUARE_ZERO; sq < SQUARE_NB; ++sq)
655-
{
656-
changed |= static_cast<Bitboard>(old[sq] != new_[sq]) << sq;
657-
}
657+
changed |= static_cast<Bitboard>(oldPieces[sq] != newPieces[sq]) << sq;
658+
658659
return changed;
659660
#endif
660661
}
@@ -671,18 +672,18 @@ void update_accumulator_refresh_cache(const FeatureTransformer<Dimensions>& feat
671672
auto& entry = cache[ksq][Perspective];
672673
PSQFeatureSet::IndexList removed, added;
673674

674-
const Bitboard changed_bb = get_changed_pieces(entry.pieces, pos.piece_array().data());
675-
Bitboard removed_bb = changed_bb & entry.pieceBB;
676-
Bitboard added_bb = changed_bb & pos.pieces();
675+
const Bitboard changedBB = get_changed_pieces(entry.pieces, pos.piece_array().data());
676+
Bitboard removedBB = changedBB & entry.pieceBB;
677+
Bitboard addedBB = changedBB & pos.pieces();
677678

678-
while (removed_bb)
679+
while (removedBB)
679680
{
680-
Square sq = pop_lsb(removed_bb);
681+
Square sq = pop_lsb(removedBB);
681682
removed.push_back(PSQFeatureSet::make_index<Perspective>(sq, entry.pieces[sq], ksq));
682683
}
683-
while (added_bb)
684+
while (addedBB)
684685
{
685-
Square sq = pop_lsb(added_bb);
686+
Square sq = pop_lsb(addedBB);
686687
added.push_back(PSQFeatureSet::make_index<Perspective>(sq, pos.piece_on(sq), ksq));
687688
}
688689

‎src/position.cpp‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,13 +1096,13 @@ void Position::update_piece_threats(Piece pc, Square s, DirtyThreats* const dts)
10961096

10971097
while (threatened)
10981098
{
1099-
Square threatened_sq = pop_lsb(threatened);
1100-
Piece threatened_pc = piece_on(threatened_sq);
1099+
Square threatenedSq = pop_lsb(threatened);
1100+
Piece threatenedPc = piece_on(threatenedSq);
11011101

1102-
assert(threatened_sq != s);
1103-
assert(threatened_pc);
1102+
assert(threatenedSq != s);
1103+
assert(threatenedPc);
11041104

1105-
add_dirty_threat<PutPiece>(dts, pc, threatened_pc, s, threatened_sq);
1105+
add_dirty_threat<PutPiece>(dts, pc, threatenedPc, s, threatenedSq);
11061106
}
11071107

11081108
Bitboard sliders = (rookQueens & rAttacks) | (bishopQueens & bAttacks);
@@ -1111,30 +1111,30 @@ void Position::update_piece_threats(Piece pc, Square s, DirtyThreats* const dts)
11111111
{
11121112
while (sliders)
11131113
{
1114-
Square slider_sq = pop_lsb(sliders);
1115-
Piece slider = piece_on(slider_sq);
1114+
Square sliderSq = pop_lsb(sliders);
1115+
Piece slider = piece_on(sliderSq);
11161116

1117-
const Bitboard ray = RayPassBB[slider_sq][s] & ~BetweenBB[slider_sq][s];
1117+
const Bitboard ray = RayPassBB[sliderSq][s] & ~BetweenBB[sliderSq][s];
11181118
const Bitboard discovered = ray & qAttacks & occupied;
11191119

11201120
assert(!more_than_one(discovered));
11211121
if (discovered)
11221122
{
1123-
const Square threatened_sq = lsb(discovered);
1124-
const Piece threatened_pc = piece_on(threatened_sq);
1125-
add_dirty_threat<!PutPiece>(dts, slider, threatened_pc, slider_sq, threatened_sq);
1123+
const Square threatenedSq = lsb(discovered);
1124+
const Piece threatenedPc = piece_on(threatenedSq);
1125+
add_dirty_threat<!PutPiece>(dts, slider, threatenedPc, sliderSq, threatenedSq);
11261126
}
11271127

1128-
add_dirty_threat<PutPiece>(dts, slider, pc, slider_sq, s);
1128+
add_dirty_threat<PutPiece>(dts, slider, pc, sliderSq, s);
11291129
}
11301130
}
11311131
else
11321132
{
11331133
while (sliders)
11341134
{
1135-
Square slider_sq = pop_lsb(sliders);
1136-
Piece slider = piece_on(slider_sq);
1137-
add_dirty_threat<PutPiece>(dts, slider, pc, slider_sq, s);
1135+
Square sliderSq = pop_lsb(sliders);
1136+
Piece slider = piece_on(sliderSq);
1137+
add_dirty_threat<PutPiece>(dts, slider, pc, sliderSq, s);
11381138
}
11391139
}
11401140

@@ -1144,13 +1144,13 @@ void Position::update_piece_threats(Piece pc, Square s, DirtyThreats* const dts)
11441144

11451145
while (incoming_threats)
11461146
{
1147-
Square src_sq = pop_lsb(incoming_threats);
1148-
Piece src_pc = piece_on(src_sq);
1147+
Square srcSq = pop_lsb(incoming_threats);
1148+
Piece srcPc = piece_on(srcSq);
11491149

1150-
assert(src_sq != s);
1151-
assert(src_pc != NO_PIECE);
1150+
assert(srcSq != s);
1151+
assert(srcPc != NO_PIECE);
11521152

1153-
add_dirty_threat<PutPiece>(dts, src_pc, pc, src_sq, s);
1153+
add_dirty_threat<PutPiece>(dts, srcPc, pc, srcSq, s);
11541154
}
11551155
}
11561156

0 commit comments

Comments
 (0)