T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix types of i8x16 and i16x8 replace_lane

Browse Source 
Because the smallest Wasm scalar type is i32, users of the `i8x16.replace_lane` and `i16x8.replace_lane` instructions will only be able to pass `i32` values as operands. These values must be reduced by dropping the upper bits (see https://github.com/WebAssembly/simd/blob/master/proposals/simd/SIMD.md#replace-lane-value) using Cranelift's `ireduce` instruction.
This commit is contained in:
Andrew Brown
2020-03-09 11:16:05 -07:00
parent 27532410d2
commit ebaf95e507
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cranelift/wasm/src/code_translator.rs
View File

@@ -1249,23 +1249,20 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
let vector = pop1_with_bitcast(state, type_of(op), builder); let vector = pop1_with_bitcast(state, type_of(op), builder);
state.push1(builder.ins().extractlane(vector, lane.clone())) state.push1(builder.ins().extractlane(vector, lane.clone()))
} }
Operator::I8x16ReplaceLane { lane } Operator::I8x16ReplaceLane { lane } | Operator::I16x8ReplaceLane { lane } => {
| Operator::I16x8ReplaceLane { lane } let (vector, replacement) = state.pop2();
| Operator::I32x4ReplaceLane { lane } let ty = type_of(op);
let reduced = builder.ins().ireduce(ty.lane_type(), replacement);
let vector = optionally_bitcast_vector(vector, ty, builder);
state.push1(builder.ins().insertlane(vector, *lane, reduced))
}
Operator::I32x4ReplaceLane { lane }
| Operator::I64x2ReplaceLane { lane } | Operator::I64x2ReplaceLane { lane }
| Operator::F32x4ReplaceLane { lane } | Operator::F32x4ReplaceLane { lane }
| Operator::F64x2ReplaceLane { lane } => { | Operator::F64x2ReplaceLane { lane } => {
let (vector, replacement_value) = state.pop2(); let (vector, replacement) = state.pop2();
let original_vector_type = builder.func.dfg.value_type(vector);
let vector = optionally_bitcast_vector(vector, type_of(op), builder); let vector = optionally_bitcast_vector(vector, type_of(op), builder);
let replaced_vector = builder state.push1(builder.ins().insertlane(vector, *lane, replacement))
.ins()
.insertlane(vector, lane.clone(), replacement_value);
state.push1(optionally_bitcast_vector(
replaced_vector,
original_vector_type,
builder,
))
} }
Operator::V8x16Shuffle { lanes, .. } => { Operator::V8x16Shuffle { lanes, .. } => {
let (a, b) = pop2_with_bitcast(state, I8X16, builder); let (a, b) = pop2_with_bitcast(state, I8X16, builder);