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

Implement Umulhi for the interpreter

Browse Source 
Implemented `Umulhi` for the Cranelift interpreter, performing unsigned
integer multiplication and producing the high half of a double-length
result.

Fixed `ExtractUpper` conversion behaviour as part of this change, which
was extracting from a 128-bit value regardless of the size of the
original value.

Copyright (c) 2021, Arm Limited.
This commit is contained in:
dheaton-arm
2021-09-02 13:11:41 +01:00
parent 02ef6a02b8
commit 16b6a404e4
4 changed files with 116 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
cranelift/interpreter/src/step.rs
View File

@@ -516,7 +516,52 @@ where
Opcode::Ineg => binary(Value::sub, Value::int(0, ctrl_ty)?, arg(0)?)?,
Opcode::Iabs => unimplemented!("Iabs"),
Opcode::Imul => binary(Value::mul, arg(0)?, arg(1)?)?,
Opcode::Umulhi => unimplemented!("Umulhi"),
Opcode::Umulhi => {
if ctrl_ty.is_vector() {
let double_length = match ctrl_ty.lane_bits() {
8 => types::I16,
16 => types::I32,
32 => types::I64,
64 => types::I128,
_ => unimplemented!("Unsupported integer length {}", ctrl_ty.bits()),
};
let mut new_vec = SimdVec::new();
let arg0 = extractlanes(&arg(0)?, ctrl_ty.lane_type())?;
let arg1 = extractlanes(&arg(1)?, ctrl_ty.lane_type())?;
for (x, y) in arg0.into_iter().zip(arg1) {
let x: V = Value::int(x, double_length)?;
let y: V = Value::int(y, double_length)?;
new_vec.push(
Value::mul(x, y)?
.convert(ValueConversionKind::ExtractUpper(ctrl_ty.lane_type()))?
.into_int()?,
)
}
assign(vectorizelanes(&new_vec, ctrl_ty)?)
} else {
let double_length = match ctrl_ty.bits() {
8 => types::I16,
16 => types::I32,
32 => types::I64,
64 => types::I128,
_ => unimplemented!("Unsupported integer length {}", ctrl_ty.bits()),
};
let x: V = Value::int(
arg(0)?
.convert(ValueConversionKind::ToUnsigned)?
.into_int()?,
double_length,
)?;
let y: V = Value::int(
arg(1)?
.convert(ValueConversionKind::ToUnsigned)?
.into_int()?,
double_length,
)?;
let z = Value::mul(x, y)?.convert(ValueConversionKind::ExtractUpper(ctrl_ty))?;
assign(z)
}
}
Opcode::Smulhi => unimplemented!("Smulhi"),
Opcode::Udiv => binary_unsigned_can_trap(Value::div, arg(0)?, arg(1)?)?,
Opcode::Sdiv => binary_can_trap(Value::div, arg(0)?, arg(1)?)?,

2
cranelift/interpreter/src/value.rs
View File

@@ -273,7 +273,7 @@ impl Value for DataValue {
kind
);
let shift_amt = 128 - (ty.bytes() * 8);
let shift_amt = (self.ty().bytes() * 8) - (ty.bytes() * 8);
let mask = (1 << (ty.bytes() * 8)) - 1i128;
let shifted_mask = mask << shift_amt;