Chia-Network
diff --git a/‎.github/workflows/rust.yml‎
Lines changed: 17 additions & 0 deletions b/‎.github/workflows/rust.yml‎
Lines changed: 17 additions & 0 deletions
diff --git a/‎.github/workflows/test.yaml‎
Lines changed: 194 additions & 12 deletions b/‎.github/workflows/test.yaml‎
Lines changed: 194 additions & 12 deletions
diff --git a/‎README.md‎
Lines changed: 36 additions & 4 deletions b/‎README.md‎
Lines changed: 36 additions & 4 deletions
diff --git a/‎pyproject.toml‎
Lines changed: 25 additions & 2 deletions b/‎pyproject.toml‎
Lines changed: 25 additions & 2 deletions
diff --git a/‎src/1weso_test.cpp‎
Lines changed: 2 additions & 1 deletion b/‎src/1weso_test.cpp‎
Lines changed: 2 additions & 1 deletion
@@ -124,6 +124,23 @@ jobs:
         if: matrix.os.name == 'macOS'
         run: echo "LIBRARY_PATH=$(brew --prefix)/lib:$LIBRARY_PATH" >> $GITHUB_ENV
 
+      - name: Install CMake on MacOS
+        if: matrix.os.name == 'macOS'
+        run: |
+          brew ls --versions cmake >/dev/null 2>&1 || brew install cmake
+          CMAKE_BIN="$(brew --prefix cmake)/bin"
+          if [ -d "$CMAKE_BIN" ]; then
+            echo "$CMAKE_BIN" >> "$GITHUB_PATH"
+            export PATH="$CMAKE_BIN:$PATH"
+          fi
+          if ! command -v cmake >/dev/null 2>&1; then
+            BREW_BIN="$(brew --prefix)/bin"
+            echo "$BREW_BIN" >> "$GITHUB_PATH"
+            export PATH="$BREW_BIN:$PATH"
+          fi
+          command -v cmake
+          cmake --version
+
       - name: Install MPIR on Windows
         if: matrix.os.name == 'Windows'
         run: |
 
@@ -14,11 +14,18 @@ jobs:
   test:
     name: Test ${{ matrix.config }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
+    env:
+      CHIAVDF_LOG_AVX: "1"
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13-intel, macos-13-arm64, ubuntu-latest]
+        os: [macos-13-intel, macos-13-arm64, ubuntu-latest, windows-latest]
         config: [optimized=1, TSAN=1, ASAN=1]
+        exclude:
+          - os: windows-latest
+            config: ASAN=1
+          - os: windows-latest
+            config: TSAN=1
 
     steps:
     - name: Checkout code
@@ -43,12 +50,145 @@ jobs:
     - name: Build vdf-client on Mac
       if: startsWith(matrix.os, 'mac')
       run: |
-        brew install boost
+        brew ls --versions boost >/dev/null 2>&1 || brew install boost
+        BOOST_VERSION="$(brew list --versions boost | awk '{print $2}')"
+        BOOST_INCLUDE=""
+        for cand in \
+          "$(brew --prefix boost)/include" \
+          "$(brew --prefix)/include" \
+          "$(brew --cellar boost)/${BOOST_VERSION}/include"; do
+          if [ -f "$cand/boost/asio.hpp" ]; then
+            BOOST_INCLUDE="$cand"
+            break
+          fi
+        done
+        if [ -z "$BOOST_INCLUDE" ]; then
+          echo "Could not locate boost/asio.hpp for brew boost=${BOOST_VERSION}" >&2
+          brew --prefix boost || true
+          brew --cellar boost || true
+          brew info boost || true
+          exit 1
+        fi
         cd src
-        make ${{ matrix.config }} -f Makefile.vdf-client
+        make ${{ matrix.config }} CPPFLAGS="-I${BOOST_INCLUDE} ${CPPFLAGS:-}" -f Makefile.vdf-client
+
+    - name: Cache Boost on Windows
+      if: startsWith(matrix.os, 'windows')
+      id: cache-boost
+      uses: actions/cache/restore@v4
+      with:
+        path: C:\local\boost_*
+        key: windows-boost-msvc-14.3-v1
 
