Skip to content

Commit 763a445

Browse files
committed
Auto merge of #1918 - RalfJung:simd_basics, r=RalfJung
portable SIMD: basic binops First steps towards #1912. Requires rust-lang/rust#90999.
2 parents 8c700f5 + 84027dc commit 763a445

File tree

3 files changed

+54
-1
lines changed

3 files changed

+54
-1
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c9c4b5d7276297679387189d96a952f2b760e7ad
1+
5bc98076f37dd8c1476de4bbe0515c55a65332b7

src/shims/intrinsics.rs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,32 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
305305
this.write_scalar(res, dest)?;
306306
}
307307

308+
// SIMD operations
309+
"simd_add" | "simd_sub" | "simd_mul" | "simd_div" => {
310+
let &[ref left, ref right] = check_arg_count(args)?;
311+
let (left, left_len) = this.operand_to_simd(left)?;
312+
let (right, right_len) = this.operand_to_simd(right)?;
313+
let (dest, dest_len) = this.place_to_simd(dest)?;
314+
315+
assert_eq!(dest_len, left_len);
316+
assert_eq!(dest_len, right_len);
317+
318+
let op = match intrinsic_name {
319+
"simd_add" => mir::BinOp::Add,
320+
"simd_sub" => mir::BinOp::Sub,
321+
"simd_mul" => mir::BinOp::Mul,
322+
"simd_div" => mir::BinOp::Div,
323+
_ => unreachable!(),
324+
};
325+
326+
for i in 0..dest_len {
327+
let left = this.read_immediate(&this.mplace_index(&left, i)?.into())?;
328+
let right = this.read_immediate(&this.mplace_index(&right, i)?.into())?;
329+
let dest = this.mplace_index(&dest, i)?.into();
330+
this.binop_ignore_overflow(op, &left, &right, &dest)?;
331+
}
332+
}
333+
308334
// Atomic operations
309335
"atomic_load" => this.atomic_load(args, dest, AtomicReadOp::SeqCst)?,
310336
"atomic_load_relaxed" => this.atomic_load(args, dest, AtomicReadOp::Relaxed)?,

tests/run-pass/portable-simd.rs

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#![feature(portable_simd)]
2+
use std::simd::*;
3+
4+
fn simd_ops_f32() {
5+
let a = f32x4::splat(10.0);
6+
let b = f32x4::from_array([1.0, 2.0, 3.0, 4.0]);
7+
assert_eq!(a + b, f32x4::from_array([11.0, 12.0, 13.0, 14.0]));
8+
assert_eq!(a - b, f32x4::from_array([9.0, 8.0, 7.0, 6.0]));
9+
assert_eq!(a * b, f32x4::from_array([10.0, 20.0, 30.0, 40.0]));
10+
assert_eq!(b / a, f32x4::from_array([0.1, 0.2, 0.3, 0.4]));
11+
assert_eq!(a / 2.0, f32x4::splat(5.0));
12+
}
13+
14+
fn simd_ops_i32() {
15+
let a = i32x4::splat(10);
16+
let b = i32x4::from_array([1, 2, 3, 4]);
17+
assert_eq!(a + b, i32x4::from_array([11, 12, 13, 14]));
18+
assert_eq!(a - b, i32x4::from_array([9, 8, 7, 6]));
19+
assert_eq!(a * b, i32x4::from_array([10, 20, 30, 40]));
20+
assert_eq!(a / b, i32x4::from_array([10, 5, 3, 2]));
21+
assert_eq!(a / 2, i32x4::splat(5));
22+
}
23+
24+
fn main() {
25+
simd_ops_f32();
26+
simd_ops_i32();
27+
}

0 commit comments

Comments
 (0)