[WIP]

rust-lang · Sep 15, 2024 · 21af303 · 21af303
1 parent 7ad353c
commit 21af303
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 21 deletions.
diff --git a/example/std_example.rs b/example/std_example.rs
@@ -259,6 +259,7 @@ unsafe fn test_simd() {
     test_mm_insert_epi16();
     test_mm_shuffle_epi8();
 
+    #[cfg(not(jit))]
     test_mm_cmpestri();
 
     test_mm256_shuffle_epi8();
@@ -437,6 +438,7 @@ unsafe fn test_mm_shuffle_epi8() {
 // a bit difficult. Rather than `load` and mutate the __m128i,
 // it is easier to memcpy the given string to a local slice with
 // length 16 and `load` the local slice.
+#[cfg(not(jit))]
 #[cfg(target_arch = "x86_64")]
 #[target_feature(enable = "sse4.2")]
 unsafe fn str_to_m128i(s: &[u8]) -> __m128i {
@@ -446,6 +448,7 @@ unsafe fn str_to_m128i(s: &[u8]) -> __m128i {
     _mm_loadu_si128(slice.as_ptr() as *const _)
 }
 
+#[cfg(not(jit))]
 #[cfg(target_arch = "x86_64")]
 #[target_feature(enable = "sse4.2")]
 unsafe fn test_mm_cmpestri() {

diff --git a/src/intrinsics/llvm_x86.rs b/src/intrinsics/llvm_x86.rs
@@ -757,8 +757,6 @@ pub(crate) fn codegen_x86_llvm_intrinsic_call<'tcx>(
             let b = b.load_scalar(fx);
             let lb = lb.load_scalar(fx);
 
-            panic!();
-
             let imm8 =
                 if let Some(imm8) = crate::constant::mir_operand_get_const_val(fx, &args[4].node) {
                     imm8

diff --git a/src/intrinsics/simd.rs b/src/intrinsics/simd.rs
@@ -268,10 +268,8 @@ pub(super) fn codegen_simd_intrinsic_call<'tcx>(
             let val = codegen_operand(fx, &val.node);
 
             // FIXME validate
-            let idx_const = if let Some(idx_const) =
-                crate::constant::mir_operand_get_const_val(fx, &idx.node)
-            {
-                idx_const
+            let idx_const = if let Some(idx_const) = idx.node.constant() {
+                crate::constant::eval_mir_constant(fx, idx_const).0.try_to_scalar_int().unwrap()
             } else {
                 fx.tcx.dcx().span_fatal(span, "Index argument for `simd_insert` is not a constant");
             };
@@ -304,22 +302,12 @@ pub(super) fn codegen_simd_intrinsic_call<'tcx>(
                 return;
             }
 
-            let idx_const = if let Some(idx_const) =
-                crate::constant::mir_operand_get_const_val(fx, &idx.node)
-            {
-                idx_const
+            let idx_const = if let Some(idx_const) = idx.node.constant() {
+                crate::constant::eval_mir_constant(fx, idx_const).0.try_to_scalar_int().unwrap()
             } else {
-                fx.tcx.dcx().span_warn(span, "Index argument for `simd_extract` is not a constant");
-                let trap_block = fx.bcx.create_block();
-                let true_ = fx.bcx.ins().iconst(types::I8, 1);
-                let ret_block = fx.get_block(target);
-                fx.bcx.ins().brif(true_, trap_block, &[], ret_block, &[]);
-                fx.bcx.switch_to_block(trap_block);
-                crate::trap::trap_unimplemented(
-                    fx,
-                    "Index argument for `simd_extract` is not a constant",
-                );
-                return;
+                fx.tcx
+                    .dcx()
+                    .span_fatal(span, "Index argument for `simd_extract` is not a constant");
             };
 
             let idx = idx_const.to_u32();