BLD: Add MSVC build support on windows

.github/workflows/build-numpy.yml

@@ -13,8 +13,8 @@ permissions: read-all
 jobs:
   np-multiarray-tgl:
 
-    if: github.repository == 'intel/x86-simd-sort'
-    runs-on: intel-ubuntu-24.04
+    if: github.repository == 'numpy/x86-simd-sort'
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout x86-simd-sort
@@ -79,8 +79,8 @@ jobs:
 
   np-multiarray-spr:
 
-    if: github.repository == 'intel/x86-simd-sort'
-    runs-on: intel-ubuntu-24.04
+    if: github.repository == 'numpy/x86-simd-sort'
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout x86-simd-sort

.github/workflows/c-cpp.yml

@@ -9,9 +9,57 @@ on:
 permissions: read-all
 
 jobs:
+  build-windows-msvc:
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      # Set up MSVC environment
+      - name: Set up MSVC Developer Command Prompt
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: x64
+
+      # Install Python (Meson requires it)
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      # Install Meson and Ninja
+      - name: Install Meson + Ninja
+        run: |
+          python -m pip install --upgrade pip
+          pip install meson ninja
+
+      - name: Setup environment
+        run: |
+          echo "PKG_CONFIG=${{ github.workspace }}/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe" >> $env:GITHUB_ENV
+          echo "PKG_CONFIG_PATH=${{ github.workspace }}/vcpkg/installed/x64-windows/lib/pkgconfig" >> $env:GITHUB_ENV
+          echo "LIB=${{ github.workspace }}/vcpkg/installed/x64-windows/lib;$env:LIB" >> $env:GITHUB_ENV
+          echo "INCLUDE=${{ github.workspace }}/vcpkg/installed/x64-windows/include;$env:INCLUDE" >> $env:GITHUB_ENV
+        shell: pwsh
+
+      - name: Setup vcpkg and install pkg-config and gtest
+        run: |
+          git clone https://github.com/Microsoft/vcpkg.git
+          .\vcpkg\bootstrap-vcpkg.bat
+          .\vcpkg\vcpkg install gtest:x64-windows pkgconf:x64-windows
+
+      # Configure and build with Meson (MSVC will be used automatically)
+      - name: Configure (Meson)
+        run: meson setup -Dbuild_tests=true --warnlevel 2 --buildtype release builddir --backend=ninja
+
+      - name: Build (Ninja)
+        run: ninja -C builddir
+
+      - name: Run tests 
+        run: meson test -C builddir --test-args "\-\-gtest_filter=*qsort*" -v 
+
   SKL-gcc9:
 
-    runs-on: intel-ubuntu-24.04
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -41,7 +89,7 @@ jobs:
 
   SKX-gcc10:
 
-    runs-on: intel-ubuntu-24.04
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -71,7 +119,7 @@ jobs:
 
   TGL-gcc11:
 
-    runs-on: intel-ubuntu-24.04
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -100,7 +148,7 @@ jobs:
 
   SPR-gcc13:
 
-    runs-on: intel-ubuntu-24.04
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -135,9 +183,9 @@ jobs:
     - name: Run test suite on SPR
       run: sde -spr -- ./builddir/testexe
 
-  ADL-ASAN-clang18:
+  ASAN-clang18:
 
-    runs-on: intel-ubuntu-24.04
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -170,51 +218,11 @@ jobs:
         ninja
 
     - name: Run test suite on SPR
-      run: sde -adl -- ./builddir/testexe
-
-  SPR-ASAN-clang18:
-
-    runs-on: intel-ubuntu-24.04
-
-    steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
-    - name: Install dependencies
-      run: |
-        sudo apt update
-        sudo apt -y install clang-18 libomp-18-dev libgtest-dev meson curl git
-
-    - name: Install Intel SDE
-      run: |
-        curl -o /tmp/sde.tar.xz https://downloadmirror.intel.com/859732/sde-external-9.58.0-2025-06-16-lin.tar.xz
-        mkdir /tmp/sde && tar -xvf /tmp/sde.tar.xz -C /tmp/sde/
-        sudo mv /tmp/sde/* /opt/sde && sudo ln -s /opt/sde/sde64 /usr/bin/sde
-
-    - name: Build examples
-      env:
-        CXX: clang++-18
-      run: |
-        cd examples
-        make all
-
-    - name: Build
-      env:
-        CXX: clang++-18
-      run: |
-        make clean
-        meson setup -Dbuild_tests=true -Duse_openmp=true -Db_sanitize=address,undefined -Dfatal_sanitizers=true  -Dasan_ci_dont_validate=true -Db_lundef=false --warnlevel 0 --buildtype release builddir
-        cd builddir
-        ninja
-
-    - name: Run test suite on SPR
-      run: sde -spr -- ./builddir/testexe
-    - name: Run ICL fp16 tests
-      # Note: This filters for the _Float16 tests based on the number assigned to it, which could change in the future
-      run: sde -icx -- ./builddir/testexe --gtest_filter="*/simdsort/2*"
+      run: ./builddir/testexe
 
   SKX-SKL-openmp:
 
