Skip to content

Add a fix for aarch64-darwin and enable it in CI #592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 17, 2024

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Apr 13, 2024

This includes two commits:

Change aarch64_linux module and lse tests to have the same gating

Trying to run testcrate on non-linux aarch64 currently hits a compilation error. Make this test linux-only, to be consistent with the aarch64_linux module that it depends on.

Additionally, enable the aarch64_linux module for target_arch = "arm64ec" to be the same as these tests.

Add CI testing for AArch64 Darwin

The Apple ARM silicon has been around for a while now and hopefully will become Rust Tier 1 at some point. Add it to CI since it is distinct enough from aarch64-linux and x86_86-darwin that there may be differences.

@tgross35 tgross35 force-pushed the lse-gating branch 2 times, most recently from f00788c to adb0dce Compare April 16, 2024 07:14
@tgross35 tgross35 changed the title Change aarch64_linux module and lse tests to have the same gating Add a fix for aarch64-darwin and enable it in CI Apr 16, 2024
@tgross35
Copy link
Contributor Author

@Amanieu this PR is pretty small, would you be able to merge it? It would just make it easier for me to develop/test locally without carrying an extra patch around.

src/lib.rs Outdated
@@ -62,7 +62,11 @@ pub mod arm;
#[cfg(any(target_arch = "aarch64", target_arch = "arm64ec"))]
pub mod aarch64;

#[cfg(all(target_arch = "aarch64", target_os = "linux", not(feature = "no-asm"),))]
#[cfg(all(
any(target_arch = "aarch64", target_arch = "arm64ec"),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ARM64EC only exists on Windows.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed this

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, would it be better to leave arm64ec but change the cfg to not(target_os = "macos") so it still gets tested on Windows? I don't know where this is needed but it must have been passing okay on the windows platforms.

Trying to run testcrate on non-linux aarch64 currently hits a
compilation error. Make this test linux-only, to be consistent with the
`aarch64_linux` module that it depends on.

Additionally, enable the `aarch64_linux` module for `target_arch =
"arm64ec"` to be the same as these tests.
The Apple ARM silicon has been around for a while now and hopefully will
become Rust Tier 1 at some point. Add it to CI since it is distinct
enough from aarch64-linux and x86_86-darwin that there may be
differences.
@Amanieu Amanieu merged commit 2978bdd into rust-lang:master Apr 17, 2024
23 checks passed
@tgross35 tgross35 deleted the lse-gating branch April 17, 2024 00:39
@tgross35
Copy link
Contributor Author

Thanks!

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