konsolas
diff --git a/‎CMakeLists.txt‎
Lines changed: 19 additions & 10 deletions b/‎CMakeLists.txt‎
Lines changed: 19 additions & 10 deletions
diff --git a/‎movesort.cpp‎
Lines changed: 3 additions & 13 deletions b/‎movesort.cpp‎
Lines changed: 3 additions & 13 deletions
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.11)
 project(Topple)
 
 set(CMAKE_CXX_STANDARD 17)
@@ -18,12 +18,12 @@ set(SOURCE_FILES
         pvs.h pvs.cpp
         syzygy/tbcore.h
         syzygy/tbprobe.h syzygy/tbprobe.cpp syzygy/tbresolve.h syzygy/tbresolve.cpp)
-set(TEST_FILES testing/catch.hpp testing/runner.cpp testing/util.h testing/util.cpp
-        testing/tests/test_bb.cpp
-        testing/tests/test_board.cpp
-        testing/tests/test_perft.cpp
-        testing/tests/test_see.cpp
-        testing/tests/test_hash.cpp)
+set(TEST_FILES testing/runner.cpp testing/util.h testing/util.cpp
+        testing/test_bb.cpp
+        testing/test_board.cpp
+        testing/test_perft.cpp
+        testing/test_see.cpp
+        testing/test_hash.cpp)
 set(TOPPLE_TUNE_FILES toppletuning/main.cpp
         toppletuning/game.cpp toppletuning/game.h
         toppletuning/toppletuner.cpp toppletuning/toppletuner.h
@@ -34,7 +34,18 @@ set(TEXEL_TUNE_FILES texeltuning/main.cpp
 # Add version definitions
 add_definitions(-DTOPPLE_VER="${TOPPLE_VERSION}")
 
+# Set up Catch2 unit tests
+Include(FetchContent)
+FetchContent_Declare(
+        Catch2
+        GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+        GIT_TAG        v2.13.3)
+FetchContent_MakeAvailable(Catch2)
 add_executable(ToppleTest ${SOURCE_FILES} ${TEST_FILES})
+target_link_libraries(ToppleTest Catch2::Catch2)
+target_compile_options(ToppleTest PUBLIC -march=native -O3)
+add_test(NAME ToppleTest COMMAND ToppleTest)
+
 set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
 add_executable(Topple ${SOURCE_FILES} main.cpp)
 add_executable(ToppleTune ${SOURCE_FILES} ${TOPPLE_TUNE_FILES})
@@ -44,19 +55,17 @@ add_executable(ToppleTexelTune ${SOURCE_FILES} ${TEXEL_TUNE_FILES})
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 target_link_libraries(Topple Threads::Threads)
-target_link_libraries(ToppleTest Threads::Threads)
 target_link_libraries(ToppleTune Threads::Threads)
 target_link_libraries(ToppleTexelTune Threads::Threads)
 
 # Set -march for the Topple target, only enable asserts for tests
-target_compile_options(ToppleTest PUBLIC -march=native -O3)
 target_compile_options(Topple PUBLIC -march=native -O3 -DNDEBUG)
 target_compile_options(ToppleTune PUBLIC -DTOPPLE_TUNE -O3 -march=native -DNDEBUG)
 target_compile_options(ToppleTexelTune PUBLIC -DTEXEL_TUNE -O3 -march=native -DNDEBUG)
 
 # Configure the "Release" target
 if (CMAKE_BUILD_TYPE STREQUAL "Release")
-    set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
+    set(CMAKE_EXE_LINKER_FLAGS "-static -static-libgcc -static-libstdc++")
 
     add_custom_target(Release)
     add_executable(Topple_${TOPPLE_VERSION}_legacy ${SOURCE_FILES} main.cpp)
 
@@ -10,18 +10,6 @@ movesort_t::movesort_t(GenMode mode,  const heuristic_set_t &heuristics, const b
     killer_1 = heur.killers.primary(ply);
     killer_2 = heur.killers.secondary(ply);
     killer_3 = ply > 2 ? heur.killers.primary(ply - 2) : EMPTY_MOVE;
-
-    if(killer_1 == hash_move) {
-        killer_1 = EMPTY_MOVE;
-    }
-
-    if(killer_2 == killer_1 || killer_2 == hash_move) {
-        killer_2 = EMPTY_MOVE;
-    }
-
-    if(killer_3 == killer_2 || killer_3 == killer_1 || killer_3 == hash_move) {
-        killer_3 = EMPTY_MOVE;
-    }
 }
 
 // Pray that the compiler optimises tail recursion here - this is a very hot method
@@ -73,7 +61,9 @@ move_t movesort_t::next(GenStage &stage, int &score, bool skip_quiets) {
 
                 // Score quiets
                 for (int i = 0; i < main_buf_size; i++) {
-                    if (main_buf[i] == killer_1) {
+                    if (main_buf[i] == hash_move) {
+                        main_scores[i] = -1000000000;
+                    } else if (main_buf[i] == killer_1) {
                         main_scores[i] = 1000000003;
                     } else if (main_buf[i] == killer_2) {
                         main_scores[i] = 1000000002;