Skip to content

Commit

Permalink
updated single line functions to use , revert the changes in this com…
Browse files Browse the repository at this point in the history
…mit once rust-lang#135840 is merged
  • Loading branch information
vayunbiyani committed Jan 31, 2025
1 parent 48e9a41 commit 79945a8
Show file tree
Hide file tree
Showing 28 changed files with 87 additions and 88 deletions.
4 changes: 2 additions & 2 deletions tests/ui/simd/array-type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ struct S([i32; 4]);
struct T<const N: usize>([i32; N]);

#[rustc_intrinsic]
unsafe fn simd_insert<T, E>(x: T, idx: u32, y: E) -> T;
unsafe fn simd_insert<T, E>(_x: T, _idx: u32, _y: E) -> T;

#[rustc_intrinsic]
unsafe fn simd_extract<T, E>(x: T, idx: u32) -> E;
unsafe fn simd_extract<T, E>(_x: T, _idx: u32) -> E;


pub fn main() {
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/simd/generics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ struct C<T, const N: usize>([T; N]);


#[rustc_intrinsic]
unsafe fn simd_add<T>(x: T, y: T) -> T;
unsafe fn simd_add<T>(_x: T, _y: T) -> T;

fn add<T: ops::Add<Output=T>>(lhs: T, rhs: T) -> T {
lhs + rhs
Expand Down
34 changes: 17 additions & 17 deletions tests/ui/simd/intrinsic/float-math-pass.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,57 +16,57 @@
struct f32x4(pub [f32; 4]);

#[rustc_intrinsic]
unsafe fn simd_fsqrt<T>(x: T) -> T;
unsafe fn simd_fsqrt<T>(_x: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_fabs<T>(x: T) -> T;
unsafe fn simd_fabs<T>(_x: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_fsin<T>(x: T) -> T;
unsafe fn simd_fsin<T>(_x: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_fcos<T>(x: T) -> T;
unsafe fn simd_fcos<T>(_x: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_fexp<T>(x: T) -> T;
unsafe fn simd_fexp<T>(_x: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_fexp2<T>(x: T) -> T;
unsafe fn simd_fexp2<T>(_x: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_fma<T>(x: T, y: T, z: T) -> T;
unsafe fn simd_fma<T>(_x: T, _y: T, _z: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_relaxed_fma<T>(x: T, y: T, z: T) -> T;
unsafe fn simd_relaxed_fma<T>(_x: T, _y: T, _z: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_flog<T>(x: T) -> T;
unsafe fn simd_flog<T>(_x: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_flog10<T>(x: T) -> T;
unsafe fn simd_flog10<T>(_x: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_flog2<T>(x: T) -> T;
unsafe fn simd_flog2<T>(_x: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_fpow<T>(x: T, y: T) -> T;
unsafe fn simd_fpow<T>(_x: T, _y: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_fpowi<T>(x: T, y: i32) -> T;
unsafe fn simd_fpowi<T>(_x: T, _y: i32) -> T;


// rounding functions
#[rustc_intrinsic]
unsafe fn simd_ceil<T>(x: T) -> T;
unsafe fn simd_ceil<T>(_x: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_floor<T>(x: T) -> T;
unsafe fn simd_floor<T>(_x: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_round<T>(x: T) -> T;
unsafe fn simd_round<T>(_x: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_trunc<T>(x: T) -> T;
unsafe fn simd_trunc<T>(_x: T) -> T;


macro_rules! assert_approx_eq_f32 {
Expand Down
33 changes: 16 additions & 17 deletions tests/ui/simd/intrinsic/generic-arithmetic-pass.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,53 +24,52 @@ macro_rules! all_eq {
}

#[rustc_intrinsic]
unsafe fn simd_add<T>(x: T, y: T) -> T;
unsafe fn simd_add<T>(_x: T, _y: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_sub<T>(x: T, y: T) -> T;
unsafe fn simd_sub<T>(_x: T, _y: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_mul<T>(x: T, y: T) -> T;
unsafe fn simd_mul<T>(_x: T, _y: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_div<T>(x: T, y: T) -> T;
unsafe fn simd_div<T>(_x: T, _y: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_rem<T>(x: T, y: T) -> T;
unsafe fn simd_rem<T>(_x: T, _y: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_shl<T>(x: T, y: T) -> T;
unsafe fn simd_shl<T>(_x: T, _y: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_shr<T>(x: T, y: T) -> T;
unsafe fn simd_shr<T>(_x: T, _y: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_and<T>(x: T, y: T) -> T;
unsafe fn simd_and<T>(_x: T, _y: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_or<T>(x: T, y: T) -> T;
unsafe fn simd_or<T>(_x: T, _y: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_xor<T>(x: T, y: T) -> T;

unsafe fn simd_xor<T>(_x: T, _y: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_neg<T>(x: T) -> T;
unsafe fn simd_neg<T>(_x: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_bswap<T>(x: T) -> T;
unsafe fn simd_bswap<T>(_x: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_bitreverse<T>(x: T) -> T;
unsafe fn simd_bitreverse<T>(_x: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_ctlz<T>(x: T) -> T;
unsafe fn simd_ctlz<T>(_x: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_ctpop<T>(x: T) -> T;
unsafe fn simd_ctpop<T>(_x: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_cttz<T>(x: T) -> T;
unsafe fn simd_cttz<T>(_x: T) -> T;

fn main() {
let x1 = i32x4([1, 2, 3, 4]);
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/simd/intrinsic/generic-arithmetic-saturating-pass.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ struct u32x4(pub [u32; 4]);
struct I32<const N: usize>([i32; N]);

#[rustc_intrinsic]
unsafe fn simd_saturating_add<T>(x: T, y: T) -> T;
unsafe fn simd_saturating_add<T>(_x: T, _y: T) -> T;

#[rustc_intrinsic]
unsafe fn simd_saturating_sub<T>(x: T, y: T) -> T;
unsafe fn simd_saturating_sub<T>(_x: T, _y: T) -> T;


fn main() {
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/simd/intrinsic/generic-as.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


#[rustc_intrinsic]
unsafe fn simd_as<T, U>(x: T) -> U;
unsafe fn simd_as<T, U>(_x: T) -> U;

#[derive(Copy, Clone)]
#[repr(simd)]
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/simd/intrinsic/generic-bitmask-pass.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ struct u8x4(pub [u8; 4]);
struct Tx4<T>(pub [T; 4]);

#[rustc_intrinsic]
unsafe fn simd_bitmask<T, U>(x: T) -> U;
unsafe fn simd_bitmask<T, U>(_x: T) -> U;

fn main() {
let z = u32x4([0, 0, 0, 0]);
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/simd/intrinsic/generic-bswap-byte.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ struct i8x4([i8; 4]);
struct u8x4([u8; 4]);

#[rustc_intrinsic]
unsafe fn simd_bswap<T>(x: T) -> T;
unsafe fn simd_bswap<T>(_x: T) -> T;

fn main() {
unsafe {
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/simd/intrinsic/generic-cast-pass.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


#[rustc_intrinsic]
unsafe fn simd_cast<T, U>(x: T) -> U;
unsafe fn simd_cast<T, U>(_x: T) -> U;

use std::cmp::{max, min};

Expand Down
2 changes: 1 addition & 1 deletion tests/ui/simd/intrinsic/generic-cast-pointer-width.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#![feature(repr_simd, intrinsics)]

#[rustc_intrinsic]
unsafe fn simd_cast<T, U>(x: T) -> U;
unsafe fn simd_cast<T, U>(_x: T) -> U;

#[derive(Copy, Clone)]
#[repr(simd)]
Expand Down
12 changes: 6 additions & 6 deletions tests/ui/simd/intrinsic/generic-comparison-pass.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@ struct f32x4(pub [f32; 4]);


#[rustc_intrinsic]
unsafe fn simd_eq<T, U>(x: T, y: T) -> U;
unsafe fn simd_eq<T, U>(_x: T, _y: T) -> U;

#[rustc_intrinsic]
unsafe fn simd_ne<T, U>(x: T, y: T) -> U;
unsafe fn simd_ne<T, U>(_x: T, _y: T) -> U;

#[rustc_intrinsic]
unsafe fn simd_lt<T, U>(x: T, y: T) -> U;
unsafe fn simd_lt<T, U>(_x: T, _y: T) -> U;

#[rustc_intrinsic]
unsafe fn simd_le<T, U>(x: T, y: T) -> U;
unsafe fn simd_le<T, U>(_x: T, _y: T) -> U;

#[rustc_intrinsic]
unsafe fn simd_gt<T, U>(x: T, y: T) -> U;
unsafe fn simd_gt<T, U>(_x: T, _y: T) -> U;

#[rustc_intrinsic]
unsafe fn simd_ge<T, U>(x: T, y: T) -> U;
unsafe fn simd_ge<T, U>(_x: T, _y: T) -> U;

macro_rules! cmp {
($method: ident($lhs: expr, $rhs: expr)) => {{
Expand Down
6 changes: 3 additions & 3 deletions tests/ui/simd/intrinsic/generic-elements-pass.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ struct i32x4([i32; 4]);
struct i32x8([i32; 8]);

#[rustc_intrinsic]
unsafe fn simd_insert<T, E>(x: T, idx: u32, y: E) -> T;
unsafe fn simd_insert<T, E>(_x: T, _idx: u32, _y: E) -> T;

#[rustc_intrinsic]
unsafe fn simd_extract<T, E>(x: T, idx: u32) -> E;
unsafe fn simd_extract<T, E>(_x: T, _idx: u32) -> E;


#[rustc_intrinsic]
unsafe fn simd_shuffle<T, I, U>(x: T, y: T, idx: I) -> U;
unsafe fn simd_shuffle<T, I, U>(_x: T, _y: T, _idx: I) -> U;

#[repr(simd)]
struct SimdShuffleIdx<const LEN: usize>([u32; LEN]);
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/simd/intrinsic/generic-gather-pass.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
struct x4<T>(pub [T; 4]);

#[rustc_intrinsic]
unsafe fn simd_gather<T, U, V>(x: T, y: U, z: V) -> T;
unsafe fn simd_gather<T, U, V>(_x: T, _y: U, _z: V) -> T;

#[rustc_intrinsic]
unsafe fn simd_scatter<T, U, V>(x: T, y: U, z: V) -> ();
unsafe fn simd_scatter<T, U, V>(_x: T, _y: U, _z: V) -> ();

fn main() {
let mut x = [0_f32, 1., 2., 3., 4., 5., 6., 7.];
Expand Down
22 changes: 11 additions & 11 deletions tests/ui/simd/intrinsic/generic-reduction-pass.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,37 +25,37 @@ struct f32x4(pub [f32; 4]);
struct b8x4(pub [i8; 4]);

#[rustc_intrinsic]
unsafe fn simd_reduce_add_unordered<T, U>(x: T) -> U;
unsafe fn simd_reduce_add_unordered<T, U>(_x: T) -> U;

#[rustc_intrinsic]
unsafe fn simd_reduce_mul_unordered<T, U>(x: T) -> U;
unsafe fn simd_reduce_mul_unordered<T, U>(_x: T) -> U;

#[rustc_intrinsic]
unsafe fn simd_reduce_add_ordered<T, U>(x: T, acc: U) -> U;
unsafe fn simd_reduce_add_ordered<T, U>(_x: T, _acc: U) -> U;

#[rustc_intrinsic]
unsafe fn simd_reduce_mul_ordered<T, U>(x: T, acc: U) -> U;
unsafe fn simd_reduce_mul_ordered<T, U>(_x: T, _acc: U) -> U;

#[rustc_intrinsic]
unsafe fn simd_reduce_min<T, U>(x: T) -> U;
unsafe fn simd_reduce_min<T, U>(_x: T) -> U;

#[rustc_intrinsic]
unsafe fn simd_reduce_max<T, U>(x: T) -> U;
unsafe fn simd_reduce_max<T, U>(_x: T) -> U;

#[rustc_intrinsic]
unsafe fn simd_reduce_and<T, U>(x: T) -> U;
unsafe fn simd_reduce_and<T, U>(_x: T) -> U;

#[rustc_intrinsic]
unsafe fn simd_reduce_or<T, U>(x: T) -> U;
unsafe fn simd_reduce_or<T, U>(_x: T) -> U;

#[rustc_intrinsic]
unsafe fn simd_reduce_xor<T, U>(x: T) -> U;
unsafe fn simd_reduce_xor<T, U>(_x: T) -> U;

#[rustc_intrinsic]
unsafe fn simd_reduce_all<T>(x: T) -> bool;
unsafe fn simd_reduce_all<T>(_x: T) -> bool;

#[rustc_intrinsic]
unsafe fn simd_reduce_any<T>(x: T) -> bool;
unsafe fn simd_reduce_any<T>(_x: T) -> bool;

fn main() {
unsafe {
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/simd/intrinsic/generic-select-pass.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ struct f32x4(pub [f32; 4]);
struct b8x4(pub [i8; 4]);

#[rustc_intrinsic]
unsafe fn simd_select<T, U>(x: T, a: U, b: U) -> U;
unsafe fn simd_select<T, U>(_x: T, _a: U, _b: U) -> U;

#[rustc_intrinsic]
unsafe fn simd_select_bitmask<T, U>(x: T, a: U, b: U) -> U;
unsafe fn simd_select_bitmask<T, U>(_x: T, _a: U, _b: U) -> U;


fn main() {
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/simd/intrinsic/inlining-issue67557-ice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#![feature(intrinsics, repr_simd)]

#[rustc_intrinsic]
unsafe fn simd_shuffle<T, I, U>(x: T, y: T, idx: I) -> U;
unsafe fn simd_shuffle<T, I, U>(_x: T, _y: T, _idx: I) -> U;

#[repr(simd)]
#[derive(Debug, PartialEq)]
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/simd/intrinsic/inlining-issue67557.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#![feature(intrinsics, repr_simd)]

#[rustc_intrinsic]
unsafe fn simd_shuffle<T, I, U>(x: T, y: T, idx: I) -> U;
unsafe fn simd_shuffle<T, I, U>(_x: T, _y: T, _idx: I) -> U;

#[repr(simd)]
#[derive(Debug, PartialEq)]
Expand Down
6 changes: 3 additions & 3 deletions tests/ui/simd/intrinsic/ptr-cast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@


#[rustc_intrinsic]
unsafe fn simd_cast_ptr<T, U>(x: T) -> U;
unsafe fn simd_cast_ptr<T, U>(_x: T) -> U;

#[rustc_intrinsic]
unsafe fn simd_expose_provenance<T, U>(x: T) -> U;
unsafe fn simd_expose_provenance<T, U>(_x: T) -> U;

#[rustc_intrinsic]
unsafe fn simd_with_exposed_provenance<T, U>(x: T) -> U;
unsafe fn simd_with_exposed_provenance<T, U>(_x: T) -> U;

#[derive(Copy, Clone)]
#[repr(simd)]
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/simd/issue-105439.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
struct i32x4([i32; 4]);

#[rustc_intrinsic]
pub(crate) unsafe fn simd_add<T>(x: T, y: T) -> T;
pub(crate) unsafe fn simd_add<T>(_x: T, _y: T) -> T;

#[inline(always)]
fn to_array(a: i32x4) -> [i32; 4] {
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/simd/issue-39720.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pub struct Char3(pub [i8; 3]);
pub struct Short3(pub [i16; 3]);

#[rustc_intrinsic]
unsafe fn simd_cast<T, U>(x: T) -> U;
unsafe fn simd_cast<T, U>(_x: T) -> U;

fn main() {
let cast: Short3 = unsafe { simd_cast(Char3([10, -3, -9])) };
Expand Down
Loading

0 comments on commit 79945a8

Please sign in to comment.