jirayu_sri/stockfish
1
0
Fork 0
mirror of https://github.com/official-stockfish/Stockfish.git synced 2026-07-22 12:47:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Combine last 3 add/remove operations

Browse Source 
https://tests.stockfishchess.org/tests/view/67ad587052879dfd14d7e8a5
LLR: 2.95 (-2.94,2.94) <0.00,2.00>
Total: 45856 W: 12177 L: 11855 D: 21824
Ptnml(0-2): 176, 4845, 12588, 5119, 200

The two most common cases are when added and removed counts are equal
and when they are off by 1.  When they are off by 1 we currently do a
pass combining 2 and then an extra pass for the last 1.  This patch does
a single combined pass on the final 3 instead. Tested on top of the
simplification in
https://github.com/official-stockfish/Stockfish/pull/5901

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

No functional change
This commit is contained in:
mstembera
2025-02-27 20:30:44 +01:00
committed by Disservin
parent d330b48e21
commit e4d7136042
1 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nnue/nnue_feature_transformer.h
+48 -13
View File
@@ -704,6 +704,8 @@ class FeatureTransformer {
accumulator.computed[Perspective] = true; accumulator.computed[Perspective] = true;
#ifdef VECTOR #ifdef VECTOR
const bool combineLast3 = std::abs((int) removed.size() - (int) added.size()) == 1
&& removed.size() + added.size() > 2;
vec_t acc[Tiling::NumRegs]; vec_t acc[Tiling::NumRegs];
psqt_vec_t psqt[Tiling::NumPsqtRegs]; psqt_vec_t psqt[Tiling::NumPsqtRegs];
@@ -717,7 +719,7 @@ class FeatureTransformer {
acc[k] = entryTile[k]; acc[k] = entryTile[k];
std::size_t i = 0; std::size_t i = 0;
for (; i < std::min(removed.size(), added.size()); ++i) for (; i < std::min(removed.size(), added.size()) - combineLast3; ++i)
{ {
IndexType indexR = removed[i]; IndexType indexR = removed[i];
const IndexType offsetR = HalfDimensions * indexR + j * Tiling::TileHeight; const IndexType offsetR = HalfDimensions * indexR + j * Tiling::TileHeight;
@@ -729,23 +731,56 @@ class FeatureTransformer {
for (IndexType k = 0; k < Tiling::NumRegs; ++k) for (IndexType k = 0; k < Tiling::NumRegs; ++k)
acc[k] = vec_add_16(acc[k], vec_sub_16(columnA[k], columnR[k])); acc[k] = vec_add_16(acc[k], vec_sub_16(columnA[k], columnR[k]));
} }
for (; i < removed.size(); ++i) if (combineLast3)
{ {
IndexType index = removed[i]; IndexType indexR = removed[i];
const IndexType offset = HalfDimensions * index + j * Tiling::TileHeight; const IndexType offsetR = HalfDimensions * indexR + j * Tiling::TileHeight;
auto* column = reinterpret_cast<const vec_t*>(&weights[offset]); auto* columnR = reinterpret_cast<const vec_t*>(&weights[offsetR]);
IndexType indexA = added[i];
const IndexType offsetA = HalfDimensions * indexA + j * Tiling::TileHeight;
auto* columnA = reinterpret_cast<const vec_t*>(&weights[offsetA]);
for (IndexType k = 0; k < Tiling::NumRegs; ++k) if (removed.size() > added.size())
acc[k] = vec_sub_16(acc[k], column[k]); {
IndexType indexR2 = removed[i + 1];
const IndexType offsetR2 = HalfDimensions * indexR2 + j * Tiling::TileHeight;
auto* columnR2 = reinterpret_cast<const vec_t*>(&weights[offsetR2]);
for (IndexType k = 0; k < Tiling::NumRegs; ++k)
acc[k] = vec_sub_16(vec_add_16(acc[k], columnA[k]),
vec_add_16(columnR[k], columnR2[k]));
}
else
{
IndexType indexA2 = added[i + 1];
const IndexType offsetA2 = HalfDimensions * indexA2 + j * Tiling::TileHeight;
auto* columnA2 = reinterpret_cast<const vec_t*>(&weights[offsetA2]);
for (IndexType k = 0; k < Tiling::NumRegs; ++k)
acc[k] = vec_add_16(vec_sub_16(acc[k], columnR[k]),
vec_add_16(columnA[k], columnA2[k]));
}
} }
for (; i < added.size(); ++i) else
{ {
IndexType index = added[i]; for (; i < removed.size(); ++i)
const IndexType offset = HalfDimensions * index + j * Tiling::TileHeight; {
auto* column = reinterpret_cast<const vec_t*>(&weights[offset]); IndexType index = removed[i];
const IndexType offset = HalfDimensions * index + j * Tiling::TileHeight;
auto* column = reinterpret_cast<const vec_t*>(&weights[offset]);
for (IndexType k = 0; k < Tiling::NumRegs; ++k) for (IndexType k = 0; k < Tiling::NumRegs; ++k)
acc[k] = vec_add_16(acc[k], column[k]); acc[k] = vec_sub_16(acc[k], column[k]);
}
for (; i < added.size(); ++i)
{
IndexType index = added[i];
const IndexType offset = HalfDimensions * index + j * Tiling::TileHeight;
auto* column = reinterpret_cast<const vec_t*>(&weights[offset]);
for (IndexType k = 0; k < Tiling::NumRegs; ++k)
acc[k] = vec_add_16(acc[k], column[k]);
}
} }
for (IndexType k = 0; k < Tiling::NumRegs; k++) for (IndexType k = 0; k < Tiling::NumRegs; k++)