Add macOS and windows to CI

- macOS
  - system clang
  - gcc
- windows / msys2
  - mingw 64-bit gcc
  - mingw 32-bit gcc
- minor code fixes to get new CI jobs to pass
  - code: suppress unused-parameter warning on 32-bit windows
  - Makefile: if arch=any on macos, don't specify arch at all

fixes https://github.com/official-stockfish/Stockfish/issues/2958

closes https://github.com/official-stockfish/Stockfish/pull/3623

No functional change

diff --git a/.github/workflows/stockfish.yml b/.github/workflows/stockfish.yml
index 8970fcd124a2b346e7f9f3de34b0ab36068331b6..54b0cb1214ab286cc0c2393360513ddea1049910 100644 (file)
--- a/.github/workflows/stockfish.yml
+++ b/.github/workflows/stockfish.yml
@@ -25,29 +25,88 @@ jobs:
               os: ubuntu-20.04,
               compiler: g++,
               comp: gcc,
               os: ubuntu-20.04,
               compiler: g++,
               comp: gcc,

-              run_expensive_tests: true
+              run_expensive_tests: true,
+              run_32bit_tests: true,
+              run_64bit_tests: true,
+              shell: 'bash {0}'

             }
           - {
               name: "Ubuntu 20.04 Clang",
               os: ubuntu-20.04,
               compiler: clang++,
               comp: clang,
             }
           - {
               name: "Ubuntu 20.04 Clang",
               os: ubuntu-20.04,
               compiler: clang++,
               comp: clang,

-              run_expensive_tests: false
+              run_expensive_tests: false,
+              run_32bit_tests: true,
+              run_64bit_tests: true,
+              shell: 'bash {0}'
+            }
+          - {
+              name: "MacOS 10.15 Apple Clang",
+              os: macos-10.15,
+              compiler: clang++,
+              comp: clang,
+              run_expensive_tests: false,
+              run_32bit_tests: false,
+              run_64bit_tests: true,
+              shell: 'bash {0}'
+            }
+          - {
+              name: "MacOS 10.15 GCC 10",
+              os: macos-10.15,
+              compiler: g++-10,
+              comp: gcc,
+              run_expensive_tests: false,
+              run_32bit_tests: false,
+              run_64bit_tests: true,
+              shell: 'bash {0}'
+            }
+          - {
+              name: "Windows 2019 Mingw-w64 GCC x86_64",
+              os: windows-2019,
+              compiler: g++,
+              comp: gcc,
+              run_expensive_tests: false,
+              run_32bit_tests: false,
+              run_64bit_tests: true,
+              msys_sys: 'mingw64',
+              msys_env: 'x86_64',
+              shell: 'msys2 {0}'
+            }
+          - {
+              name: "Windows 2019 Mingw-w64 GCC i686",
+              os: windows-2019,
+              compiler: g++,
+              comp: gcc,
+              run_expensive_tests: false,
+              run_32bit_tests: true,
+              run_64bit_tests: false,
+              msys_sys: 'mingw32',
+              msys_env: 'i686',
+              shell: 'msys2 {0}'

             }
 
     defaults:
       run:
         working-directory: src
             }
 
     defaults:
       run:
         working-directory: src

+        shell: ${{ matrix.config.shell }}

     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
 

-      - name: Download required packages
+      - name: Download required linux packages
+        if: runner.os == 'Linux'

         run: |
           sudo apt update
           sudo apt install expect valgrind g++-multilib
 
         run: |
           sudo apt update
           sudo apt install expect valgrind g++-multilib
 

+      - name: Setup msys and install required packages
+        if: runner.os == 'Windows'
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: ${{matrix.config.msys_sys}}
+          install: mingw-w64-${{matrix.config.msys_env}}-gcc make git expect
+

       - name: Download the used network from the fishtest framework
         run: |
           make net
       - name: Download the used network from the fishtest framework
         run: |
           make net


@@ -68,6 +127,7 @@ jobs:
       # x86-32 tests
 
       - name: Test debug x86-32 build
       # x86-32 tests
 
       - name: Test debug x86-32 build

+        if: ${{ matrix.config.run_32bit_tests }}

         run: |
           export CXXFLAGS="-Werror -D_GLIBCXX_DEBUG"
           make clean
         run: |
           export CXXFLAGS="-Werror -D_GLIBCXX_DEBUG"
           make clean


