improved performance.

Author: winapiadmin

.github/workflows/cmake-multi-platform.yml

@@ -1,5 +1,3 @@
-# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform.
-# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml
 name: CMake on multiple platforms
 
 on:
@@ -13,20 +11,14 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     strategy:
-      # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
       fail-fast: false
-
-      # Set up a matrix to run the following 3 configurations:
-      # 1. <Windows, Release, latest MSVC compiler toolchain on the default runner image, default generator>
-      # 2. <Linux, Release, latest GCC compiler toolchain on the default runner image, default generator>
-      # 3. <Linux, Release, latest Clang compiler toolchain on the default runner image, default generator>
-      #
-      # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
       matrix:
         os: [ubuntu-latest, windows-latest]
         build_type: [Debug, Release]
         c_compiler: [gcc, clang, cl]
+
         include:
+          # Windows
           - os: windows-latest
             c_compiler: cl
             cpp_compiler: cl
@@ -36,42 +28,44 @@ jobs:
           - os: windows-latest
             c_compiler: gcc
             cpp_compiler: g++
+
+          # Linux
           - os: ubuntu-latest
             c_compiler: gcc
             cpp_compiler: g++
           - os: ubuntu-latest
             c_compiler: clang
             cpp_compiler: clang++
+
         exclude:
           - os: ubuntu-latest
             c_compiler: cl
 
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set reusable strings
-      # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
-      id: strings
+    - name: Set build dir
+      id: vars
       shell: bash
-      run: |
-        echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
+      run: echo "dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
 
     - name: Configure CMake
-      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
       run: >
-        cmake -B ${{ steps.strings.outputs.build-output-dir }}
+        cmake -B ${{ steps.vars.outputs.dir }}
         -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
         -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
         -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
         -S ${{ github.workspace }}
 
     - name: Build
-      # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
-      run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}
+      run: cmake --build ${{ steps.vars.outputs.dir }} --config ${{ matrix.build_type }}
 
     - name: Test
-      working-directory: ${{ steps.strings.outputs.build-output-dir }}
-      # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
-      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: ctest --build-config ${{ matrix.build_type }} --verbose
+      working-directory: ${{ steps.vars.outputs.dir }}
+      shell: bash
+      run: |
+        if [[ "${{ matrix.os }}" == "windows-latest" ]]; then
+          ctest --build-config ${{ matrix.build_type }} --verbose
+        else
+          ctest --verbose
+        fi

bitboard.h

@@ -93,11 +93,11 @@ __FORCEINLINE constexpr int msb(Bitboard x) noexcept {
 // -------------------------------
 __FORCEINLINE int pop_lsb(Bitboard &b) noexcept {
     int c = lsb(b);
-    #ifndef __BMI2__
+#ifndef __BMI2__
     b &= b - 1;
-    #else
-    _blsr_u64(b);
-    #endif
+#else
+    b = _blsr_u64(b);
+#endif
     return c;
 }
 

examples/perft_with_tt.cpp

@@ -113,18 +113,17 @@ template <int DEPTH, bool EnableDiv=false, typename T=EnginePiece> void benchmar
     double avgTime = totalTime / N_RUNS;
     double avgMnps = (nodes / avgTime) / 1'000'000.0;
 
-    std::cout << "Average: " << avgTime << " s, " << avgMnps << " Mnps\n";
+    std::cout << "Average: " << avgTime << " s, " << avgMnps << " Mnps (nodes="<<(nodes/N_RUNS)<<")\n";
 }
 
 
 int main() {
-    _Position<ContiguousMappingPiece> pos("8/2p5/3p4/KP5r/1R3p1k/8/4P1P1/8 w - - 0 1");
+    _Position<EnginePiece> pos;
 
 #ifdef TT_ENABLED
     tt.resize(1 << 28);
 #endif
-    benchmark<3, true, ContiguousMappingPiece>(pos);
-
+    benchmark<7, true, EnginePiece>(pos);
     // Movelist moves;
     // pos.template legals(moves);
     // for (const Move &m : moves) {