Skip to content

s390x: fix some fixmes #2230

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.

Sign up for GitHub

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
adamgemmell merged 2 commits into from
Sep 21, 2026
+4 −18
Merged

s390x: fix some fixmes #2230

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa81a9f
s390x: use funnel shift
folkertdev Sep 20, 2026
d43f891
s390x: use u128 arithmetic
folkertdev Sep 20, 2026
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
22 changes: 4 additions & 18 deletions crates/core_arch/src/s390x/vector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,6 @@ unsafe extern "llvm-intrinsic" {
#[link_name = "llvm.s390.vsrlb"] fn vsrlb(a: vector_signed_char, b: vector_signed_char) -> vector_signed_char;
#[link_name = "llvm.s390.vslb"] fn vslb(a: vector_signed_char, b: vector_signed_char) -> vector_signed_char;

#[link_name = "llvm.s390.vsrd"] fn vsrd(a: i8x16, b: i8x16, c: u32) -> i8x16;

#[link_name = "llvm.s390.verimb"] fn verimb(a: vector_signed_char, b: vector_signed_char, c: vector_signed_char, d: i32) -> vector_signed_char;
#[link_name = "llvm.s390.verimh"] fn verimh(a: vector_signed_short, b: vector_signed_short, c: vector_signed_short, d: i32) -> vector_signed_short;
#[link_name = "llvm.s390.verimf"] fn verimf(a: vector_signed_int, b: vector_signed_int, c: vector_signed_int, d: i32) -> vector_signed_int;
Expand All @@ -140,9 +138,6 @@ unsafe extern "llvm-intrinsic" {
#[link_name = "llvm.s390.vsumqf"] fn vsumqf(a: vector_unsigned_int, b: vector_unsigned_int) -> u128;
#[link_name = "llvm.s390.vsumqg"] fn vsumqg(a: vector_unsigned_long_long, b: vector_unsigned_long_long) -> u128;

#[link_name = "llvm.s390.vaccq"] fn vaccq(a: u128, b: u128) -> u128;
#[link_name = "llvm.s390.vacccq"] fn vacccq(a: u128, b: u128, c: u128) -> u128;

#[link_name = "llvm.s390.vscbiq"] fn vscbiq(a: u128, b: u128) -> u128;
#[link_name = "llvm.s390.vsbiq"] fn vsbiq(a: u128, b: u128, c: u128) -> u128;
#[link_name = "llvm.s390.vsbcbiq"] fn vsbcbiq(a: u128, b: u128, c: u128) -> u128;
Expand Down Expand Up @@ -3664,12 +3659,7 @@ mod sealed {
#[target_feature(enable = "vector-enhancements-2")]
unsafe fn vec_srdb<const C: u32>(self, b: Self) -> Self {
static_assert_uimm_bits!(C, 3);
transmute(vsrd(transmute(self), transmute(b), C))
// FIXME(llvm): https://github.com/llvm/llvm-project/issues/129955#issuecomment-3207488190
// LLVM currently rewrites `fshr` to `fshl`, and the logic in the s390x
// backend cannot deal with that yet.
// #[link_name = "llvm.fshr.i128"] fn fshr_i128(a: u128, b: u128, c: u128) -> u128;
// transmute(fshr_i128(transmute(self), transmute(b), const { C as u128 }))
transmute(u128::funnel_shr(transmute(self), transmute(b), C))
}
}
)*
Expand Down Expand Up @@ -4849,9 +4839,7 @@ pub unsafe fn vec_addc_u128(
) -> vector_unsigned_char {
let a: u128 = transmute(a);
let b: u128 = transmute(b);
// FIXME(llvm) https://github.com/llvm/llvm-project/pull/153557
// transmute(a.overflowing_add(b).1 as u128)
transmute(vaccq(a, b))
transmute(a.overflowing_add(b).1 as u128)
}

/// Vector Add With Carry unsigned 128-bits
Expand Down Expand Up @@ -4886,10 +4874,8 @@ pub unsafe fn vec_addec_u128(
let a: u128 = transmute(a);
let b: u128 = transmute(b);
let c: u128 = transmute(c);
// FIXME(llvm) https://github.com/llvm/llvm-project/pull/153557
// let (_d, carry) = a.carrying_add(b, c & 1 != 0);
// transmute(carry as u128)
transmute(vacccq(a, b, c))
let (_d, carry) = a.carrying_add(b, c & 1 != 0);
transmute(carry as u128)
}

/// Vector Subtract with Carryout
Expand Down
Loading