@@ -75,24 +135,28 @@ jobs:
           ../tests/signature.sh $benchref
 
       - name: Test x86-32 build
           ../tests/signature.sh $benchref
 
       - name: Test x86-32 build

+        if: ${{ matrix.config.run_32bit_tests }}

         run: |
           make clean
           make -j2 ARCH=x86-32 build
           ../tests/signature.sh $benchref
 
       - name: Test x86-32-sse41-popcnt build
         run: |
           make clean
           make -j2 ARCH=x86-32 build
           ../tests/signature.sh $benchref
 
       - name: Test x86-32-sse41-popcnt build

+        if: ${{ matrix.config.run_32bit_tests }}

         run: |
           make clean
           make -j2 ARCH=x86-32-sse41-popcnt build
           ../tests/signature.sh $benchref
 
       - name: Test x86-32-sse2 build
         run: |
           make clean
           make -j2 ARCH=x86-32-sse41-popcnt build
           ../tests/signature.sh $benchref
 
       - name: Test x86-32-sse2 build

+        if: ${{ matrix.config.run_32bit_tests }}

         run: |
           make clean
           make -j2 ARCH=x86-32-sse2 build
           ../tests/signature.sh $benchref
 
       - name: Test general-32 build
         run: |
           make clean
           make -j2 ARCH=x86-32-sse2 build
           ../tests/signature.sh $benchref
 
       - name: Test general-32 build

+        if: ${{ matrix.config.run_32bit_tests }}

         run: |
           make clean
           make -j2 ARCH=general-32 build
         run: |
           make clean
           make -j2 ARCH=general-32 build


@@ -101,6 +165,7 @@ jobs:
       # x86-64 tests
 
       - name: Test debug x86-64-modern build
       # x86-64 tests
 
       - name: Test debug x86-64-modern build

+        if: ${{ matrix.config.run_64bit_tests }}

         run: |
           export CXXFLAGS="-Werror -D_GLIBCXX_DEBUG"
           make clean
         run: |
           export CXXFLAGS="-Werror -D_GLIBCXX_DEBUG"
           make clean


@@ -108,30 +173,35 @@ jobs:
           ../tests/signature.sh $benchref
 
       - name: Test x86-64-modern build
           ../tests/signature.sh $benchref
 
       - name: Test x86-64-modern build

+        if: ${{ matrix.config.run_64bit_tests }}

         run: |
           make clean
           make -j2 ARCH=x86-64-modern build
           ../tests/signature.sh $benchref
 
       - name: Test x86-64-ssse3 build
         run: |
           make clean
           make -j2 ARCH=x86-64-modern build
           ../tests/signature.sh $benchref
 
       - name: Test x86-64-ssse3 build

+        if: ${{ matrix.config.run_64bit_tests }}

         run: |
           make clean
           make -j2 ARCH=x86-64-ssse3 build
           ../tests/signature.sh $benchref
 
       - name: Test x86-64-sse3-popcnt build
         run: |
           make clean
           make -j2 ARCH=x86-64-ssse3 build
           ../tests/signature.sh $benchref
 
       - name: Test x86-64-sse3-popcnt build

+        if: ${{ matrix.config.run_64bit_tests }}

         run: |
           make clean
           make -j2 ARCH=x86-64-sse3-popcnt build
           ../tests/signature.sh $benchref
 
       - name: Test x86-64 build
         run: |
           make clean
           make -j2 ARCH=x86-64-sse3-popcnt build
           ../tests/signature.sh $benchref
 
       - name: Test x86-64 build

+        if: ${{ matrix.config.run_64bit_tests }}

         run: |
           make clean
           make -j2 ARCH=x86-64 build
           ../tests/signature.sh $benchref
 
       - name: Test general-64 build
         run: |
           make clean
           make -j2 ARCH=x86-64 build
           ../tests/signature.sh $benchref
 
       - name: Test general-64 build

+        if: matrix.config.run_64bit_tests

         run: |
           make clean
           make -j2 ARCH=general-64 build
         run: |
           make clean
           make -j2 ARCH=general-64 build


@@ -140,26 +210,31 @@ jobs:
       # x86-64 with newer extensions tests
 
       - name: Compile x86-64-avx2 build
       # x86-64 with newer extensions tests
 
       - name: Compile x86-64-avx2 build

