Skip to content

Commit 0da0dac

Browse files
bjorn3bjorn3
authored
Merge pull request #1574 from beetrees/f16-f128-mvp
Add `f16`/`f128` support
2 parents 7c026ea + 02195f5 commit 0da0dac

File tree

15 files changed

+707
-37
lines changed

15 files changed

+707
-37
lines changed

‎build_system/build_backend.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub(crate) fn build_backend(
1818
let mut cmd = CG_CLIF.build(&bootstrap_host_compiler, dirs);
1919

2020
let mut rustflags = rustflags_from_env("RUSTFLAGS");
21-
rustflags.push("-Zallow-features=rustc_private".to_owned());
21+
rustflags.push("-Zallow-features=rustc_private,f16,f128".to_owned());
2222
rustflags_to_cmd_env(&mut cmd, "RUSTFLAGS", &rustflags);
2323

2424
if env::var("CG_CLIF_EXPENSIVE_CHECKS").is_ok() {

‎build_system/build_sysroot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ fn build_clif_sysroot_for_triple(
235235
compiler.rustflags.extend(rustflags);
236236
let mut build_cmd = STANDARD_LIBRARY.build(&compiler, dirs);
237237
build_cmd.arg("--release");
238-
build_cmd.arg("--features").arg("backtrace panic-unwind compiler-builtins-no-f16-f128");
238+
build_cmd.arg("--features").arg("backtrace panic-unwind");
239239
build_cmd.arg(format!("-Zroot-dir={}", STDLIB_SRC.to_path(dirs).display()));
240240
build_cmd.env("CARGO_PROFILE_RELEASE_DEBUG", "true");
241241
build_cmd.env("__CARGO_DEFAULT_LIB_METADATA", "cg_clif");

‎scripts/setup_rust_fork.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ verbose-tests = false
4343
# disabled bootstrap will crash trying to copy llvm tools for the bootstrap
4444
# compiler.
4545
llvm-tools = false
46-
std-features = ["panic-unwind", "compiler-builtins-no-f16-f128"]
46+
std-features = ["panic-unwind"]
4747
4848
EOF
4949

‎scripts/test_rustc_tests.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,6 @@ rm tests/ui/consts/precise-drop-with-coverage.rs
7272
rm tests/ui/issues/issue-85461.rs
7373
rm -r tests/ui/instrument-coverage/
7474

75-
# missing f16/f128 support
76-
rm tests/ui/half-open-range-patterns/half-open-range-pats-semantics.rs
77-
rm tests/ui/asm/aarch64/type-f16.rs
78-
rm tests/ui/float/conv-bits-runtime-const.rs
79-
rm tests/ui/consts/const-eval/float_methods.rs
80-
rm tests/ui/match/match-float.rs
81-
rm tests/ui/float/target-has-reliable-nightly-float.rs
82-
8375
# optimization tests
8476
# ==================
8577
rm tests/ui/codegen/issue-28950.rs # depends on stack size optimizations

‎src/abi/mod.rs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -828,3 +828,31 @@ pub(crate) fn codegen_drop<'tcx>(
828828
}
829829
}
830830
}
831+
832+
pub(crate) fn lib_call_arg_param(tcx: TyCtxt<'_>, ty: Type, is_signed: bool) -> AbiParam {
833+
let param = AbiParam::new(ty);
834+
if ty.is_int() && u64::from(ty.bits()) < tcx.data_layout.pointer_size.bits() {
835+
match (&*tcx.sess.target.arch, &*tcx.sess.target.vendor) {
836+
("x86_64", _) | ("aarch64", "apple") => match (ty, is_signed) {
837+
(types::I8 | types::I16, true) => param.sext(),
838+
(types::I8 | types::I16, false) => param.uext(),
839+
_ => param,
840+
},
841+
("aarch64", _) => param,
842+
("riscv64", _) => match (ty, is_signed) {
843+
(types::I32, _) | (_, true) => param.sext(),
844+
_ => param.uext(),
845+
},
846+
("s390x", _) => {
847+
if is_signed {
848+
param.sext()
849+
} else {
850+
param.uext()
851+
}
852+
}
853+
_ => unimplemented!("{:?}", tcx.sess.target.arch),
854+
}
855+
} else {
856+
param
857+
}
858+
}

‎src/abi/pass_mode.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ fn reg_to_abi_param(reg: Reg) -> AbiParam {
2222
(RegKind::Integer, 3..=4) => types::I32,
2323
(RegKind::Integer, 5..=8) => types::I64,
2424
(RegKind::Integer, 9..=16) => types::I128,
25+
(RegKind::Float, 2) => types::F16,
2526
(RegKind::Float, 4) => types::F32,
2627
(RegKind::Float, 8) => types::F64,
28+
(RegKind::Float, 16) => types::F128,
2729
(RegKind::Vector, size) => types::I8.by(u32::try_from(size).unwrap()).unwrap(),
2830
_ => unreachable!("{:?}", reg),
2931
};

