Test simplification

Author: PikaCat-OuO

src/nnue/features/half_ka_v2_hm.h

@@ -76,7 +76,7 @@ class HalfKAv2_hm {
     static constexpr std::uint32_t HashValue = 0xd17b100;
 
     // Number of feature dimensions
-    static constexpr IndexType Dimensions = 6 * 2 * 3 * static_cast<IndexType>(PS_NB);
+    static constexpr IndexType Dimensions = 6 * 4 * static_cast<IndexType>(PS_NB);
 
     // Get king_index and mirror information
     static constexpr auto KingBuckets = []() {
@@ -121,21 +121,7 @@ class HalfKAv2_hm {
         for (uint8_t rook = 0; rook <= 2; ++rook)
             for (uint8_t knight = 0; knight <= 2; ++knight)
                 for (uint8_t cannon = 0; cannon <= 2; ++cannon)
-                    v[rook][knight][cannon] = [&] {
-                        if (rook != 0)
-                            if (knight > 0 && cannon > 0)
-                                return 0;
-                            else if (rook == 2 || knight + cannon > 1)
-                                return 1;
-                            else
-                                return 2;
-                        else if (knight > 0 && cannon > 0)
-                            return 3;
-                        else if (knight + cannon > 1)
-                            return 4;
-                        else
-                            return 5;
-                    }();
+                    v[rook][knight][cannon] = bool(rook) * 2 + bool(knight + cannon);
         return v;
     }();
 

src/nnue/nnue_accumulator.cpp

@@ -144,7 +144,7 @@ void AccumulatorStack::forward_update_incremental(
     auto [king_bucket, mirror] =
       FeatureSet::KingBuckets[ksq][oksq][FeatureSet::requires_mid_mirror(pos, Perspective)];
     auto attack_bucket = FeatureSet::make_attack_bucket(pos, Perspective);
-    auto bucket        = king_bucket * 6 + attack_bucket;
+    auto bucket        = king_bucket * 4 + attack_bucket;
 
     for (std::size_t next = begin + 1; next < size; next++)
     {
@@ -188,7 +188,7 @@ void AccumulatorStack::backward_update_incremental(
     auto [king_bucket, mirror] =
       FeatureSet::KingBuckets[ksq][oksq][FeatureSet::requires_mid_mirror(pos, Perspective)];
     auto attack_bucket = FeatureSet::make_attack_bucket(pos, Perspective);
-    auto bucket        = king_bucket * 6 + attack_bucket;
+    auto bucket        = king_bucket * 4 + attack_bucket;
 
     for (std::int64_t next = std::int64_t(size) - 2; next >= std::int64_t(end); next--)
         update_accumulator_incremental<Perspective, false>(
@@ -388,7 +388,7 @@ void update_accumulator_refresh_cache(const FeatureTransformer<Dimensions>& feat
     auto [king_bucket, mirror] =
       FeatureSet::KingBuckets[ksq][oksq][FeatureSet::requires_mid_mirror(pos, Perspective)];
     auto attack_bucket = FeatureSet::make_attack_bucket(pos, Perspective);
-    auto bucket        = king_bucket * 6 + attack_bucket;
+    auto bucket        = king_bucket * 4 + attack_bucket;
 
     auto cache_index = AccumulatorCaches::KingCacheMaps[ksq];
     if (cache_index < 3 && mirror)
@@ -398,7 +398,7 @@ void update_accumulator_refresh_cache(const FeatureTransformer<Dimensions>& feat
             cache_index += 3;
     }
 
-    auto&                 entry = cache[cache_index * 6 + attack_bucket][Perspective];
+    auto&                 entry = cache[cache_index * 4 + attack_bucket][Perspective];
     FeatureSet::IndexList removed, added;
 
     for (Color c : {WHITE, BLACK})

src/nnue/nnue_accumulator.h

@@ -108,7 +108,7 @@ struct AccumulatorCaches {
 
         std::array<Entry, COLOR_NB>& operator[](int index) { return entries[index]; }
 
-        std::array<std::array<Entry, COLOR_NB>, (9 + 6) * 2 * 3> entries;
+        std::array<std::array<Entry, COLOR_NB>, (9 + 6) * 4> entries;
     };
 
     template<typename Networks>

src/nnue/nnue_architecture.h

@@ -38,7 +38,7 @@ namespace Stockfish::Eval::NNUE {
 using FeatureSet = Features::HalfKAv2_hm;
 
 // Number of input feature dimensions after conversion
-constexpr IndexType TransformedFeatureDimensionsBig = 2048;
+constexpr IndexType TransformedFeatureDimensionsBig = 2560;
 constexpr int       L2Big                           = 15;
 constexpr int       L3Big                           = 32;