bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove some workarounds for missing inst legalizations

Browse source
This commit is contained in:
bjorn3 2019-12-08 11:52:04 +01:00
parent 0cbcccf4c1
commit 88277f983a
3 changed files with 11 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/base.rs
View file

@ -168,8 +168,6 @@ fn codegen_fn_content(fx: &mut FunctionCx<'_, '_, impl Backend>) {
} }
} }
let cond = trans_operand(fx, cond).load_scalar(fx); let cond = trans_operand(fx, cond).load_scalar(fx);
// TODO HACK brz/brnz for i8/i16 is not yet implemented
let cond = fx.bcx.ins().uextend(types::I32, cond);
let target = fx.get_ebb(*target); let target = fx.get_ebb(*target);
if *expected { if *expected {
fx.bcx.ins().brnz(cond, target, &[]); fx.bcx.ins().brnz(cond, target, &[]);

15
src/common.rs
View file

@ -80,21 +80,6 @@ pub fn has_ptr_meta<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> bool {
} }
} }
pub fn codegen_select(bcx: &mut FunctionBuilder, cond: Value, lhs: Value, rhs: Value) -> Value {
let lhs_ty = bcx.func.dfg.value_type(lhs);
let rhs_ty = bcx.func.dfg.value_type(rhs);
assert_eq!(lhs_ty, rhs_ty);
if lhs_ty == types::I8 || lhs_ty == types::I16 {
// FIXME workaround for missing encoding for select.i8
let lhs = bcx.ins().uextend(types::I32, lhs);
let rhs = bcx.ins().uextend(types::I32, rhs);
let res = bcx.ins().select(cond, lhs, rhs);
bcx.ins().ireduce(lhs_ty, res)
} else {
bcx.ins().select(cond, lhs, rhs)
}
}
pub fn codegen_icmp( pub fn codegen_icmp(
fx: &mut FunctionCx<'_, '_, impl Backend>, fx: &mut FunctionCx<'_, '_, impl Backend>,
intcc: IntCC, intcc: IntCC,

38
src/intrinsics.rs
View file

@ -118,7 +118,7 @@ macro_rules! atomic_minmax {
// Compare // Compare
let is_eq = codegen_icmp($fx, IntCC::SignedGreaterThan, old, $src); let is_eq = codegen_icmp($fx, IntCC::SignedGreaterThan, old, $src);
let new = codegen_select(&mut $fx.bcx, is_eq, old, $src); let new = $fx.bcx.ins().select(is_eq, old, $src);
// Write new // Write new
$fx.bcx.ins().store(MemFlags::new(), new, $ptr, 0); $fx.bcx.ins().store(MemFlags::new(), new, $ptr, 0);
@ -195,7 +195,7 @@ pub fn bool_to_zero_or_max_uint<'tcx>(
.bcx .bcx
.ins() .ins()
.iconst(int_ty, (u64::max_value() >> (64 - int_ty.bits())) as i64); .iconst(int_ty, (u64::max_value() >> (64 - int_ty.bits())) as i64);
let mut res = crate::common::codegen_select(&mut fx.bcx, val, max, zero); let mut res = fx.bcx.ins().select(val, max, zero);
if ty.is_float() { if ty.is_float() {
res = fx.bcx.ins().bitcast(ty, res); res = fx.bcx.ins().bitcast(ty, res);
@ -553,19 +553,19 @@ pub fn codegen_intrinsic_call<'tcx>(
let max = fx.bcx.ins().iconst(clif_ty, max); let max = fx.bcx.ins().iconst(clif_ty, max);
let val = match (intrinsic, signed) { let val = match (intrinsic, signed) {
("saturating_add", false) => codegen_select(&mut fx.bcx, has_overflow, max, val), ("saturating_add", false) => fx.bcx.ins().select(has_overflow, max, val),
("saturating_sub", false) => codegen_select(&mut fx.bcx, has_overflow, min, val), ("saturating_sub", false) => fx.bcx.ins().select(has_overflow, min, val),
("saturating_add", true) => { ("saturating_add", true) => {
let rhs = rhs.load_scalar(fx); let rhs = rhs.load_scalar(fx);
let rhs_ge_zero = fx.bcx.ins().icmp_imm(IntCC::SignedGreaterThanOrEqual, rhs, 0); let rhs_ge_zero = fx.bcx.ins().icmp_imm(IntCC::SignedGreaterThanOrEqual, rhs, 0);
let sat_val = codegen_select(&mut fx.bcx, rhs_ge_zero, max, min); let sat_val = fx.bcx.ins().select(rhs_ge_zero, max, min);
codegen_select(&mut fx.bcx, has_overflow, sat_val, val) fx.bcx.ins().select(has_overflow, sat_val, val)
} }
("saturating_sub", true) => { ("saturating_sub", true) => {
let rhs = rhs.load_scalar(fx); let rhs = rhs.load_scalar(fx);
let rhs_ge_zero = fx.bcx.ins().icmp_imm(IntCC::SignedGreaterThanOrEqual, rhs, 0); let rhs_ge_zero = fx.bcx.ins().icmp_imm(IntCC::SignedGreaterThanOrEqual, rhs, 0);
let sat_val = codegen_select(&mut fx.bcx, rhs_ge_zero, min, max); let sat_val = fx.bcx.ins().select(rhs_ge_zero, min, max);
codegen_select(&mut fx.bcx, has_overflow, sat_val, val) fx.bcx.ins().select(has_overflow, sat_val, val)
} }
_ => unreachable!(), _ => unreachable!(),
}; };
@ -703,28 +703,12 @@ pub fn codegen_intrinsic_call<'tcx>(
ret.write_cvalue(fx, res); ret.write_cvalue(fx, res);
}; };
ctpop, <T> (v arg) { ctpop, <T> (v arg) {
let res = if T == fx.tcx.types.u128 || T == fx.tcx.types.i128 { let res = fx.bcx.ins().popcnt(arg);
let (lo, hi) = fx.bcx.ins().isplit(arg);
let lo_popcnt = fx.bcx.ins().popcnt(lo);
let hi_popcnt = fx.bcx.ins().popcnt(hi);
let popcnt = fx.bcx.ins().iadd(lo_popcnt, hi_popcnt);
crate::cast::clif_intcast(fx, popcnt, types::I128, false)
} else {
fx.bcx.ins().popcnt(arg)
};
let res = CValue::by_val(res, fx.layout_of(T)); let res = CValue::by_val(res, fx.layout_of(T));
ret.write_cvalue(fx, res); ret.write_cvalue(fx, res);
}; };
bitreverse, <T> (v arg) { bitreverse, <T> (v arg) {
let res = if T == fx.tcx.types.u128 || T == fx.tcx.types.i128 { let res = fx.bcx.ins().bitrev(arg);
let (lo, hi) = fx.bcx.ins().isplit(arg);
let lo_bitrev = fx.bcx.ins().bitrev(lo);
let hi_bitrev = fx.bcx.ins().bitrev(hi);
let bitrev = fx.bcx.ins().iconcat(hi_bitrev, lo_bitrev);
crate::cast::clif_intcast(fx, bitrev, types::I128, false)
} else {
fx.bcx.ins().bitrev(arg)
};
let res = CValue::by_val(res, fx.layout_of(T)); let res = CValue::by_val(res, fx.layout_of(T));
ret.write_cvalue(fx, res); ret.write_cvalue(fx, res);
}; };
@ -881,7 +865,7 @@ pub fn codegen_intrinsic_call<'tcx>(
// Compare // Compare
let is_eq = codegen_icmp(fx, IntCC::Equal, old, test_old); let is_eq = codegen_icmp(fx, IntCC::Equal, old, test_old);
let new = crate::common::codegen_select(&mut fx.bcx, is_eq, new, old); // Keep old if not equal to test_old let new = fx.bcx.ins().select(is_eq, new, old); // Keep old if not equal to test_old
// Write new // Write new
fx.bcx.ins().store(MemFlags::new(), new, ptr, 0); fx.bcx.ins().store(MemFlags::new(), new, ptr, 0);