Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion zlib-rs/src/adler32/neon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ unsafe fn accum32(s: (u32, u32), buf: &[uint8x16_t]) -> (u32, u32) {
(vget_lane_u32(as_, 0), vget_lane_u32(as_, 1))
}

#[cfg(test)]
#[cfg(all(test, feature = "std", target_feature = "neon"))]
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Can you change this to

Suggested change
#[cfg(all(test, feature = "std", target_feature = "neon"))]
#[cfg(all(test, feature = "std", any(miri, target_feature = "neon")))]

That way Miri can still find places where we assume a target feature but don't declare it.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

sorry for taking up your time, this is the same as #416 i think

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this one is for neon, that one for avx? This looks fine to me with the miri change, because neon is enabled by default on the linux and macos runners. The same is not true for x86, which makes it trickier.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

maybe it was me that misunderstood, I'll reopen with the suggested improvement.

mod tests {
use super::*;

Expand Down