Add support for Dynamic extract/inserts in const-eval

Author: sayantn

compiler/rustc_const_eval/src/interpret/simd_intrinsics.rs

@@ -72,7 +72,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
         ret: Option<mir::BasicBlock>,
     ) -> InterpResult<'tcx, bool> {
         match intrinsic_name {
-            sym::simd_insert => {
+            sym::simd_insert | sym::simd_insert_dyn => {
                 let index = u64::from(self.read_scalar(&args[1])?.to_u32()?);
                 let elem = &args[2];
                 let (input, input_len) = self.project_to_simd(&args[0])?;
@@ -92,7 +92,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
                     self.copy_op(&value, &place)?;
                 }
             }
-            sym::simd_extract => {
+            sym::simd_extract | sym::simd_extract_dyn => {
                 let index = u64::from(self.read_scalar(&args[1])?.to_u32()?);
                 let (input, input_len) = self.project_to_simd(&args[0])?;
                 // Bounds are not checked by typeck so we have to do it ourselves.

library/coretests/tests/simd_intrinsics.rs

@@ -155,72 +155,6 @@ fn float_math() {
     }
 }
 
-#[test]
-fn extract_insert_dyn() {
-    let x2 = i32x2::from_array([20, 21]);
-    let x4 = i32x4::from_array([40, 41, 42, 43]);
-    let x8 = i32x8::from_array([80, 81, 82, 83, 84, 85, 86, 87]);
-    unsafe {
-        assert_eq!(simd_insert_dyn(x2, 0, 100), i32x2::from_array([100, 21]));
-        assert_eq!(simd_insert_dyn(x2, 1, 100), i32x2::from_array([20, 100]));
-
-        assert_eq!(simd_insert_dyn(x4, 0, 100), i32x4::from_array([100, 41, 42, 43]));
-        assert_eq!(simd_insert_dyn(x4, 1, 100), i32x4::from_array([40, 100, 42, 43]));
-        assert_eq!(simd_insert_dyn(x4, 2, 100), i32x4::from_array([40, 41, 100, 43]));
-        assert_eq!(simd_insert_dyn(x4, 3, 100), i32x4::from_array([40, 41, 42, 100]));
-
-        assert_eq!(
-            simd_insert_dyn(x8, 0, 100),
-            i32x8::from_array([100, 81, 82, 83, 84, 85, 86, 87])
-        );
-        assert_eq!(
-            simd_insert_dyn(x8, 1, 100),
-            i32x8::from_array([80, 100, 82, 83, 84, 85, 86, 87])
-        );
-        assert_eq!(
-            simd_insert_dyn(x8, 2, 100),
-            i32x8::from_array([80, 81, 100, 83, 84, 85, 86, 87])
-        );
-        assert_eq!(
-            simd_insert_dyn(x8, 3, 100),
-            i32x8::from_array([80, 81, 82, 100, 84, 85, 86, 87])
-        );
-        assert_eq!(
-            simd_insert_dyn(x8, 4, 100),
-            i32x8::from_array([80, 81, 82, 83, 100, 85, 86, 87])
-        );
-        assert_eq!(
-            simd_insert_dyn(x8, 5, 100),
-            i32x8::from_array([80, 81, 82, 83, 84, 100, 86, 87])
-        );
-        assert_eq!(
-            simd_insert_dyn(x8, 6, 100),
-            i32x8::from_array([80, 81, 82, 83, 84, 85, 100, 87])
-        );
-        assert_eq!(
-            simd_insert_dyn(x8, 7, 100),
-            i32x8::from_array([80, 81, 82, 83, 84, 85, 86, 100])
-        );
-
-        assert_eq!(simd_extract_dyn(x2, 0), 20);
-        assert_eq!(simd_extract_dyn(x2, 1), 21);
-
-        assert_eq!(simd_extract_dyn(x4, 0), 40);
-        assert_eq!(simd_extract_dyn(x4, 1), 41);
-        assert_eq!(simd_extract_dyn(x4, 2), 42);
-        assert_eq!(simd_extract_dyn(x4, 3), 43);
-
-        assert_eq!(simd_extract_dyn(x8, 0), 80);
-        assert_eq!(simd_extract_dyn(x8, 1), 81);
-        assert_eq!(simd_extract_dyn(x8, 2), 82);
-        assert_eq!(simd_extract_dyn(x8, 3), 83);
-        assert_eq!(simd_extract_dyn(x8, 4), 84);
-        assert_eq!(simd_extract_dyn(x8, 5), 85);
-        assert_eq!(simd_extract_dyn(x8, 6), 86);
-        assert_eq!(simd_extract_dyn(x8, 7), 87);
-    }
-}
-
 #[test]
 fn funnel_shifts() {
     let x1 = i32x4::from_array([1, 2, 3, 4]);
@@ -974,6 +908,73 @@ test_runtime_and_compiletime! {
         }
     }
 
+
+    #[test]
+    fn extract_insert_dyn() {
+        let x2 = i32x2::from_array([20, 21]);
+        let x4 = i32x4::from_array([40, 41, 42, 43]);
+        let x8 = i32x8::from_array([80, 81, 82, 83, 84, 85, 86, 87]);
+        unsafe {
+            assert_eq!(simd_insert_dyn(x2, 0, 100), i32x2::from_array([100, 21]));
+            assert_eq!(simd_insert_dyn(x2, 1, 100), i32x2::from_array([20, 100]));
+
+            assert_eq!(simd_insert_dyn(x4, 0, 100), i32x4::from_array([100, 41, 42, 43]));
+            assert_eq!(simd_insert_dyn(x4, 1, 100), i32x4::from_array([40, 100, 42, 43]));
+            assert_eq!(simd_insert_dyn(x4, 2, 100), i32x4::from_array([40, 41, 100, 43]));
+            assert_eq!(simd_insert_dyn(x4, 3, 100), i32x4::from_array([40, 41, 42, 100]));
+
+            assert_eq!(
+                simd_insert_dyn(x8, 0, 100),
+                i32x8::from_array([100, 81, 82, 83, 84, 85, 86, 87])
+            );
+            assert_eq!(
+                simd_insert_dyn(x8, 1, 100),
+                i32x8::from_array([80, 100, 82, 83, 84, 85, 86, 87])
+            );
+            assert_eq!(
+                simd_insert_dyn(x8, 2, 100),
+                i32x8::from_array([80, 81, 100, 83, 84, 85, 86, 87])
+            );
+            assert_eq!(
+                simd_insert_dyn(x8, 3, 100),
+                i32x8::from_array([80, 81, 82, 100, 84, 85, 86, 87])
+            );
+            assert_eq!(
+                simd_insert_dyn(x8, 4, 100),
+                i32x8::from_array([80, 81, 82, 83, 100, 85, 86, 87])
+            );
+            assert_eq!(
+                simd_insert_dyn(x8, 5, 100),
+                i32x8::from_array([80, 81, 82, 83, 84, 100, 86, 87])
+            );
+            assert_eq!(
+                simd_insert_dyn(x8, 6, 100),
+                i32x8::from_array([80, 81, 82, 83, 84, 85, 100, 87])
+            );
+            assert_eq!(
+                simd_insert_dyn(x8, 7, 100),
+                i32x8::from_array([80, 81, 82, 83, 84, 85, 86, 100])
+            );
+
+            assert_eq!(simd_extract_dyn(x2, 0), 20);
+            assert_eq!(simd_extract_dyn(x2, 1), 21);
+
+            assert_eq!(simd_extract_dyn(x4, 0), 40);
+            assert_eq!(simd_extract_dyn(x4, 1), 41);
+            assert_eq!(simd_extract_dyn(x4, 2), 42);
+            assert_eq!(simd_extract_dyn(x4, 3), 43);
+
+            assert_eq!(simd_extract_dyn(x8, 0), 80);
+            assert_eq!(simd_extract_dyn(x8, 1), 81);
+            assert_eq!(simd_extract_dyn(x8, 2), 82);
+            assert_eq!(simd_extract_dyn(x8, 3), 83);
+            assert_eq!(simd_extract_dyn(x8, 4), 84);
+            assert_eq!(simd_extract_dyn(x8, 5), 85);
+            assert_eq!(simd_extract_dyn(x8, 6), 86);
+            assert_eq!(simd_extract_dyn(x8, 7), 87);
+        }
+    }
+
     fn shuffle() {
         macro_rules! simd_shuffle {
             ($a:expr, $b:expr, $swizzle:expr) => {