Skip to content

Commit

Permalink
Auto merge of #2719 - Gankra:fpsimd, r=Amanieu
Browse files Browse the repository at this point in the history
Create optionally-available __int128 typedefs and use them for ARM64 definitions.

Potentially fixes #2524, see the comments in the patch for details.
  • Loading branch information
bors committed Mar 17, 2022
2 parents ea3ab53 + 80b951d commit c048d5b
Show file tree
Hide file tree
Showing 6 changed files with 86 additions and 2 deletions.
1 change: 1 addition & 0 deletions libc-test/semver/android-aarch64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ SYS_syscalls
SYS_fcntl
__system_property_wait
user_regs_struct
user_fpsimd_struct
1 change: 1 addition & 0 deletions libc-test/semver/linux-aarch64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,4 @@ max_align_t
mcontext_t
ucontext_t
user_regs_struct
user_fpsimd_struct
71 changes: 71 additions & 0 deletions src/fixed_width_ints.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,74 @@ pub type uint16_t = u16;
pub type uint32_t = u32;
#[deprecated(since = "0.2.55", note = "Use u64 instead.")]
pub type uint64_t = u64;

cfg_if! {
if #[cfg(all(target_arch = "aarch64", not(target_os = "windows")))] {
// This introduces partial support for FFI with __int128 and
// equivalent types on platforms where Rust's definition is validated
// to match the standard C ABI of that platform.
//
// Rust does not guarantee u128/i128 are sound for FFI, and its
// definitions are in fact known to be incompatible. [0]
//
// However these problems aren't fundamental, and are just platform
// inconsistencies. Specifically at the time of this writing:
//
// * For x64 SysV ABIs (everything but Windows), the types are underaligned.
// * For all Windows ABIs, Microsoft doesn't actually officially define __int128,
// and as a result different implementations don't actually agree on its ABI.
//
// But on the other major aarch64 platforms (android, linux, ios, macos) we have
// validated that rustc has the right ABI for these types. This is important because
// aarch64 uses these types in some fundamental OS types like user_fpsimd_struct,
// which represents saved simd registers.
//
// Any API which uses these types will need to `#[ignore(improper_ctypes)]`
// until the upstream rust issue is resolved, but this at least lets us make
// progress on platforms where this type is important.
//
// The supported architectures and OSes is intentionally very restricted,
// as careful work needs to be done to verify that a particular platform
// has a conformant ABI.
//
// [0]: https://github.com/rust-lang/rust/issues/54341

/// C `__int128` (a GCC extension that's part of many ABIs)
pub type __int128 = i128;
/// C `unsigned __int128` (a GCC extension that's part of many ABIs)
pub type __uint128 = u128;
/// C __int128_t (alternate name for [__int128][])
pub type __int128_t = i128;
/// C __uint128_t (alternate name for [__uint128][])
pub type __uint128_t = u128;

// NOTE: if you add more platforms to here, you may need to cfg
// these consts. They should always match the platform's values
// for `sizeof(__int128)` and `_Alignof(__int128)`.
const _SIZE_128: usize = 16;
const _ALIGN_128: usize = 16;

/// Since Rust doesn't officially guarantee that these types
/// have compatible ABIs, we const assert that these values have the
/// known size/align of the target platform's libc. If rustc ever
/// tries to regress things, it will cause a compilation error.
///
/// This isn't a bullet-proof solution because e.g. it doesn't
/// catch the fact that llvm and gcc disagree on how x64 __int128
/// is actually *passed* on the stack (clang underaligns it for
/// the same reason that rustc *never* properly aligns it).
const _ASSERT_128_COMPAT: () = {
assert!(core::mem::size_of::<__int128>() == _SIZE_128);
assert!(core::mem::align_of::<__int128>() == _ALIGN_128);

assert!(core::mem::size_of::<__uint128>() == _SIZE_128);
assert!(core::mem::align_of::<__uint128>() == _ALIGN_128);

assert!(core::mem::size_of::<__int128_t>() == _SIZE_128);
assert!(core::mem::align_of::<__int128_t>() == _ALIGN_128);

assert!(core::mem::size_of::<__uint128_t>() == _SIZE_128);
assert!(core::mem::align_of::<__uint128_t>() == _ALIGN_128);
};
}
}
3 changes: 1 addition & 2 deletions src/unix/bsd/apple/b64/aarch64/align.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ s! {
pub __pad: u32,
}

#[repr(align(16))]
pub struct __darwin_arm_neon_state64 {
pub __v: [[u64; 2]; 32],
pub __v: [::__uint128_t; 32],
pub __fpsr: u32,
pub __fpcr: u32,
}
Expand Down
6 changes: 6 additions & 0 deletions src/unix/linux_like/android/b64/aarch64/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ s! {
pub pc: u64,
pub pstate: u64,
}

pub struct user_fpsimd_struct {
pub vregs: [::__uint128_t; 32],
pub fpsr: u32,
pub fpcr: u32,
}
}

pub const O_DIRECT: ::c_int = 0x10000;
Expand Down
6 changes: 6 additions & 0 deletions src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,12 @@ s! {
pub pstate: ::c_ulonglong,
}

pub struct user_fpsimd_struct {
pub vregs: [::__uint128_t; 32],
pub fpsr: ::c_uint,
pub fpcr: ::c_uint,
}

pub struct ipc_perm {
pub __key: ::key_t,
pub uid: ::uid_t,
Expand Down

0 comments on commit c048d5b

Please sign in to comment.