‎src/base.rs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ use rustc_middle::ty::print::with_no_trimmed_paths;
1515

1616
use crate::constant::ConstantCx;
1717
use crate::debuginfo::{FunctionDebugContext, TypeDebugContext};
18-
use crate::enable_verifier;
1918
use crate::prelude::*;
2019
use crate::pretty_clif::CommentWriter;
20+
use crate::{codegen_f16_f128, enable_verifier};
2121

2222
pub(crate) struct CodegenedFunction {
2323
symbol_name: String,
@@ -635,6 +635,15 @@ fn codegen_stmt<'tcx>(fx: &mut FunctionCx<'_, '_, 'tcx>, cur_block: Block, stmt:
635635
let val = operand.load_scalar(fx);
636636
match layout.ty.kind() {
637637
ty::Int(_) => CValue::by_val(fx.bcx.ins().ineg(val), layout),
638+
// FIXME(bytecodealliance/wasmtime#8312): Remove
639+
// once backend lowerings have been added to
640+
// Cranelift.
641+
ty::Float(FloatTy::F16) => {
642+
CValue::by_val(codegen_f16_f128::neg_f16(fx, val), layout)
643+
}
644+
ty::Float(FloatTy::F128) => {
645+
CValue::by_val(codegen_f16_f128::neg_f128(fx, val), layout)
646+
}
638647
ty::Float(_) => CValue::by_val(fx.bcx.ins().fneg(val), layout),
639648
_ => unreachable!("un op Neg for {:?}", layout.ty),
640649
}

‎src/cast.rs

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//! Various number casting functions
22
3+
use crate::codegen_f16_f128;
34
use crate::prelude::*;
45

56
pub(crate) fn clif_intcast(
@@ -36,6 +37,14 @@ pub(crate) fn clif_int_or_float_cast(
3637
) -> Value {
3738
let from_ty = fx.bcx.func.dfg.value_type(from);
3839

40+
// FIXME(bytecodealliance/wasmtime#8312): Remove in favour of native
41+
// Cranelift operations once Cranelift backends have lowerings for them.
42+
if matches!(from_ty, types::F16 | types::F128)
43+
|| matches!(to_ty, types::F16 | types::F128) && from_ty != to_ty
44+
{
45+
return codegen_f16_f128::codegen_cast(fx, from, from_signed, to_ty, to_signed);
46+
}
47+
3948
if from_ty.is_int() && to_ty.is_int() {
4049
// int-like -> int-like
4150
clif_intcast(
@@ -58,8 +67,10 @@ pub(crate) fn clif_int_or_float_cast(
5867
"__float{sign}ti{flt}f",
5968
sign = if from_signed { "" } else { "un" },
6069
flt = match to_ty {
70+
types::F16 => "h",
6171
types::F32 => "s",
6272
types::F64 => "d",
73+
types::F128 => "t",
6374
_ => unreachable!("{:?}", to_ty),
6475
},
6576
);
@@ -90,8 +101,10 @@ pub(crate) fn clif_int_or_float_cast(
90101
"__fix{sign}{flt}fti",
91102
sign = if to_signed { "" } else { "uns" },
92103
flt = match from_ty {
104+
types::F16 => "h",
93105
types::F32 => "s",
94106
types::F64 => "d",
107+
types::F128 => "t",
95108
_ => unreachable!("{:?}", to_ty),
96109
},
97110
);
@@ -145,8 +158,12 @@ pub(crate) fn clif_int_or_float_cast(
145158
} else if from_ty.is_float() && to_ty.is_float() {
146159
// float -> float
147160
match (from_ty, to_ty) {
148-
(types::F32, types::F64) => fx.bcx.ins().fpromote(types::F64, from),
149-
(types::F64, types::F32) => fx.bcx.ins().fdemote(types::F32, from),
161+
(types::F16, types::F32 | types::F64 | types::F128)
162+
| (types::F32, types::F64 | types::F128)
163+
| (types::F64, types::F128) => fx.bcx.ins().fpromote(to_ty, from),
164+
(types::F128, types::F64 | types::F32 | types::F16)
165+
| (types::F64, types::F32 | types::F16)
166+
| (types::F32, types::F16) => fx.bcx.ins().fdemote(to_ty, from),
150167
_ => from,
151168
}
152169
} else {

0 commit comments

Comments
 (0)