Cleaned up MakeIndex()

mstembera · vondele · commit 9b7983a4521b · 2020-11-29T16:36:49.000+01:00
The index order in kpp_board_index[][] is reversed to be more optimal for the access pattern STC https://tests.stockfishchess.org/tests/view/5fbd74f967cbf42301d6b24f LLR: 2.93 (-2.94,2.94) {-1.25,0.25} Total: 27504 W: 2686 L: 2607 D: 22211 Ptnml(0-2): 84, 2001, 9526, 2034, 107 closes official-stockfish/Stockfish#3233 No functional change
diff --git a/src/nnue/evaluate_nnue.cpp b/src/nnue/evaluate_nnue.cpp
@@ -31,27 +31,6 @@
 
 namespace Eval::NNUE {
 
-  const uint32_t kpp_board_index[PIECE_NB][COLOR_NB] = {
-   // convention: W - us, B - them
-   // viewed from other side, W and B are reversed
-      { PS_NONE,     PS_NONE     },
-      { PS_W_PAWN,   PS_B_PAWN   },
-      { PS_W_KNIGHT, PS_B_KNIGHT },
-      { PS_W_BISHOP, PS_B_BISHOP },
-      { PS_W_ROOK,   PS_B_ROOK   },
-      { PS_W_QUEEN,  PS_B_QUEEN  },
-      { PS_W_KING,   PS_B_KING   },
-      { PS_NONE,     PS_NONE     },
-      { PS_NONE,     PS_NONE     },
-      { PS_B_PAWN,   PS_W_PAWN   },
-      { PS_B_KNIGHT, PS_W_KNIGHT },
-      { PS_B_BISHOP, PS_W_BISHOP },
-      { PS_B_ROOK,   PS_W_ROOK   },
-      { PS_B_QUEEN,  PS_W_QUEEN  },
-      { PS_B_KING,   PS_W_KING   },
-      { PS_NONE,     PS_NONE     }
-  };
-
   // Input feature converter
   LargePagePtr<FeatureTransformer> feature_transformer;
 
diff --git a/src/nnue/features/half_kp.cpp b/src/nnue/features/half_kp.cpp
@@ -28,12 +28,9 @@ namespace Eval::NNUE::Features {
     return Square(int(s) ^ (bool(perspective) * 63));
   }
 
-  // Find the index of the feature quantity from the king position and PieceSquare
-  template <Side AssociatedKing>
-  inline IndexType HalfKP<AssociatedKing>::MakeIndex(
-      Color perspective, Square s, Piece pc, Square ksq) {
-
-    return IndexType(orient(perspective, s) + kpp_board_index[pc][perspective] + PS_END * ksq);
+  // Index of a feature for a given king position and another piece on some square
+  inline IndexType make_index(Color perspective, Square s, Piece pc, Square ksq) {
+    return IndexType(orient(perspective, s) + kpp_board_index[perspective][pc] + PS_END * ksq);
   }
 
   // Get a list of indices for active features
@@ -45,7 +42,7 @@ namespace Eval::NNUE::Features {
     Bitboard bb = pos.pieces() & ~pos.pieces(KING);
     while (bb) {
       Square s = pop_lsb(&bb);
-      active->push_back(MakeIndex(perspective, s, pos.piece_on(s), ksq));
+      active->push_back(make_index(perspective, s, pos.piece_on(s), ksq));
     }
   }
 
@@ -60,9 +57,9 @@ namespace Eval::NNUE::Features {
       Piece pc = dp.piece[i];
       if (type_of(pc) == KING) continue;
       if (dp.from[i] != SQ_NONE)
-        removed->push_back(MakeIndex(perspective, dp.from[i], pc, ksq));
+        removed->push_back(make_index(perspective, dp.from[i], pc, ksq));
       if (dp.to[i] != SQ_NONE)
-        added->push_back(MakeIndex(perspective, dp.to[i], pc, ksq));
+        added->push_back(make_index(perspective, dp.to[i], pc, ksq));
     }
   }
 
diff --git a/src/nnue/features/half_kp.h b/src/nnue/features/half_kp.h
@@ -52,10 +52,6 @@ namespace Eval::NNUE::Features {
     // Get a list of indices for recently changed features
     static void AppendChangedIndices(const Position& pos, const DirtyPiece& dp, Color perspective,
                                      IndexList* removed, IndexList* added);
-
-   private:
-    // Index of a feature for a given king position and another piece on some square
-    static IndexType MakeIndex(Color perspective, Square s, Piece pc, Square sq_k);
   };
 
 }  // namespace Eval::NNUE::Features
