Skip to content

chore: Cleanup of more stuff.#12347

Merged
ludamad merged 4 commits into
masterfrom
cl/ci-cleanup
Feb 28, 2025
Merged

chore: Cleanup of more stuff.#12347
ludamad merged 4 commits into
masterfrom
cl/ci-cleanup

Conversation

@charlielye

Copy link
Copy Markdown
Contributor

Please read contributing guidelines and remove this line.

@ludamad ludamad merged commit ee71bc1 into master Feb 28, 2025
@ludamad ludamad deleted the cl/ci-cleanup branch February 28, 2025 02:05
AztecBot pushed a commit that referenced this pull request Apr 24, 2026
## Summary

Supersedes #21685. Fixes SIGILL crashes on ARM64 Mac devcontainers caused by zig's `-target native` detecting host CPU features (SVE on Graviton) and emitting instructions Apple Silicon can't execute.

#21611 tried to fix this with `-march=generic` from cmake, but that's not a valid AArch64 flag — zig silently ignored it. #21685 fixed ARM only; this PR also fixes x86 and simplifies the architecture targeting:

- **zig wrappers**: Replace `-target native` with explicit `aarch64`/`x86_64` targets on both architectures, preventing host-specific CPU feature detection (SVE, AVX-512, etc.). Error on unsupported architectures.
- **arch.cmake**: Hardcode `-march=skylake` on x86, skip on ARM. Remove `TARGET_ARCH` variable and auto-detection logic entirely.
- **CMakePresets.json**: Remove all `TARGET_ARCH` entries from cross-compile presets (invalid `generic` on arm64-linux, redundant `skylake` on amd64-linux/windows).

## Note on TARGET_ARCH removal

`TARGET_ARCH` was originally introduced in #2660 (Oct 2023) so the `publish-bb.yml` GitHub Actions workflow could target `westmere` for broader x86 compatibility when shipping standalone bb binaries. That workflow was deleted in #12347 (Feb 2025), so there are no remaining consumers of configurable arch targeting.

If bb binaries are ever distributed to end users on pre-skylake x86 hardware again, this would need to be reintroduced (e.g. via `-DCMAKE_CXX_FLAGS=-march=westmere` or a new variable). For now, all consumers are assumed to be on modern hardware where skylake is the minimum.

## Test plan
- [ ] CI barretenberg build passes on ARM and x86
- [ ] M3 devcontainer: `NO_CACHE=1` rebuild produces working binaries (no SIGILL)
chrismarino pushed a commit to chrismarino/aztec-packages that referenced this pull request May 5, 2026
…1682)

## Summary

Supersedes AztecProtocol#21685. Fixes SIGILL crashes on ARM64 Mac devcontainers
caused by zig's `-target native` detecting host CPU features (SVE on
Graviton) and emitting instructions Apple Silicon can't execute.

AztecProtocol#21611 tried to fix this with `-march=generic` from cmake, but that's
not a valid AArch64 flag — zig silently ignored it. AztecProtocol#21685 fixed ARM
only; this PR also fixes x86 and simplifies the architecture targeting:

- **zig wrappers**: Replace `-target native` with explicit
`aarch64`/`x86_64` targets on both architectures, preventing
host-specific CPU feature detection (SVE, AVX-512, etc.). Error on
unsupported architectures.
- **arch.cmake**: Hardcode `-march=skylake` on x86, skip on ARM. Remove
`TARGET_ARCH` variable and auto-detection logic entirely.
- **CMakePresets.json**: Remove all `TARGET_ARCH` entries from
cross-compile presets (invalid `generic` on arm64-linux, redundant
`skylake` on amd64-linux/windows).

## Note on TARGET_ARCH removal

`TARGET_ARCH` was originally introduced in AztecProtocol#2660 (Oct 2023) so the
`publish-bb.yml` GitHub Actions workflow could target `westmere` for
broader x86 compatibility when shipping standalone bb binaries. That
workflow was deleted in AztecProtocol#12347 (Feb 2025), so there are no remaining
consumers of configurable arch targeting.

If bb binaries are ever distributed to end users on pre-skylake x86
hardware again, this would need to be reintroduced (e.g. via
`-DCMAKE_CXX_FLAGS=-march=westmere` or a new variable). For now, all
consumers are assumed to be on modern hardware where skylake is the
minimum.

## Test plan
- [ ] CI barretenberg build passes on ARM and x86
- [ ] M3 devcontainer: `NO_CACHE=1` rebuild produces working binaries
(no SIGILL)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants