Skip to content

Commit 7f0c1bc

Browse files
tgross35tgross35
committed
Add integer to f16 conversions
These are not present in LLVM's `compiler-rt` but LLVM does emit them in some cases [1]. [1]: rust-lang/rust#132614 (comment)
1 parent e344295 commit 7f0c1bc

File tree

5 files changed

+132
-26
lines changed

5 files changed

+132
-26
lines changed

‎README.md

+6
Original file line numberDiff line numberDiff line change
@@ -233,11 +233,17 @@ of being added to Rust.
233233
- [x] fixunstfdi.c
234234
- [x] fixunstfsi.c
235235
- [x] fixunstfti.c
236+
- [x] floatdihf.c (not yet in `compiler-rt` but emitted by LLVM)
236237
- [x] floatditf.c
238+
- [x] floatsihf.c (not yet in `compiler-rt` but emitted by LLVM)
237239
- [x] floatsitf.c
240+
- [x] floattihf.c (not yet in `compiler-rt` but emitted by LLVM)
238241
- [x] floattitf.c
242+
- [x] floatundihf.c (not yet in `compiler-rt` but emitted by LLVM)
239243
- [x] floatunditf.c
244+
- [x] floatunsihf.c (not yet in `compiler-rt` but emitted by LLVM)
240245
- [x] floatunsitf.c
246+
- [x] floatuntihf.c (not yet in `compiler-rt` but emitted by LLVM)
241247
- [x] floatuntitf.c
242248
- [x] multf3.c
243249
- [x] powitf2.c

‎src/float/conv.rs

+107-24
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,19 @@ mod int_to_float {
7979
F::from_bits(conv(i.unsigned_abs()) | sign_bit)
8080
}
8181