-    runs-on: intel-ubuntu-24.04
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -246,7 +254,7 @@ jobs:
 
   SPR-gcc13-special-cases:
 
-    runs-on: intel-ubuntu-24.04
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -281,7 +289,7 @@ jobs:
 
   manylinux-32bit:
 
-    runs-on: intel-ubuntu-24.04
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -293,7 +301,7 @@ jobs:
 
   SPR-icpx:
 
-    runs-on: intel-ubuntu-24.04
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

.github/workflows/linting.yml

@@ -11,7 +11,7 @@ permissions: read-all
 jobs:
   clang-format:
 
-    runs-on: intel-ubuntu-24.04
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

benchmarks/bench.h

@@ -5,12 +5,12 @@
 #define MY_BENCHMARK_CAPTURE(func, T, test_case_name, ...) \
     BENCHMARK_PRIVATE_DECLARE(func) \
             = (::benchmark::internal::RegisterBenchmarkInternal( \
-                std::unique_ptr<benchmark::internal::Benchmark>( \
-                    new ::benchmark::internal::FunctionBenchmark( \
-                            #func "/" #test_case_name "/" #T, \
-                            [](::benchmark::State &st) { \
-                                func<T>(st, __VA_ARGS__); \
-                            }))))
+                    std::unique_ptr<benchmark::internal::Benchmark>( \
+                            new ::benchmark::internal::FunctionBenchmark( \
+                                    #func "/" #test_case_name "/" #T, \
+                                    [](::benchmark::State &st) { \
+                                        func<T>(st, __VA_ARGS__); \
+                                    }))))
 
 #define BENCH_SORT(func, type) \
     MY_BENCHMARK_CAPTURE(func, type, random_128, 128, std::string("random")); \

lib/meson.build

@@ -1,48 +1,41 @@
 libtargets = []
+libtargets += static_library('libavx',
+  files(
+    'x86simdsort-avx2.cpp',
+    ),
+  include_directories : [src],
+  cpp_args : cpp.get_id() == 'msvc' ? ['/arch:AVX2'] : ['-march=haswell'],
+  gnu_symbol_visibility : 'inlineshidden',
+  dependencies: [omp_dep],
+  )
 
-if cpp.has_argument('-march=haswell')
-  libtargets += static_library('libavx',
-    files(
-      'x86simdsort-avx2.cpp',
-      ),
-    include_directories : [src],
-    cpp_args : ['-march=haswell'],
-    gnu_symbol_visibility : 'inlineshidden',
-    dependencies: [omp_dep],
-    )
-endif
-
-if cpp.has_argument('-march=skylake-avx512')
-  libtargets += static_library('libskx',
-    files(
-      'x86simdsort-skx.cpp',
-      ),
-    include_directories : [src],
-    cpp_args : ['-march=skylake-avx512'],
-    gnu_symbol_visibility : 'inlineshidden',
-    dependencies: [omp_dep],
-    )
-endif
+libtargets += static_library('libskx',
+  files(
+    'x86simdsort-skx.cpp',
+    ),
+  include_directories : [src],
+  cpp_args : cpp.get_id() == 'msvc' ? ['/arch:AVX512'] : ['-march=skylake-avx512'],
+  gnu_symbol_visibility : 'inlineshidden',
+  dependencies: [omp_dep],
+  )
 
-if cpp.has_argument('-march=icelake-client')
-  libtargets += static_library('libicl',
-    files(
-      'x86simdsort-icl.cpp',
-      ),
-    include_directories : [src],
-    cpp_args : ['-march=icelake-client'],
-    gnu_symbol_visibility : 'inlineshidden',
-    dependencies: [omp_dep],
-    )
-endif
+libtargets += static_library('libicl',
+  files(
+    'x86simdsort-icl.cpp',
+    ),
+  include_directories : [src],
+  cpp_args : cpp.get_id() == 'msvc' ? ['/arch:AVX512'] : ['-march=icelake-client'],
+  gnu_symbol_visibility : 'inlineshidden',
+  dependencies: [omp_dep],
+  )
 
 if cancompilefp16
   libtargets += static_library('libspr',
     files(
       'x86simdsort-spr.cpp',
       ),
     include_directories : [src],
-    cpp_args : ['-march=sapphirerapids'],
+    cpp_args : cpp.get_id() == 'msvc' ? ['/arch:AVX512'] : ['-march=sapphirerapids'],
     gnu_symbol_visibility : 'inlineshidden',
     dependencies: [omp_dep],
     )

lib/x86simdsort-icl.cpp

@@ -1,6 +1,10 @@
 // ICL specific routines:
 #include "x86simdsort-static-incl.h"
 #include "x86simdsort-internal.h"
+#ifdef _MSC_VER
+#include "avx512-16bit-qsort.hpp"
+#endif
+
 
 namespace xss {
 namespace avx512 {