forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 58
Testable Models for SIMD Intrinsics #423
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
Open
karthikbhargavan
wants to merge
8
commits into
model-checking:main
Choose a base branch
from
cryspen:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
e6696fc
Testable Models for SIMD Intrinsics
karthikbhargavan 22385cc
Make models closer to upstream core (#3)
karthikbhargavan 41d930b
Merge branch 'main' into main
karthikbhargavan 52cd8d9
Merge branch 'main' into main
karthikbhargavan adeb400
Address review comments (added seed for RNG, improved README)
maximebuyse c8cc7ff
Merge branch 'main' into main
karthikbhargavan e6770b2
Merge branch 'main' into main
karthikbhargavan c0187fe
Revert changes to Cargo.lock.
maximebuyse File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -56,3 +56,4 @@ goto-transcoder | |
# already existing elements were commented out | ||
|
||
#/target | ||
testable-simd-models/target |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
[package] | ||
name = "testable-simd-models" | ||
version = "0.0.2" | ||
authors = ["Cryspen"] | ||
license = "Apache-2.0" | ||
homepage = "https://github.com/cryspen/verify-rust-std/testable-simd-models" | ||
edition = "2021" | ||
repository = "https://github.com/cryspen/verify-rust-std/testable-simd-models" | ||
readme = "README.md" | ||
|
||
[dependencies] | ||
rand = "0.9" | ||
pastey = "0.1.0" | ||
|
||
[lints.rust] | ||
unexpected_cfgs = { level = "warn" } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,127 @@ | ||
# testable-simd-models | ||
|
||
This crate contains executable, independently testable specifications | ||
for the SIMD intrinsics provided by the `core::arch` library in Rust. | ||
The structure of this crate is based on [rust-lang/stdarch/crates/core_arch](https://github.com/rust-lang/stdarch/tree/master/crates/core_arch). | ||
|
||
## Code Structure | ||
Within the `core_arch` folder in this crate, there is a different | ||
folder for each architecture for which we have wrtten models. | ||
In particular, it contains folders for `x86` and `arm_shared`. | ||
Each such folder has 3 sub-folders, `models`, `tests`, and `specs`. | ||
|
||
The `models` folder contains the models of the intrinsics, with a file | ||
corresponding to different target features, and are written using the | ||
various abstractions implementedin `crate::abstractions`, especially | ||
those in `crate::abstractions::simd`. These models are meant to | ||
closely resemble their implementations within the Rust core itself. | ||
|
||
The `tests` folder contains the tests of these models, and is | ||
structured the same way as `models`. Each file additionally contains | ||
the definition of a macro that makes writing these tests easier. The | ||
tests work by testing the models against the intrinsics in the Rust | ||
core, trying out random inputs (generally 1000), and comparing their | ||
outputs. | ||
|
||
## Modeling Process | ||
The process of adding a specific intrinsic's model goes as follows. | ||
For this example, let us say the intrinsic we are adding is | ||
`_mm256_bsrli_epi128` from the avx2 feature set. | ||
|
||
1. We go to [rust-lang/stdarch/crates/core_arch/src/x86/](https://github.com/rust-lang/stdarch/tree/master/crates/core_arch/src/x86/), and find the implementation of the intrinsic in `avx2.rs`. | ||
|
||
2. We see that the implementation looks like this: | ||
``` rust | ||
/// Shifts 128-bit lanes in `a` right by `imm8` bytes while shifting in zeros. | ||
/// | ||
/// [Intel's documentation](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm256_bsrli_epi128) | ||
#[inline] | ||
#[target_feature(enable = "avx2")] | ||
#[cfg_attr(test, assert_instr(vpsrldq, IMM8 = 1))] | ||
#[rustc_legacy_const_generics(1)] | ||
#[stable(feature = "simd_x86", since = "1.27.0")] | ||
pub fn _mm256_bsrli_epi128<const IMM8: i32>(a: __m256i) -> __m256i { | ||
static_assert_uimm_bits!(IMM8, 8); | ||
const fn mask(shift: i32, i: u32) -> u32 { | ||
let shift = shift as u32 & 0xff; | ||
if shift > 15 || (15 - (i % 16)) < shift { | ||
0 | ||
} else { | ||
32 + (i + shift) | ||
} | ||
} | ||
unsafe { | ||
let a = a.as_i8x32(); | ||
let r: i8x32 = simd_shuffle!( | ||
i8x32::ZERO, | ||
a, | ||
[ | ||
mask(IMM8, 0), | ||
mask(IMM8, 1), | ||
mask(IMM8, 2), | ||
mask(IMM8, 3), | ||
... | ||
mask(IMM8, 31), | ||
], | ||
); | ||
transmute(r) | ||
} | ||
} | ||
``` | ||
Thus, we then go to to `core_arch/x86/models/avx2.rs`, and add the implementation. After some modification, it ends up looking like this. | ||
tautschnig marked this conversation as resolved.
Show resolved
Hide resolved
|
||
``` rust | ||
/// Shifts 128-bit lanes in `a` right by `imm8` bytes while shifting in zeros. | ||
/// | ||
/// [Intel's documentation](https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm256_bsrli_epi128) | ||
|
||
pub fn _mm256_bsrli_epi128<const IMM8: i32>(a: __m256i) -> __m256i { | ||
const fn mask(shift: i32, i: u32) -> u64 { | ||
karthikbhargavan marked this conversation as resolved.
Show resolved
Hide resolved
|
||
let shift = shift as u32 & 0xff; | ||
if shift > 15 || (15 - (i % 16)) < shift { | ||
0 as u64 | ||
} else { | ||
(32 + (i + shift)) as u64 | ||
} | ||
} | ||
|
||
let a = BitVec::to_i8x32(a); | ||
let r: i8x32 = simd_shuffle( | ||
i8x32::from_fn(|_| 0), | ||
a, | ||
[ | ||
mask(IMM8, 0), | ||
mask(IMM8, 1), | ||
mask(IMM8, 2), | ||
mask(IMM8, 3), | ||
... | ||
mask(IMM8, 31), | ||
], | ||
); | ||
r.into() | ||
} | ||
``` | ||
|
||
3. Next, we add a test for this intrinsic. For this, we navigate to `core_arch/avx2/tests/avx2.rs`. Since the value of | ||
`IMM8` can be up to 8 bits, we want to test constant arguments up to 255. Thus, we write the following macro invocation. | ||
```rust | ||
mk!([100]_mm256_bsrli_epi128{<0>,<1>,<2>,<3>,...,<255>}(a: BitVec)); | ||
``` | ||
Here, the `[100]` means we test 100 random inputs for each constant value. This concludes the necessary steps for implementing an intrinsic. | ||
|
||
|
||
## Contributing Models | ||
|
||
To contribute new models of intrinsics, we expect the author to follow | ||
the above steps and provide comprehensive tests. It is important that | ||
the model author look carefully at both the Intel/ARM specification | ||
and the Rust `stdarch` implementation, because the Rust implementation | ||
may not necessarily be correct. | ||
tautschnig marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
Indeed, the previous implementation of `_mm256_bsrli_epi128` (and a | ||
similar intrinsic called `_mm512_bsrli_epi128`) in `stdarch` had a | ||
bug, which we found during the process of modeling and testing this | ||
intrinsic. This bug was [reported by | ||
us](https://github.com/rust-lang/stdarch/issues/1822) using a failing | ||
test case generated from the testable model and then fixed by [our | ||
PR](https://github.com/rust-lang/stdarch/pull/1823) in the 2025-06-30 | ||
version of `stdarch`. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,204 @@ | ||
//! # Bit Manipulation and Machine Integer Utilities | ||
//! | ||
//! This module provides utilities for working with individual bits and machine integer types. | ||
//! It defines a [`Bit`] enum to represent a single bit (`0` or `1`) along with convenient | ||
//! conversion implementations between `Bit`, [`bool`], and various primitive integer types. | ||
//! | ||
//! In addition, the module introduces the [`MachineInteger`] trait which abstracts over | ||
//! integer types, providing associated constants: | ||
//! | ||
//! - `BITS`: The size of the integer type in bits. | ||
//! - `SIGNED`: A flag indicating whether the type is signed. | ||
//! | ||
//! The [`Bit`] type includes methods for extracting the value of a specific bit from an integer. | ||
//! For example, [`Bit::of_int`] returns the bit at a given position for a provided integer, | ||
//! handling both positive and negative values (assuming a two's complement representation). | ||
//! | ||
//! # Examples | ||
//! | ||
//! ```rust | ||
//! use testable_simd_models::abstractions::bit::{Bit, MachineInteger}; | ||
//! | ||
//! // Extract the 3rd bit (0-indexed) from an integer. | ||
//! let bit = Bit::of_int(42, 2); | ||
//! println!("The extracted bit is: {:?}", bit); | ||
//! | ||
//! // Convert Bit to a primitive integer type. | ||
//! let num: u8 = bit.into(); | ||
//! println!("As an integer: {}", num); | ||
//! ``` | ||
//! | ||
//! [`bool`]: https://doc.rust-lang.org/std/primitive.bool.html | ||
//! [`Bit::of_int`]: enum.Bit.html#method.of_int | ||
|
||
/// Represent a bit: `0` or `1`. | ||
#[derive(Copy, Clone, Eq, PartialEq, Debug)] | ||
pub enum Bit { | ||
Zero, | ||
One, | ||
} | ||
impl std::ops::BitAnd for Bit { | ||
type Output = Self; | ||
fn bitand(self, rhs: Self) -> Self { | ||
match self { | ||
Bit::Zero => Bit::Zero, | ||
Bit::One => rhs, | ||
} | ||
} | ||
} | ||
|
||
impl std::ops::BitOr for Bit { | ||
type Output = Self; | ||
fn bitor(self, rhs: Self) -> Self { | ||
match self { | ||
Bit::Zero => rhs, | ||
Bit::One => Bit::One, | ||
} | ||
} | ||
} | ||
|
||
impl std::ops::BitXor for Bit { | ||
type Output = Self; | ||
fn bitxor(self, rhs: Self) -> Self { | ||
match (self, rhs) { | ||
(Bit::Zero, Bit::Zero) => Bit::Zero, | ||
(Bit::One, Bit::One) => Bit::Zero, | ||
_ => Bit::One, | ||
} | ||
} | ||
} | ||
|
||
impl std::ops::Neg for Bit { | ||
type Output = Self; | ||
fn neg(self) -> Self { | ||
match self { | ||
Bit::One => Bit::Zero, | ||
Bit::Zero => Bit::One, | ||
} | ||
} | ||
} | ||
macro_rules! generate_from_bit_impls { | ||
($($ty:ident),*) => { | ||
$(impl From<Bit> for $ty { | ||
fn from(bit: Bit) -> Self { | ||
bool::from(bit) as $ty | ||
} | ||
})* | ||
}; | ||
} | ||
generate_from_bit_impls!(u8, u16, u32, u64, u128, i8, i16, i32, i64, i128); | ||
|
||
impl From<Bit> for bool { | ||
fn from(bit: Bit) -> Self { | ||
match bit { | ||
Bit::Zero => false, | ||
Bit::One => true, | ||
} | ||
} | ||
} | ||
|
||
impl From<bool> for Bit { | ||
fn from(b: bool) -> Bit { | ||
match b { | ||
false => Bit::Zero, | ||
true => Bit::One, | ||
} | ||
} | ||
} | ||
|
||
/// A trait for types that represent machine integers. | ||
pub trait MachineInteger { | ||
/// The size of this integer type in bits. | ||
fn bits() -> u32; | ||
|
||
/// The signedness of this integer type. | ||
const SIGNED: bool; | ||
/// Element of the integer type with every bit as 0. | ||
const ZEROS: Self; | ||
/// Element of the integer type with every bit as 1. | ||
const ONES: Self; | ||
/// Minimum value of the integer type. | ||
const MIN: Self; | ||
/// Maximum value of the integer type. | ||
const MAX: Self; | ||
|
||
/// Implements functionality for `simd_add` in `crate::abstractions::simd`. | ||
fn wrapping_add(self, rhs: Self) -> Self; | ||
/// Implements functionality for `simd_sub` in `crate::abstractions::simd`. | ||
fn wrapping_sub(self, rhs: Self) -> Self; | ||
/// Implements functionality for `simd_mul` in `crate::abstractions::simd`. | ||
fn overflowing_mul(self, rhs: Self) -> Self; | ||
/// Implements functionality for `simd_saturating_add` in `crate::abstractions::simd`. | ||
fn saturating_add(self, rhs: Self) -> Self; | ||
/// Implements functionality for `simd_saturating_sub` in `crate::abstractions::simd`. | ||
fn saturating_sub(self, rhs: Self) -> Self; | ||
/// Implements functionality for `simd_abs_diff` in `crate::abstractions::simd`. | ||
fn absolute_diff(self, rhs: Self) -> Self; | ||
/// Implements functionality for `simd_abs` in `crate::abstractions::simd`. | ||
fn absolute_val(self) -> Self; | ||
} | ||
|
||
macro_rules! generate_imachine_integer_impls { | ||
($($ty:ident),*) => { | ||
$( | ||
impl MachineInteger for $ty { | ||
const SIGNED: bool = true; | ||
const ZEROS: $ty = 0; | ||
const ONES: $ty = -1; | ||
const MIN: $ty = $ty::MIN; | ||
const MAX: $ty = $ty::MAX; | ||
fn bits() -> u32 { $ty::BITS } | ||
fn wrapping_add(self, rhs: Self) -> Self { self.wrapping_add(rhs) } | ||
fn wrapping_sub(self, rhs: Self) -> Self { self.wrapping_sub(rhs) } | ||
fn overflowing_mul(self, rhs: Self) -> Self { self.overflowing_mul(rhs).0 } | ||
fn saturating_add(self, rhs: Self) -> Self { self.saturating_add(rhs)} | ||
fn saturating_sub(self, rhs: Self) -> Self { self.saturating_sub(rhs) } | ||
fn absolute_diff(self, rhs: Self) -> Self {if self > rhs {$ty::wrapping_sub(self, rhs)} else {$ty::wrapping_sub(rhs, self)}} | ||
fn absolute_val(self) -> Self {if self == $ty::MIN {self} else {self.abs()}} | ||
})* | ||
}; | ||
} | ||
|
||
macro_rules! generate_umachine_integer_impls { | ||
($($ty:ident),*) => { | ||
$( | ||
impl MachineInteger for $ty { | ||
const SIGNED: bool = false; | ||
const ZEROS: $ty = 0; | ||
const ONES: $ty = $ty::MAX; | ||
const MIN: $ty = $ty::MIN; | ||
const MAX: $ty = $ty::MAX; | ||
|
||
|
||
fn bits() -> u32 { $ty::BITS } | ||
fn wrapping_add(self, rhs: Self) -> Self { self.wrapping_add(rhs) } | ||
fn wrapping_sub(self, rhs: Self) -> Self { self.wrapping_sub(rhs) } | ||
fn overflowing_mul(self, rhs: Self) -> Self { self.overflowing_mul(rhs).0 } | ||
fn saturating_add(self, rhs: Self) -> Self { self.saturating_add(rhs)} | ||
fn saturating_sub(self, rhs: Self) -> Self { self.saturating_sub(rhs)} | ||
fn absolute_diff(self, rhs: Self) -> Self {if self > rhs {self - rhs} else {rhs - self}} | ||
fn absolute_val(self) -> Self {self} | ||
})* | ||
}; | ||
} | ||
generate_imachine_integer_impls!(i8, i16, i32, i64, i128); | ||
generate_umachine_integer_impls!(u8, u16, u32, u64, u128); | ||
|
||
impl Bit { | ||
fn of_raw_int(x: u128, nth: u32) -> Self { | ||
if x / 2u128.pow(nth) % 2 == 1 { | ||
Self::One | ||
} else { | ||
Self::Zero | ||
} | ||
} | ||
|
||
pub fn of_int<T: Into<i128> + MachineInteger>(x: T, nth: u32) -> Bit { | ||
let x: i128 = x.into(); | ||
if x >= 0 { | ||
Self::of_raw_int(x as u128, nth) | ||
} else { | ||
Self::of_raw_int((2i128.pow(T::bits()) + x) as u128, nth) | ||
} | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.