82+
pub fn u32_to_f16_bits(i: u32) -> u16 {
83+
let n = i.leading_zeros();
84+
let i_m = i.wrapping_shl(n);
85+
// Mantissa with implicit bit set
86+
let m_base: u16 = (i_m >> shift_f_lt_i::<u32, f16>()) as u16;
87+
// The entire lower half of `i` will be truncated (masked portion), plus the
88+
// next `EXPONENT_BITS` bits.
89+
let adj = (i_m >> f16::EXPONENT_BITS | i_m & 0xFF) as u16;
90+
let m = m_adj::<f16>(m_base, adj);
91+
let e = if i == 0 { 0 } else { exp::<u32, f16>(n) - 1 };
92+
repr::<f16>(e, m)
93+
}
94+
8295
pub fn u32_to_f32_bits(i: u32) -> u32 {
8396
if i == 0 {
8497
return 0;
@@ -122,6 +135,26 @@ mod int_to_float {
122135
(h as u128) << 64
123136
}
124137

138+
pub fn u64_to_f16_bits(i: u64) -> u16 {
139+
let n = i.leading_zeros();
140+
let i_m = i.wrapping_shl(n); // Mantissa, shifted so the first bit is nonzero
141+
let m_base: u16 = (i_m >> shift_f_lt_i::<u64, f16>()) as u16;
142+
143+
// Within the upper `F::BITS`, everything except for the signifcand
144+
// gets truncated
145+
let d1: u16 = (i_m >> (u64::BITS - f16::BITS - f16::SIGNIFICAND_BITS - 1)).cast();
146+
147+
// The entire rest of `i_m` gets truncated. Zero the upper `F::BITS` then just
148+
// check if it is nonzero.
149+
let d2: u16 = (i_m << f16::BITS >> f16::BITS != 0).into();
150+
let adj = d1 | d2;
151+
152+
// Mantissa with implicit bit set
153+
let m = m_adj::<f16>(m_base, adj);
154+
let e = if i == 0 { 0 } else { exp::<u64, f16>(n) - 1 };
155+
repr::<f16>(e, m)
156+
}
157+
125158
pub fn u64_to_f32_bits(i: u64) -> u32 {
126159
let n = i.leading_zeros();
127160
let i_m = i.wrapping_shl(n);
@@ -160,6 +193,26 @@ mod int_to_float {
160193
repr::<f128>(e, m)
161194
}
162195

196+
pub fn u128_to_f16_bits(i: u128) -> u16 {
197+
let n = i.leading_zeros();
198+
let i_m = i.wrapping_shl(n); // Mantissa, shifted so the first bit is nonzero
199+
let m_base: u16 = (i_m >> shift_f_lt_i::<u128, f16>()) as u16;
200+
201+
// Within the upper `F::BITS`, everything except for the signifcand
202+
// gets truncated
203+
let d1: u16 = (i_m >> (u128::BITS - f16::BITS - f16::SIGNIFICAND_BITS - 1)).cast();
204+
205+
// The entire rest of `i_m` gets truncated. Zero the upper `F::BITS` then just
206+
// check if it is nonzero.
207+
let d2: u16 = (i_m << f16::BITS >> f16::BITS != 0).into();
208+
let adj = d1 | d2;
209+
210+
// Mantissa with implicit bit set
211+
let m = m_adj::<f16>(m_base, adj);
212+
let e = if i == 0 { 0 } else { exp::<u128, f16>(n) - 1 };
213+
repr::<f16>(e, m)
214+
}
215+
163216
pub fn u128_to_f32_bits(i: u128) -> u32 {
164217
let n = i.leading_zeros();
165218
let i_m = i.wrapping_shl(n); // Mantissa, shifted so the first bit is nonzero
@@ -210,6 +263,11 @@ mod int_to_float {
210263

211264
// Conversions from unsigned integers to floats.
212265
intrinsics! {
266+
#[cfg(f16_enabled)]
267+
pub extern "C" fn __floatunsihf(i: u32) -> f16 {
268+
f16::from_bits(int_to_float::u32_to_f16_bits(i))
269+
}
270+
213271
#[arm_aeabi_alias = __aeabi_ui2f]
214272
pub extern "C" fn __floatunsisf(i: u32) -> f32 {
215273
f32::from_bits(int_to_float::u32_to_f32_bits(i))
@@ -220,6 +278,17 @@ intrinsics! {
220278
f64::from_bits(int_to_float::u32_to_f64_bits(i))
221279
}
222280

281+
#[ppc_alias = __floatunsikf]
282+
#[cfg(f128_enabled)]
283+
pub extern "C" fn __floatunsitf(i: u32) -> f128 {
284+
f128::from_bits(int_to_float::u32_to_f128_bits(i))
285+
}
286+
287+
#[cfg(f16_enabled)]
288+
pub extern "C" fn __floatundihf(i: u64) -> f16 {
289+
f16::from_bits(int_to_float::u64_to_f16_bits(i))
290+
}
291+
223292
#[arm_aeabi_alias = __aeabi_ul2f]
224293
pub extern "C" fn __floatundisf(i: u64) -> f32 {
225294
f32::from_bits(int_to_float::u64_to_f32_bits(i))
@@ -230,6 +299,17 @@ intrinsics! {
230299
f64::from_bits(int_to_float::u64_to_f64_bits(i))
231300
}
232301

302+
#[ppc_alias = __floatundikf]
303+
#[cfg(f128_enabled)]
304+
pub extern "C" fn __floatunditf(i: u64) -> f128 {
305+
f128::from_bits(int_to_float::u64_to_f128_bits(i))
306+
}
307+
308+
#[cfg(f16_enabled)]
309+
pub extern "C" fn __floatuntihf(i: u128) -> f16 {
310+
f16::from_bits(int_to_float::u128_to_f16_bits(i))
311+
}
312+
233313
#[cfg_attr(target_os = "uefi", unadjusted_on_win64)]
234314
pub extern "C" fn __floatuntisf(i: u128) -> f32 {
235315
f32::from_bits(int_to_float::u128_to_f32_bits(i))
@@ -240,18 +320,6 @@ intrinsics! {
240320
f64::from_bits(int_to_float::u128_to_f64_bits(i))
241321
}
242322

243-
#[ppc_alias = __floatunsikf]
244-
#[cfg(f128_enabled)]
245-
pub extern "C" fn __floatunsitf(i: u32) -> f128 {
246-
f128::from_bits(int_to_float::u32_to_f128_bits(i))
247-
}
248-
249-
#[ppc_alias = __floatundikf]
250-
#[cfg(f128_enabled)]
251-
pub extern "C" fn __floatunditf(i: u64) -> f128 {
252-
f128::from_bits(int_to_float::u64_to_f128_bits(i))
253-
}
254-
255323
#[ppc_alias = __floatuntikf]
256324
#[cfg(f128_enabled)]
257325
pub extern "C" fn __floatuntitf(i: u128) -> f128 {
@@ -261,6 +329,11 @@ intrinsics! {
261329

262330
// Conversions from signed integers to floats.
263331
intrinsics! {
332+
#[cfg(f16_enabled)]
333+
pub extern "C" fn __floatsihf(i: i32) -> f16 {
334+
int_to_float::signed(i, int_to_float::u32_to_f16_bits)
335+
}
336+
264337
#[arm_aeabi_alias = __aeabi_i2f]
265338
pub extern "C" fn __floatsisf(i: i32) -> f32 {
266339
int_to_float::signed(i, int_to_float::u32_to_f32_bits)
@@ -271,6 +344,17 @@ intrinsics! {
271344
int_to_float::signed(i, int_to_float::u32_to_f64_bits)
272345
}
273346

347+
#[ppc_alias = __floatsikf]
348+
#[cfg(f128_enabled)]
349+
pub extern "C" fn __floatsitf(i: i32) -> f128 {
350+
int_to_float::signed(i, int_to_float::u32_to_f128_bits)
351+
}
352+
353+
#[cfg(f16_enabled)]
354+
pub extern "C" fn __floatdihf(i: i64) -> f16 {
355+
int_to_float::signed(i, int_to_float::u64_to_f16_bits)
356+
}
357+
274358
#[arm_aeabi_alias = __aeabi_l2f]
275359
pub extern "C" fn __floatdisf(i: i64) -> f32 {
276360
int_to_float::signed(i, int_to_float::u64_to_f32_bits)
@@ -281,6 +365,17 @@ intrinsics! {
281365
int_to_float::signed(i, int_to_float::u64_to_f64_bits)
282366
}
283367

368+
#[ppc_alias = __floatdikf]
369+
#[cfg(f128_enabled)]
370+
pub extern "C" fn __floatditf(i: i64) -> f128 {
371+
int_to_float::signed(i, int_to_float::u64_to_f128_bits)
372+
}
373+
374+
#[cfg(f16_enabled)]
375+
pub extern "C" fn __floattihf(i: i128) -> f16 {
376+
int_to_float::signed(i, int_to_float::u128_to_f16_bits)
377+
}
378+
284379
#[cfg_attr(target_os = "uefi", unadjusted_on_win64)]
285380
pub extern "C" fn __floattisf(i: i128) -> f32 {
286381
int_to_float::signed(i, int_to_float::u128_to_f32_bits)
@@ -291,18 +386,6 @@ intrinsics! {
291386
int_to_float::signed(i, int_to_float::u128_to_f64_bits)
292387
}
293388

294-
#[ppc_alias = __floatsikf]
295-
#[cfg(f128_enabled)]
296-
pub extern "C" fn __floatsitf(i: i32) -> f128 {
297-
int_to_float::signed(i, int_to_float::u32_to_f128_bits)
298-
}
299-
300-
#[ppc_alias = __floatdikf]
301-
#[cfg(f128_enabled)]
302-
pub extern "C" fn __floatditf(i: i64) -> f128 {
303-
int_to_float::signed(i, int_to_float::u64_to_f128_bits)
304-
}
305-
306389
#[ppc_alias = __floattikf]
307390
#[cfg(f128_enabled)]
308391
pub extern "C" fn __floattitf(i: i128) -> f128 {

‎testcrate/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ no-f16-f128 = ["compiler_builtins/no-f16-f128"]
3939
mem = ["compiler_builtins/mem"]
4040
mangled-names = ["compiler_builtins/mangled-names"]
4141
# Skip tests that rely on f128 symbols being available on the system
42-
no-sys-f128 = ["no-sys-f128-int-convert", "no-sys-f16-f128-convert"]
42+
no-sys-f128 = ["no-sys-f16-int-convert", "no-sys-f128-int-convert", "no-sys-f16-f128-convert"]
4343
# Some platforms have some f128 functions but everything except integer conversions
4444
no-sys-f128-int-convert = []
45+
no-sys-f16-int-convert = []
4546
no-sys-f16-f128-convert = []
4647
# Skip tests that rely on f16 symbols being available on the system
4748
no-sys-f16 = []

‎testcrate/build.rs

+6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ enum Feature {
66
NoSysF128,
77
NoSysF128IntConvert,
88
NoSysF16,
9+
NoSysF16IntConvert,
910
NoSysF16F128Convert,
1011
}
1112

@@ -40,6 +41,7 @@ fn main() {
4041
{
4142
features.insert(Feature::NoSysF128);
4243
features.insert(Feature::NoSysF128IntConvert);
44+
features.insert(Feature::NoSysF16IntConvert);
4345
features.insert(Feature::NoSysF16F128Convert);
4446
}
4547

@@ -76,6 +78,10 @@ fn main() {
7678
"no-sys-f128-int-convert",
7779
"using apfloat fallback for f128 <-> int conversions",
7880
),
81+
Feature::NoSysF16IntConvert => (
82+
"no-sys-f16-int-convert",
83+
"using apfloat fallback for f16 <-> int conversions",
84+
),
7985
Feature::NoSysF16F128Convert => (
8086
"no-sys-f16-f128-convert",
8187
"using apfloat fallback for f16 <-> f128 conversions",

‎testcrate/tests/conv.rs

+11-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ mod i_to_f {
3434
FloatTy::from_u128(x.try_into().unwrap()).value
3535
};
3636

37-
<$f_ty>::from_bits(apf.to_bits())
37+
<$f_ty>::from_bits(apf.to_bits().try_into().unwrap())
3838
},
3939
x
4040
);
@@ -100,6 +100,16 @@ mod i_to_f {
100100
};
101101
}
102102

103+
#[cfg(f16_enabled)]
104+
i_to_f! { f16, Half, not(feature = "no-sys-f16-int-convert"),
105+
u32, __floatunsihf;
106+
i32, __floatsihf;
107+
u64, __floatundihf;
108+
i64, __floatdihf;
109+
u128, __floatuntihf;
110+
i128, __floattihf;
111+
}
112+
103113
i_to_f! { f32, Single, all(),
104114
u32, __floatunsisf;
105115
i32, __floatsisf;

0 commit comments

Comments
 (0)