diff --git a/src/nnue/nnue_common.h b/src/nnue/nnue_common.h
@@ -90,7 +90,14 @@ namespace Eval::NNUE {
     PS_END2     = 12 * SQUARE_NB + 1
   };
 
-  extern const uint32_t kpp_board_index[PIECE_NB][COLOR_NB];
+  constexpr uint32_t kpp_board_index[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_W_KING, PS_NONE,
+      PS_NONE, PS_B_PAWN, PS_B_KNIGHT, PS_B_BISHOP, PS_B_ROOK, PS_B_QUEEN, PS_B_KING, PS_NONE },
+    { PS_NONE, PS_B_PAWN, PS_B_KNIGHT, PS_B_BISHOP, PS_B_ROOK, PS_B_QUEEN, PS_B_KING, PS_NONE,
+      PS_NONE, PS_W_PAWN, PS_W_KNIGHT, PS_W_BISHOP, PS_W_ROOK, PS_W_QUEEN, PS_W_KING, PS_NONE }
+  };
 
   // Type of input feature after conversion
   using TransformedFeatureType = std::uint8_t;

Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,9 @@ namespace Eval::NNUE::Features {`
`28`	`28`	`return Square(int(s) ^ (bool(perspective) * 63));`
`29`	`29`	`}`
`30`	`30`
`31`		`- // Find the index of the feature quantity from the king position and PieceSquare`
`32`		`- template <Side AssociatedKing>`
`33`		`- inline IndexType HalfKP<AssociatedKing>::MakeIndex(`
`34`		`- Color perspective, Square s, Piece pc, Square ksq) {`
`35`		`-`
`36`		`- return IndexType(orient(perspective, s) + kpp_board_index[pc][perspective] + PS_END * ksq);`
	`31`	`+ // Index of a feature for a given king position and another piece on some square`
	`32`	`+ inline IndexType make_index(Color perspective, Square s, Piece pc, Square ksq) {`
	`33`	`+ return IndexType(orient(perspective, s) + kpp_board_index[perspective][pc] + PS_END * ksq);`
`37`	`34`	`}`
`38`	`35`
`39`	`36`	`// Get a list of indices for active features`
`@@ -45,7 +42,7 @@ namespace Eval::NNUE::Features {`
`45`	`42`	`Bitboard bb = pos.pieces() & ~pos.pieces(KING);`
`46`	`43`	`while (bb) {`
`47`	`44`	`Square s = pop_lsb(&bb);`
`48`		`- active->push_back(MakeIndex(perspective, s, pos.piece_on(s), ksq));`
	`45`	`+ active->push_back(make_index(perspective, s, pos.piece_on(s), ksq));`
`49`	`46`	`}`
`50`	`47`	`}`
`51`	`48`
`@@ -60,9 +57,9 @@ namespace Eval::NNUE::Features {`
`60`	`57`	`Piece pc = dp.piece[i];`
`61`	`58`	`if (type_of(pc) == KING) continue;`
`62`	`59`	`if (dp.from[i] != SQ_NONE)`
`63`		`- removed->push_back(MakeIndex(perspective, dp.from[i], pc, ksq));`
	`60`	`+ removed->push_back(make_index(perspective, dp.from[i], pc, ksq));`
`64`	`61`	`if (dp.to[i] != SQ_NONE)`
`65`		`- added->push_back(MakeIndex(perspective, dp.to[i], pc, ksq));`
	`62`	`+ added->push_back(make_index(perspective, dp.to[i], pc, ksq));`
`66`	`63`	`}`
`67`	`64`	`}`
`68`	`65`