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

Support big- and little-endian lane order with bitcast (#5196)

Browse Source 
Add a MemFlags operand to the bitcast instruction, where only the
`big` and `little` flags are accepted.  These define the lane order
to be used when casting between types of different lane counts.

Update all users to pass an appropriate MemFlags argument.

Implement lane swaps where necessary in the s390x back-end.

This is the final part necessary to fix
https://github.com/bytecodealliance/wasmtime/issues/4566.
This commit is contained in:
Ulrich Weigand
2022-11-07 23:41:10 +01:00
committed by GitHub
parent 5cef53537b
commit 3e5938e65a
16 changed files with 295 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -868,19 +868,19 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
}
Operator::F32ReinterpretI32 => {
let val = state.pop1();
state.push1(builder.ins().bitcast(F32, val));
state.push1(builder.ins().bitcast(F32, MemFlags::new(), val));
}
Operator::F64ReinterpretI64 => {
let val = state.pop1();
state.push1(builder.ins().bitcast(F64, val));
state.push1(builder.ins().bitcast(F64, MemFlags::new(), val));
}
Operator::I32ReinterpretF32 => {
let val = state.pop1();
state.push1(builder.ins().bitcast(I32, val));
state.push1(builder.ins().bitcast(I32, MemFlags::new(), val));
}
Operator::I64ReinterpretF64 => {
let val = state.pop1();
state.push1(builder.ins().bitcast(I64, val));
state.push1(builder.ins().bitcast(I64, MemFlags::new(), val));
}
Operator::I32Extend8S => {
let val = state.pop1();
@@ -2898,7 +2898,9 @@ fn optionally_bitcast_vector(
builder: &mut FunctionBuilder,
) -> Value {
if builder.func.dfg.value_type(value) != needed_type {
builder.ins().bitcast(needed_type, value)
let mut flags = MemFlags::new();
flags.set_endianness(ir::Endianness::Little);
builder.ins().bitcast(needed_type, flags, value)
} else {
value
}
@@ -2933,7 +2935,9 @@ fn canonicalise_v128_values<'a>(
// Otherwise we'll have to cast, and push the resulting `Value`s into `canonicalised`.
for v in values {
tmp_canonicalised.push(if is_non_canonical_v128(builder.func.dfg.value_type(*v)) {
builder.ins().bitcast(I8X16, *v)
let mut flags = MemFlags::new();
flags.set_endianness(ir::Endianness::Little);
builder.ins().bitcast(I8X16, flags, *v)
} else {
*v
});
@@ -3056,7 +3060,9 @@ pub fn bitcast_wasm_returns<FE: FuncEnvironment + ?Sized>(
environ.is_wasm_return(&builder.func.signature, i)
});
for (t, arg) in changes {
*arg = builder.ins().bitcast(t, *arg);
let mut flags = MemFlags::new();
flags.set_endianness(ir::Endianness::Little);
*arg = builder.ins().bitcast(t, flags, *arg);
}
}
@@ -3072,6 +3078,8 @@ fn bitcast_wasm_params<FE: FuncEnvironment + ?Sized>(
environ.is_wasm_parameter(&callee_signature, i)
});
for (t, arg) in changes {
*arg = builder.ins().bitcast(t, *arg);
let mut flags = MemFlags::new();
flags.set_endianness(ir::Endianness::Little);
*arg = builder.ins().bitcast(t, flags, *arg);
}
}