-    - name: Test vdf-client
-      if: matrix.config == 'optimized=1'
+    - name: Install LLVM and Ninja on Windows
+      if: startsWith(matrix.os, 'windows')
+      shell: pwsh
+      env:
+        BOOST_CACHE_HIT: ${{ steps.cache-boost.outputs.cache-hit }}
+      run: |
+        $llvmBin = "C:\Program Files\LLVM\bin\clang-cl.exe"
+        $ninjaBin = "C:\ProgramData\chocolatey\bin\ninja.exe"
+        if (-not (Test-Path $llvmBin) -or -not (Test-Path $ninjaBin)) {
+          Write-Host "LLVM/Ninja not found, installing via choco"
+          choco install llvm ninja -y
+        } else {
+          Write-Host "LLVM and Ninja already present, skipping choco install"
+        }
+
+        $boostDir = Get-ChildItem "C:\local" -Directory -Filter "boost_*" -ErrorAction SilentlyContinue | Select-Object -First 1
+        if (-not $boostDir) {
+          if ("$env:BOOST_CACHE_HIT" -ne "true") {
+            Write-Host "Boost cache miss and boost not found, installing boost-msvc-14.3"
+            choco install boost-msvc-14.3 -y
+          } else {
+            Write-Host "Boost cache reported hit but boost directory missing; reinstalling boost-msvc-14.3"
+            choco install boost-msvc-14.3 -y
+          }
+          $boostDir = Get-ChildItem "C:\local" -Directory -Filter "boost_*" -ErrorAction SilentlyContinue | Select-Object -First 1
+        } else {
+          Write-Host "Boost already present at $($boostDir.FullName), skipping choco install"
+        }
+
+        "C:\Program Files\LLVM\bin" | Out-File -Append -FilePath $env:GITHUB_PATH
+        # Enable AVX-512 IFMA codegen in CI; runtime dispatch remains CPUID-gated.
+        "CHIA_ENABLE_AVX512_IFMA=1" | Out-File -Append -FilePath $env:GITHUB_ENV
+        if (-not $boostDir) {
+          throw "Boost install not found under C:\local"
+        }
+        "BOOST_INCLUDE_DIR=$($boostDir.FullName)" | Out-File -Append -FilePath $env:GITHUB_ENV
+
+    - name: Save Boost cache on Windows
+      if: startsWith(matrix.os, 'windows') && steps.cache-boost.outputs.cache-hit != 'true'
+      uses: actions/cache/save@v4
+      with:
+        path: C:\local\boost_*
+        key: ${{ steps.cache-boost.outputs.cache-primary-key }}
+
+    - name: Cache mpir checkout on Windows
+      if: startsWith(matrix.os, 'windows')
+      id: cache-mpir
+      uses: actions/cache@v4
+      with:
+        path: mpir_gc_x64
+        key: windows-mpir-gc-x64-v1
+
+    - name: Checkout mpir for Windows
+      if: startsWith(matrix.os, 'windows') && steps.cache-mpir.outputs.cache-hit != 'true'
+      uses: actions/checkout@v6
+      with:
+        repository: Chia-Network/mpir_gc_x64
+        fetch-depth: 1
+        path: mpir_gc_x64
+
+    - name: Set up MSVC environment (Windows SDK + CRT libs)
+      if: startsWith(matrix.os, 'windows')
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: x64
+
+    - name: Build vdf-client on Windows
+      if: startsWith(matrix.os, 'windows')
+      shell: pwsh
+      run: |
+        $cmakeBuildType = "Release"
+        $cmakeArgs = @(
+          "-S", "src",
+          "-B", "build",
+          "-G", "Ninja",
+          "-DCMAKE_BUILD_TYPE=$cmakeBuildType",
+          "-DCMAKE_TRY_COMPILE_CONFIGURATION=Release",
+          "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL",
+          "-DCMAKE_C_COMPILER=clang-cl",
+          "-DCMAKE_CXX_COMPILER=clang-cl",
+          "-DCMAKE_ASM_COMPILER=clang-cl",
+          "-DBOOST_INCLUDE_DIR=$env:BOOST_INCLUDE_DIR",
+          "-DBUILD_PYTHON=OFF",
+          "-DBUILD_CHIAVDFC=OFF",
+          "-DBUILD_VDF_CLIENT=ON",
+          "-DBUILD_VDF_BENCH=ON",
+          "-DBUILD_VDF_TESTS=ON",
+          "-DBUILD_HW_TOOLS=OFF",
+          "-DENABLE_GNU_ASM=ON"
+        )
+        & cmake @cmakeArgs
+        $gnuAsmEnabled = (& cmake -N -L build | Select-String '^ENABLE_GNU_ASM:BOOL=ON$')
+        if (-not $gnuAsmEnabled) {
+          throw "ENABLE_GNU_ASM is not ON on Windows CI build"
+        }
+        cmake --build build --target vdf_client vdf_bench 1weso_test 2weso_test prover_test
+        $asmFiles = @(
+          "build/asm_compiled.s",
+          "build/avx2_asm_compiled.s",
+          "build/avx512_asm_compiled.s"
+        )
+        foreach ($asmFile in $asmFiles) {
+          if (-not (Test-Path $asmFile)) {
+            throw "Expected generated asm output not found: $asmFile"
+          }
+        }
+
+    - name: Run vdf tests (optimized)
+      if: matrix.config == 'optimized=1' && !startsWith(matrix.os, 'windows')
       run: |
         cd src
         echo "Running 1weso_test"
