Skip to content

Commit c80c8f4

Browse files
authored
Merge pull request #2076 from eduardosm/Simd-new
Remove `simd_ty!` and `simd_m_ty!` macros
2 parents bb49a16 + 784a3bd commit c80c8f4

5 files changed

Lines changed: 198 additions & 902 deletions

File tree

crates/core_arch/src/powerpc/altivec.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4700,19 +4700,19 @@ mod tests {
47004700
{ $name: ident, $fn:ident, $ty: ident -> $ty_out: ident, [$($a:expr),+], [$($b:expr),+], [$($d:expr),+] } => {
47014701
#[simd_test(enable = "altivec")]
47024702
fn $name() {
4703-
let a: s_t_l!($ty) = $ty::new($($a),+).into();
4704-
let b: s_t_l!($ty) = $ty::new($($b),+).into();
4703+
let a: s_t_l!($ty) = $ty::from_array([$($a),+]).into();
4704+
let b: s_t_l!($ty) = $ty::from_array([$($b),+]).into();
47054705

4706-
let d = $ty_out::new($($d),+);
4706+
let d = $ty_out::from_array([$($d),+]);
47074707
let r = $ty_out::from(unsafe { $fn(a, b) });
47084708
assert_eq!(d, r);
47094709
}
47104710
};
47114711
{ $name: ident, $fn:ident, $ty: ident -> $ty_out: ident, [$($a:expr),+], [$($b:expr),+], $d:expr } => {
47124712
#[simd_test(enable = "altivec")]
47134713
fn $name() {
4714-
let a: s_t_l!($ty) = $ty::new($($a),+).into();
4715-
let b: s_t_l!($ty) = $ty::new($($b),+).into();
4714+
let a: s_t_l!($ty) = $ty::from_array([$($a),+]).into();
4715+
let b: s_t_l!($ty) = $ty::from_array([$($b),+]).into();
47164716

47174717
let r = $ty_out::from(unsafe { $fn(a, b) });
47184718
assert_eq!($d, r);
@@ -4728,7 +4728,7 @@ mod tests {
47284728

47294729
let d = vector_float::from(f32x4::new($($d),+));
47304730
let r = m32x4::from(unsafe { vec_cmple(vec_abs(vec_sub($fn(a), d)), vec_splats(f32::EPSILON)) });
4731-
let e = m32x4::new(true, true, true, true);
4731+
let e = m32x4::splat(true);
47324732
assert_eq!(e, r);
47334733
}
47344734
};
@@ -6212,10 +6212,10 @@ mod tests {
62126212
[$($a:expr),+], [$($b:expr),+], [$($c:expr),+], [$($d:expr),+]} => {
62136213
#[simd_test(enable = "altivec")]
62146214
fn $name() {
6215-
let a = $longtype::from($shorttype::new($($a),+));
6216-
let b = $longtype::from($shorttype::new($($b),+));
6217-
let c = vector_unsigned_char::from(u8x16::new($($c),+));
6218-
let d = $shorttype::new($($d),+);
6215+
let a = $longtype::from($shorttype::from_array([$($a),+]));
6216+
let b = $longtype::from($shorttype::from_array([$($b),+]));
6217+
let c = vector_unsigned_char::from(u8x16::from_array([$($c),+]));
6218+
let d = $shorttype::from_array([$($d),+]);
62196219

62206220
let r = $shorttype::from(unsafe { vec_perm(a, b, c) });
62216221
assert_eq!(d, r);
@@ -6664,7 +6664,7 @@ mod tests {
66646664
let check = |a, b| {
66656665
let r =
66666666
m32x4::from(unsafe { vec_cmple(vec_abs(vec_sub(a, b)), vec_splats(f32::EPSILON)) });
6667-
let e = m32x4::new(true, true, true, true);
6667+
let e = m32x4::splat(true);
66686668
assert_eq!(e, r);
66696669
};
66706670

@@ -6720,7 +6720,7 @@ mod tests {
67206720
let r =
67216721
m32x4::from(unsafe { vec_cmple(vec_abs(vec_sub(a, b)), vec_splats(f32::EPSILON)) });
67226722
println!("{:?} {:?}", a, b);
6723-
let e = m32x4::new(true, true, true, true);
6723+
let e = m32x4::splat(true);
67246724
assert_eq!(e, r);
67256725
};
67266726

crates/core_arch/src/powerpc/vsx.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -238,14 +238,14 @@ mod tests {
238238
{$name:ident, $shorttype:ident, $longtype:ident, [$($a:expr),+], [$($b:expr),+], [$($c:expr),+], [$($d:expr),+]} => {
239239
#[simd_test(enable = "vsx")]
240240
fn $name() {
241-
let a = $longtype::from($shorttype::new($($a),+, $($b),+));
242-
let b = $longtype::from($shorttype::new($($c),+, $($d),+));
241+
let a = $longtype::from($shorttype::from_array([$($a),+, $($b),+]));
242+
let b = $longtype::from($shorttype::from_array([$($c),+, $($d),+]));
243243

244244
unsafe {
245-
assert_eq!($shorttype::new($($a),+, $($c),+), $shorttype::from(vec_xxpermdi::<_, 0>(a, b)));
246-
assert_eq!($shorttype::new($($b),+, $($c),+), $shorttype::from(vec_xxpermdi::<_, 1>(a, b)));
247-
assert_eq!($shorttype::new($($a),+, $($d),+), $shorttype::from(vec_xxpermdi::<_, 2>(a, b)));
248-
assert_eq!($shorttype::new($($b),+, $($d),+), $shorttype::from(vec_xxpermdi::<_, 3>(a, b)));
245+
assert_eq!($shorttype::from_array([$($a),+, $($c),+]), $shorttype::from(vec_xxpermdi::<_, 0>(a, b)));
246+
assert_eq!($shorttype::from_array([$($b),+, $($c),+]), $shorttype::from(vec_xxpermdi::<_, 1>(a, b)));
247+
assert_eq!($shorttype::from_array([$($a),+, $($d),+]), $shorttype::from(vec_xxpermdi::<_, 2>(a, b)));
248+
assert_eq!($shorttype::from_array([$($b),+, $($d),+]), $shorttype::from(vec_xxpermdi::<_, 3>(a, b)));
249249
}
250250
}
251251
}

crates/core_arch/src/s390x/vector.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6463,10 +6463,10 @@ mod tests {
64636463
[$($a:expr),+], [$($b:expr),+], [$($c:expr),+], [$($d:expr),+]} => {
64646464
#[simd_test(enable = "vector")]
64656465
fn $name() {
6466-
let a = $longtype::from($shorttype::new($($a),+));
6467-
let b = $longtype::from($shorttype::new($($b),+));
6468-
let c = vector_unsigned_char::from(u8x16::new($($c),+));
6469-
let d = $shorttype::new($($d),+);
6466+
let a = $longtype::from($shorttype::from_array([$($a),+]));
6467+
let b = $longtype::from($shorttype::from_array([$($b),+]));
6468+
let c = vector_unsigned_char::from(u8x16::from_array([$($c),+]));
6469+
let d = $shorttype::from_array([$($d),+]);
64706470

64716471
let r = $shorttype::from(unsafe { vec_perm(a, b, c) });
64726472
assert_eq!(d, r);

0 commit comments

Comments
 (0)