test

Luecx · Luecx · commit 60090f191516 · 2023-01-27T19:17:12.000+01:00
diff --git a/src_files/eval.cpp b/src_files/eval.cpp
@@ -139,51 +139,6 @@ void nn::init() {
     memoryIndex += OUTPUT_SIZE * sizeof(int32_t);
 }
 
-int nn::index(bb::PieceType pieceType, bb::Color pieceColor, bb::Square square, bb::Color view,
-              bb::Square kingSquare) {
-    constexpr int pieceTypeFactor  = 64;
-    constexpr int pieceColorFactor = 64 * 6;
-    constexpr int kingSquareFactor = 64 * 6 * 2;
-
-    const bool    kingSide         = bb::fileIndex(kingSquare) > 3;
-    const int     ksIndex          = kingSquareIndex(kingSquare, view);
-    bb::Square    relativeSquare   = view == bb::WHITE ? square : bb::mirrorVertically(square);
-
-    if (kingSide) {
-        relativeSquare = bb::mirrorHorizontally(relativeSquare);
-    }
-
-    // clang-format off
-    return relativeSquare
-           + pieceType * pieceTypeFactor
-           + (pieceColor == view) * pieceColorFactor
-           + ksIndex * kingSquareFactor;
-    // clang-format on
-}
-
-int nn::kingSquareIndex(bb::Square relativeKingSquare, bb::Color kingColor) {
-    // return zero if there is no king on the board yet ->
-    // requires manual reset
-    if (relativeKingSquare > 63)
-        return 0;
-    // clang-format off
-    constexpr int indices[bb::N_SQUARES] {
-        0,  1,  2,  3,  3,  2,  1,  0,
-        4,  5,  6,  7,  7,  6,  5,  4,
-        8,  9,  10, 11, 11, 10, 9,  8,
-        8,  9,  10, 11, 11, 10, 9,  8,
-        12, 12, 13, 13, 13, 13, 12, 12,
-        12, 12, 13, 13, 13, 13, 12, 12,
-        14, 14, 15, 15, 15, 15, 14, 14,
-        14, 14, 15, 15, 15, 15, 14, 14,
-    };
-    // clang-format on
-    if (kingColor == bb::BLACK) {
-        relativeKingSquare = bb::mirrorVertically(relativeKingSquare);
-    }
-    return indices[relativeKingSquare];
-}
-
 
 void nn::AccumulatorTable::use(bb::Color view, Board* board, nn::Evaluator& evaluator) {
     const bb::Square king_sq   = bb::bitscanForward(board->getPieceBB(view, bb::KING));
@@ -230,7 +185,6 @@ void nn::AccumulatorTable::use(bb::Color view, Board* board, nn::Evaluator& eval
     }
     
     std::memcpy(evaluator.history.back().summation[view], entry.accumulator.summation[view],sizeof(int16_t) * HIDDEN_SIZE);
-
 }
 
 void nn::AccumulatorTable::reset() {
diff --git a/src_files/eval.h b/src_files/eval.h
@@ -20,6 +20,7 @@
 #define KOIVISTO_EVAL_H
 
 #include "bitboard.h"
+#include "uciassert.h"
 
 #include <cstdint>
 #include <cstring>
@@ -58,17 +59,47 @@ extern int16_t hiddenWeights[OUTPUT_SIZE][HIDDEN_DSIZE];
 extern int16_t inputBias    [HIDDEN_SIZE];
 extern int32_t hiddenBias   [OUTPUT_SIZE];
 
+constexpr int kingSquareIndices[bb::N_SQUARES] {
+    0,  1,  2,  3,  3,  2,  1,  0,
+    4,  5,  6,  7,  7,  6,  5,  4,
+    8,  9,  10, 11, 11, 10, 9,  8,
+    8,  9,  10, 11, 11, 10, 9,  8,
+    12, 12, 13, 13, 13, 13, 12, 12,
+    12, 12, 13, 13, 13, 13, 12, 12,
+    14, 14, 15, 15, 15, 15, 14, 14,
+    14, 14, 15, 15, 15, 15, 14, 14,
+};
+
 // initialise and load the weights
 void init();
 
-// computes the index for a piece (piece type) and its color on the specified square
-// also takes the view from with we view at the board as well as the king square of the view side
-[[nodiscard]] int index(bb::PieceType pieceType, bb::Color pieceColor, bb::Square square,
-                        bb::Color view, bb::Square kingSquare);
+
 
 // the index is based on a king bucketing system. the relevant king bucket can be retrieved using
 // the function below
-[[nodiscard]] int kingSquareIndex(bb::Square kingSquare, bb::Color kingColor);
+[[nodiscard]] inline int kingSquareIndex(bb::Square kingSquare, bb::Color kingColor){
+    UCI_ASSERT(kingSquare >= bb::A1);
+    UCI_ASSERT(kingSquare <= bb::H8);
+    kingSquare = (56 * kingColor) ^ kingSquare;
+    return kingSquareIndices[kingSquare];
+    
+}
+
+// computes the index for a piece (piece type) and its color on the specified square
+// also takes the view from with we view at the board as well as the king square of the view side
+[[nodiscard]] inline int index(bb::PieceType pieceType, bb::Color pieceColor, bb::Square square,
+                        bb::Color view, bb::Square kingSquare){
+    const int ksIndex = kingSquareIndex(kingSquare, view);
+    square ^= 56 * view;
+    square ^= 7 * !!(kingSquare & 0x4);
+
+    // clang-format off
+    return square
+           + pieceType * 64
+           + !(pieceColor ^ view) * 64 * 6
+           + ksIndex * 64 * 6 * 2;
+    // clang-format on
+}
 
 // the accumulator which is used as the first hidden layer of the network.
 // it is updated efficiently and contains the accumulated weights for whites and black pov.