+        if: ${{ matrix.config.run_64bit_tests }}

         run: |
           make clean
           make -j2 ARCH=x86-64-avx2 build
 
       - name: Compile x86-64-bmi2 build
         run: |
           make clean
           make -j2 ARCH=x86-64-avx2 build
 
       - name: Compile x86-64-bmi2 build

+        if: ${{ matrix.config.run_64bit_tests }}

         run: |
           make clean
           make -j2 ARCH=x86-64-bmi2 build
 
       - name: Compile x86-64-avx512 build
         run: |
           make clean
           make -j2 ARCH=x86-64-bmi2 build
 
       - name: Compile x86-64-avx512 build

+        if: ${{ matrix.config.run_64bit_tests }}

         run: |
           make clean
           make -j2 ARCH=x86-64-avx512 build
 
       - name: Compile x86-64-vnni512 build
         run: |
           make clean
           make -j2 ARCH=x86-64-avx512 build
 
       - name: Compile x86-64-vnni512 build

+        if: ${{ matrix.config.run_64bit_tests }}

         run: |
           make clean
           make -j2 ARCH=x86-64-vnni512 build
 
       - name: Compile x86-64-vnni256 build
         run: |
           make clean
           make -j2 ARCH=x86-64-vnni512 build
 
       - name: Compile x86-64-vnni256 build

+        if: ${{ matrix.config.run_64bit_tests }}

         run: |
           make clean
           make -j2 ARCH=x86-64-vnni256 build
         run: |
           make clean
           make -j2 ARCH=x86-64-vnni256 build


@@ -167,6 +242,7 @@ jobs:
       # Other tests
 
       - name: Check perft and search reproducibility
       # Other tests
 
       - name: Check perft and search reproducibility

+        if: ${{ matrix.config.run_64bit_tests }}

         run: |
           make clean
           make -j2 ARCH=x86-64-modern build
         run: |
           make clean
           make -j2 ARCH=x86-64-modern build

diff --git a/AUTHORS b/AUTHORS
index 7e63591a3b8c8632cc6e82303067873aa0910f50..18471d4d0ec7d72d75f1d44b80789b0ff24e159e 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -107,6 +107,7 @@ Kojirion
 Krystian Kuzniarek (kuzkry)
 Leonardo Ljubičić (ICCF World Champion)
 Leonid Pechenik (lp--)
 Krystian Kuzniarek (kuzkry)
 Leonardo Ljubičić (ICCF World Champion)
 Leonid Pechenik (lp--)

+Liam Keegan (lkeegan)

 Linus Arver (listx)
 loco-loco
 Lub van den Berg (ElbertoOne)
 Linus Arver (listx)
 loco-loco
 Lub van den Berg (ElbertoOne)

diff --git a/src/Makefile b/src/Makefile
index 1d972cffc281c43dd10a299d806bdc3f15a5206f..b021ba1214d8513bccd9550b45956428586599d7 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -405,8 +405,12 @@ ifeq ($(COMP),clang)
 endif
 
 ifeq ($(KERNEL),Darwin)
 endif
 
 ifeq ($(KERNEL),Darwin)

-       CXXFLAGS += -arch $(arch) -mmacosx-version-min=10.14
-       LDFLAGS += -arch $(arch) -mmacosx-version-min=10.14
+       CXXFLAGS += -mmacosx-version-min=10.14
+       LDFLAGS += -mmacosx-version-min=10.14
+       ifneq ($(arch),any)
+               CXXFLAGS += -arch $(arch)
+               LDFLAGS += -arch $(arch)
+       endif

        XCRUN = xcrun
 endif
 
        XCRUN = xcrun
 endif
 

diff --git a/src/misc.cpp b/src/misc.cpp
index 9e7b7e37b8cc99ddb79433033c3b5107f6b7abc6..3b071ccb108ca25a841eb81d95ff9f5b1a9558f6 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -378,6 +378,7 @@ void std_aligned_free(void* ptr) {
 static void* aligned_large_pages_alloc_windows(size_t allocSize) {
 
   #if !defined(_WIN64)
 static void* aligned_large_pages_alloc_windows(size_t allocSize) {
 
   #if !defined(_WIN64)

+    (void)allocSize; // suppress unused-parameter compiler warning

     return nullptr;
   #else
 
     return nullptr;
   #else