@@ -62,8 +202,8 @@ jobs:
           CHIAVDF_PROVER_TEST_FAST=1 ./prover_test
         fi
 
-    - name: Test vdf-client
-      if: matrix.config != 'optimized=1'
+    - name: Run vdf tests (short)
+      if: matrix.config != 'optimized=1' && !startsWith(matrix.os, 'windows')
       run: |
         cd src
         echo "Running 1weso_test"
@@ -75,7 +215,7 @@ jobs:
     # it prints to std::cout from multiple threads. Which is allowed by the
     # standard
     - name: test Prover
-      if: matrix.config != 'optimized=1' && (matrix.config != 'TSAN=1' || startsWith(matrix.os, 'ubuntu'))
+      if: matrix.config != 'optimized=1' && (matrix.config != 'TSAN=1' || startsWith(matrix.os, 'ubuntu')) && !startsWith(matrix.os, 'windows')
       run: |
         cd src
         echo "Running prover_test"
@@ -85,9 +225,51 @@ jobs:
           CHIAVDF_PROVER_TEST_FAST=1 ./prover_test
         fi
 
-    - name: Benchmark vdf-client
-      if: matrix.config == 'optimized=1'
+    - name: Test vdf-client (Windows)
+      if: matrix.config == 'optimized=1' && startsWith(matrix.os, 'windows')
+      shell: pwsh
+      run: |
+        cd build
+        $dllPaths = @()
+        if ($env:MPIR_ROOT -and (Test-Path "$env:MPIR_ROOT\bin")) { $dllPaths += "$env:MPIR_ROOT\bin" }
+        if (Test-Path "$env:GITHUB_WORKSPACE\mpir_gc_x64") { $dllPaths += "$env:GITHUB_WORKSPACE\mpir_gc_x64" }
+        if ($dllPaths.Count -gt 0) { $env:PATH = ($dllPaths -join ';') + ';' + $env:PATH }
+        function Invoke-TestExe([string]$name, [string[]]$testArgs = @()) {
+          Write-Host "Running $name"
+          & ".\$name.exe" @testArgs
+          $exitCode = $LASTEXITCODE
+          if ($exitCode -ne 0) {
+            Write-Host "$name exit code: $exitCode"
+            exit $exitCode
+          }
+          return $exitCode
+        }
+        Write-Host "Running 1weso_test"
+        Invoke-TestExe "1weso_test"
+        Write-Host "Running 2weso_test"
+        Invoke-TestExe "2weso_test"
+        Write-Host "Running prover_test"
+        $env:CHIAVDF_PROVER_TEST_FAST = "1"
+        Invoke-TestExe "prover_test"
+
+    - name: Benchmark vdf_bench square (Ubuntu/Mac)
+      if: matrix.config == 'optimized=1' && !startsWith(matrix.os, 'windows')
       run: |
         cd src
-        echo "Benchmarking vdf_client with 400,000 iterations of vdf_bench"
-        ./vdf_bench square_asm 400000
+        echo "Benchmarking vdf_bench with 2,000,000 iterations of square_asm"
+        ./vdf_bench square_asm 2000000
+
+    - name: Benchmark vdf_bench square (Windows)
+      if: matrix.config == 'optimized=1' && startsWith(matrix.os, 'windows')
+      shell: pwsh
+      run: |
+        cd build
+        $dllPaths = @()
+        if ($env:MPIR_ROOT -and (Test-Path "$env:MPIR_ROOT\bin")) { $dllPaths += "$env:MPIR_ROOT\bin" }
+        if (Test-Path "$env:GITHUB_WORKSPACE\mpir_gc_x64") { $dllPaths += "$env:GITHUB_WORKSPACE\mpir_gc_x64" }
+        if ($dllPaths.Count -gt 0) { $env:PATH = ($dllPaths -join ';') + ';' + $env:PATH }
+        Write-Host "Benchmarking vdf_bench with 2,000,000 iterations of square_asm"
+        & .\vdf_bench.exe square_asm 2000000
+        Write-Host "vdf_bench exit code: $LASTEXITCODE"
+        if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+
@@ -38,12 +38,44 @@ to it by the Timelord. The repo also includes a benchmarking tool to get a
 sense of the iterations per second of a given CPU called vdf_bench. Try
 `./vdf_bench square_asm 250000` for an ips estimate on x86/x64 (phased/asm
 pipeline). On non-x86 architectures, use `./vdf_bench square 250000` (NUDUPL).
