Enable const-testing for the ported SIMD intrinsics

Author: sayantn

tests/ui/simd/auxiliary/minisimd_const.rs

@@ -0,0 +1,220 @@
+//! Auxiliary crate for tests that need SIMD types with *const trait impls*
+//!
+//! Historically the tests just made their own, but projections into simd types
+//! was banned by <https://github.com/rust-lang/compiler-team/issues/838>, which
+//! breaks `derive(Clone)`, so this exists to give easily-usable types that can
+//! be used without copy-pasting the definitions of the helpers everywhere.
+//!
+//! This makes no attempt to guard against ICEs.  Using it with proper types
+//! and such is your responsibility in the tests you write.
+
+#![allow(unused)]
+#![allow(non_camel_case_types)]
+
+// The field is currently left `pub` for convenience in porting tests, many of
+// which attempt to just construct it directly. That still works; it's just the
+// `.0` projection that doesn't.
+#[repr(simd)]
+#[derive(Copy, Eq)]
+pub struct Simd<T, const N: usize>(pub [T; N]);
+
+impl<T: Copy, const N: usize> Clone for Simd<T, N> {
+    fn clone(&self) -> Self {
+        *self
+    }
+}
+
+impl<T: [const] PartialEq, const N: usize> const PartialEq for Simd<T, N> {
+    fn eq(&self, other: &Self) -> bool {
+        self.as_array() == other.as_array()
+    }
+}
+
+impl<T: core::fmt::Debug, const N: usize> core::fmt::Debug for Simd<T, N> {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
+        <[T; N] as core::fmt::Debug>::fmt(self.as_array(), f)
+    }
+}
+
+impl<T, const N: usize> const core::ops::Index<usize> for Simd<T, N> {
+    type Output = T;
+    fn index(&self, i: usize) -> &T {
+        &self.as_array()[i]
+    }
+}
+
+impl<T, const N: usize> Simd<T, N> {
+    pub const fn from_array(a: [T; N]) -> Self {
+        Simd(a)
+    }
+    pub const fn as_array(&self) -> &[T; N] {
+        let p: *const Self = self;
+        unsafe { &*p.cast::<[T; N]>() }
+    }
+    pub const fn into_array(self) -> [T; N]
+    where
+        T: Copy,
+    {
+        *self.as_array()
+    }
+    pub const fn splat(a: T) -> Self
+    where
+        T: Copy,
+    {
+        Self([a; N])
+    }
+}
+
+pub type u8x2 = Simd<u8, 2>;
+pub type u8x4 = Simd<u8, 4>;
+pub type u8x8 = Simd<u8, 8>;
+pub type u8x16 = Simd<u8, 16>;
+pub type u8x32 = Simd<u8, 32>;
+pub type u8x64 = Simd<u8, 64>;
+
+pub type u16x2 = Simd<u16, 2>;
+pub type u16x4 = Simd<u16, 4>;
+pub type u16x8 = Simd<u16, 8>;
+pub type u16x16 = Simd<u16, 16>;
+pub type u16x32 = Simd<u16, 32>;
+
+pub type u32x2 = Simd<u32, 2>;
+pub type u32x4 = Simd<u32, 4>;
+pub type u32x8 = Simd<u32, 8>;
+pub type u32x16 = Simd<u32, 16>;
+
+pub type u64x2 = Simd<u64, 2>;
+pub type u64x4 = Simd<u64, 4>;
+pub type u64x8 = Simd<u64, 8>;
+
+pub type u128x2 = Simd<u128, 2>;
+pub type u128x4 = Simd<u128, 4>;
+
+pub type i8x2 = Simd<i8, 2>;
+pub type i8x4 = Simd<i8, 4>;
+pub type i8x8 = Simd<i8, 8>;
+pub type i8x16 = Simd<i8, 16>;
+pub type i8x32 = Simd<i8, 32>;
+pub type i8x64 = Simd<i8, 64>;
+
+pub type i16x2 = Simd<i16, 2>;
+pub type i16x4 = Simd<i16, 4>;
+pub type i16x8 = Simd<i16, 8>;
+pub type i16x16 = Simd<i16, 16>;
+pub type i16x32 = Simd<i16, 32>;
+
+pub type i32x2 = Simd<i32, 2>;
+pub type i32x4 = Simd<i32, 4>;
+pub type i32x8 = Simd<i32, 8>;
+pub type i32x16 = Simd<i32, 16>;
+
+pub type i64x2 = Simd<i64, 2>;
+pub type i64x4 = Simd<i64, 4>;
+pub type i64x8 = Simd<i64, 8>;
+
+pub type i128x2 = Simd<i128, 2>;
+pub type i128x4 = Simd<i128, 4>;
+
+pub type usizex2 = Simd<usize, 2>;
+pub type usizex4 = Simd<usize, 4>;
+pub type usizex8 = Simd<usize, 8>;
+
+pub type isizex2 = Simd<isize, 2>;
+pub type isizex4 = Simd<isize, 4>;
+pub type isizex8 = Simd<isize, 8>;
+
+pub type f32x2 = Simd<f32, 2>;
+pub type f32x4 = Simd<f32, 4>;
+pub type f32x8 = Simd<f32, 8>;
+pub type f32x16 = Simd<f32, 16>;
+
+pub type f64x2 = Simd<f64, 2>;
+pub type f64x4 = Simd<f64, 4>;
+pub type f64x8 = Simd<f64, 8>;
+
+// The field is currently left `pub` for convenience in porting tests, many of
+// which attempt to just construct it directly. That still works; it's just the
+// `.0` projection that doesn't.
+#[repr(simd, packed)]
+#[derive(Copy)]
+pub struct PackedSimd<T, const N: usize>(pub [T; N]);
+
+impl<T: Copy, const N: usize> Clone for PackedSimd<T, N> {
+    fn clone(&self) -> Self {
+        *self
+    }
+}
+
+impl<T: [const] PartialEq, const N: usize> const PartialEq for PackedSimd<T, N> {
+    fn eq(&self, other: &Self) -> bool {
+        self.as_array() == other.as_array()
+    }
+}
+
+impl<T: core::fmt::Debug, const N: usize> core::fmt::Debug for PackedSimd<T, N> {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
+        <[T; N] as core::fmt::Debug>::fmt(self.as_array(), f)
+    }
+}
+
+impl<T, const N: usize> PackedSimd<T, N> {
+    pub const fn from_array(a: [T; N]) -> Self {
+        PackedSimd(a)
+    }
+    pub const fn as_array(&self) -> &[T; N] {
+        let p: *const Self = self;
+        unsafe { &*p.cast::<[T; N]>() }
+    }
+    pub const fn into_array(self) -> [T; N]
+    where
+        T: Copy,
+    {
+        *self.as_array()
+    }
+    pub const fn splat(a: T) -> Self
+    where
+        T: Copy,
+    {
+        Self([a; N])
+    }
+}
+
+/// Creates a function for runtime and a test for constant-time.
+#[macro_export]
+macro_rules! make_runtime_and_compiletime {
+    ($(
+        $(#[$attr:meta])*
+        fn $name:ident() $block:block
+    )*) => {
+        $(
+            $(#[$attr])*
+            fn $name() $block
+            $(#[$attr])*
+            const _: () = $block;
+        )*
+    }
+}
+
+/// Version of `assert_eq` that ignores fancy runtime printing in const context
+#[macro_export]
+macro_rules! assert_eq_const_safe {
+    ($left:expr, $right:expr $(,)?) => {
+        assert_eq_const_safe!(
+            $left,
+            $right,
+            concat!("`", stringify!($left), "` == `", stringify!($right), "`")
+        );
+    };
+    ($left:expr, $right:expr$(, $($arg:tt)+)?) => {
+        {
+            let left = $left;
+            let right = $right;
+            // type inference works better with the concrete type on the
+            // left, but humans work better with the expected on the
+            // right
+            assert!(right == left, $($($arg)*),*);
+        }
+    };
+}
+
+use {assert_eq_const_safe, make_runtime_and_compiletime};

tests/ui/simd/intrinsic/float-math-pass.rs

@@ -8,12 +8,12 @@
 
 // Test that the simd floating-point math intrinsics produce correct results.
 
-#![feature(repr_simd, intrinsics, core_intrinsics)]
+#![feature(repr_simd, core_intrinsics, const_trait_impl, const_cmp, const_index)]
 #![allow(non_camel_case_types)]
 
-#[path = "../../../auxiliary/minisimd.rs"]
-mod minisimd;
-use minisimd::*;
+#[path = "../auxiliary/minisimd_const.rs"]
+mod minisimd_const;
+use minisimd_const::*;
 
 use std::intrinsics::simd::*;
 
@@ -34,17 +34,44 @@ macro_rules! assert_approx_eq {
     }};
 }
 
-fn main() {
+make_runtime_and_compiletime! {
+    fn abs_and_rounding() {
+        let x = f32x4::from_array([1.0, 1.0, 1.0, 1.0]);
+        let y = f32x4::from_array([-1.0, -1.0, -1.0, -1.0]);
+        let z = f32x4::from_array([0.0, 0.0, 0.0, 0.0]);
+
+        let h = f32x4::from_array([0.5, 0.5, 0.5, 0.5]);
+
+        unsafe {
+            let r = simd_fabs(y);
+            assert_eq_const_safe!(x, r);
+
+            // rounding functions
+            let r = simd_floor(h);
+            assert_eq_const_safe!(z, r);
+
+            let r = simd_ceil(h);
+            assert_eq_const_safe!(x, r);
+
+            let r = simd_round(h);
+            assert_eq_const_safe!(x, r);
+
+            let r = simd_round_ties_even(h);
+            assert_eq_const_safe!(z, r);
+
+            let r = simd_trunc(h);
+            assert_eq_const_safe!(z, r);
+        }
+    }
+}
+
+fn math_functions() {
     let x = f32x4::from_array([1.0, 1.0, 1.0, 1.0]);
-    let y = f32x4::from_array([-1.0, -1.0, -1.0, -1.0]);
     let z = f32x4::from_array([0.0, 0.0, 0.0, 0.0]);
 
     let h = f32x4::from_array([0.5, 0.5, 0.5, 0.5]);
 
     unsafe {
-        let r = simd_fabs(y);
-        assert_approx_eq!(x, r);
-
         let r = simd_fcos(z);
         assert_approx_eq!(x, r);
 
@@ -74,21 +101,10 @@ fn main() {
 
         let r = simd_fsin(z);
         assert_approx_eq!(z, r);
-
-        // rounding functions
-        let r = simd_floor(h);
-        assert_eq!(z, r);
-
-        let r = simd_ceil(h);
-        assert_eq!(x, r);
-
-        let r = simd_round(h);
-        assert_eq!(x, r);
-
-        let r = simd_round_ties_even(h);
-        assert_eq!(z, r);
-
-        let r = simd_trunc(h);
-        assert_eq!(z, r);
     }
 }
+
+fn main() {
+    abs_and_rounding();
+    math_functions();
+}