MacOS CI: some agents don't support ADX instructions and SIGILL

mratsim · Dec 4, 2023 · 231ccc7 · 231ccc7
1 parent 0dfe2e4
commit 231ccc7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -303,15 +303,17 @@ jobs:
       - name: Run Constantine as Rust library tests (with Assembly)
         if: matrix.target.BACKEND == 'ASM' && matrix.target.cpu != 'i386'
         shell: bash
+        # We need to deactivate the assembly (used by default for benches)
         run: |
           cd constantine
-          cargo test
+          cargo test --no-default-features halo2curves --features halo2curves/multicore
       - name: Run Constantine as Rust library tests (NO Assembly)
         if: matrix.target.BACKEND == 'NO_ASM' && matrix.target.cpu != 'i386'
         shell: bash
+        # We need to deactivate the assembly (used by default for benches)
         run: |
           cd constantine
-          CTT_ASM=0 cargo test
+          CTT_ASM=0 cargo test --no-default-features halo2curves --features halo2curves/multicore
 
       - name: Run Constantine in-depth tests (Unix - with GMP, with Assembly)
         if: runner.os != 'Windows' && matrix.target.BACKEND == 'ASM'

diff --git a/constantine-rust/constantine-zal-halo2kzg/Cargo.toml b/constantine-rust/constantine-zal-halo2kzg/Cargo.toml
@@ -22,6 +22,7 @@ rand_xorshift = "0.3"
 maybe-rayon = { version = "0.1.0", default-features = false }
 
 # Ensure we bench Halo2curves with full optimizations
+# In CI "asm" needs to be disabled as some agents don't support ADX.
 halo2curves = { git = 'https://github.com/taikoxyz/halo2curves', branch = "pr-pse-exec-engine", features = ["multicore", "asm"]}
 
 [[bench]]