+Set `CHIAVDF_LOG_AVX=1` to emit AVX feature detection logs during startup.
 
-To build vdf_client set the environment variable BUILD_VDF_CLIENT to "Y".
-`export BUILD_VDF_CLIENT=Y`.
+For direct CMake builds, the following options are available:
 
-Similarly, to build vdf_bench set the environment variable BUILD_VDF_BENCH to
-"Y". `export BUILD_VDF_BENCH=Y`.
+- `BUILD_VDF_CLIENT` - build `vdf_client`
+- `BUILD_VDF_BENCH` - build `vdf_bench`
+- `BUILD_VDF_TESTS` - build `1weso_test`, `2weso_test`, and `prover_test`
+- `BUILD_HW_TOOLS` - build hardware timelord tools
+- `ENABLE_GNU_ASM` - enable GNU-style asm pipeline on x86/x64 (enabled by default)
+- `GENERATE_ASM_TRACKING_DATA` - enable `track_asm()` instrumentation in generated asm (off by default to avoid hot-loop overhead)
+
+Example:
+
+```bash
+cmake -S src -B build \
+  -DBUILD_PYTHON=OFF \
+  -DBUILD_CHIAVDFC=OFF \
+  -DBUILD_VDF_CLIENT=ON \
+  -DBUILD_VDF_BENCH=ON \
+  -DBUILD_VDF_TESTS=ON
+cmake --build build --target vdf_client vdf_bench 1weso_test 2weso_test prover_test
+```
+
+For the legacy `setup.py` + `Makefile.vdf-client` flow (used by wheel hooks),
+you can control native binary builds with environment variables:
+
+- `BUILD_VDF_CLIENT=Y` to include `vdf_client` (and related test binaries)
+- `BUILD_VDF_BENCH=Y` to include `vdf_bench`
+For direct CMake builds, use `-DBUILD_*` flags instead of these environment variables.
+
+AVX runtime flags:
+
+- `CHIAVDF_LOG_AVX=1`: emit AVX detection logs at startup
+- `CHIA_DISABLE_AVX2=1`: disable AVX2 path even when supported
+- `CHIA_FORCE_AVX2=1`: force AVX2 path
+- `CHIA_DISABLE_AVX512_IFMA=1`: disable AVX-512 IFMA path
+- `CHIA_ENABLE_AVX512_IFMA=1`: enable AVX-512 IFMA path when CPUID support is present
+- `CHIA_FORCE_AVX512_IFMA=1`: force AVX-512 IFMA path
 
 This is currently automated via pip in the
 [install-timelord.sh](https://github.com/Chia-Network/chia-blockchain/blob/master/install-timelord.sh)
 
@@ -33,8 +33,31 @@ before-build = "python -m pip install --upgrade pip"
 [tool.cibuildwheel.macos]
 build-verbosity = 0
 before-all = """
-brew --prefix --installed gmp >/dev/null 2>&1 || brew install gmp
-brew install boost cmake
+set -euo pipefail
+export HOMEBREW_NO_AUTO_UPDATE=1
+
+brew_install_if_missing() {
+  pkg="$1"
+  if brew list --versions "$pkg" >/dev/null 2>&1; then
+    echo "$pkg already installed"
+    return 0
+  fi
+
+  for attempt in 1 2 3; do
+    if brew install "$pkg"; then
+      return 0
+    fi
+    echo "brew install $pkg failed (attempt $attempt), retrying..."
+    sleep $((attempt * 5))
+  done
+
+  echo "Failed to install $pkg after retries"
+  return 1
+}
+
+brew_install_if_missing gmp
+brew_install_if_missing boost
+brew_install_if_missing cmake
 """
 before-build = "python -m pip install --upgrade pip"
 environment = {MACOSX_DEPLOYMENT_TARGET="13", SYSTEM_VERSION_COMPAT=0, BUILD_VDF_CLIENT="N"}
 
@@ -26,7 +26,8 @@ int main(int argc, char const* argv[]) try
     assert(is_vdf_test); //assertions should be disabled in VDF_MODE==0
     init_gmp();
     debug_mode = true;
-    if(hasAVX2())
+    const bool has_avx2 = hasAVX2();
+    if(has_avx2)
     {
       gcd_base_bits=63;
       gcd_128_max_iter=2;